summaryrefslogtreecommitdiff
path: root/doc/bare_repositories
diff options
context:
space:
mode:
authorGravatar https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314 <BehemothTheCat@web>2015-02-13 23:58:48 +0000
committerGravatar admin <admin@branchable.com>2015-02-13 23:58:48 +0000
commit0677b24451ccee73e807e4b71e886a0295740229 (patch)
tree8cfad6a96c47f0c6d3b6afd3ca83a11a6905ecab /doc/bare_repositories
parent8eeb62950413365c587865089789f21b35e84224 (diff)
Added a comment: push fails
Diffstat (limited to 'doc/bare_repositories')
-rw-r--r--doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment25
1 files changed, 25 insertions, 0 deletions
diff --git a/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment b/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment
new file mode 100644
index 000000000..156e5f4e6
--- /dev/null
+++ b/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment
@@ -0,0 +1,25 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314"
+ nickname="BehemothTheCat"
+ subject="push fails"
+ date="2015-02-13T23:58:48Z"
+ content="""
+These instructions don't work for me, unfortunately. This step:
+
+git push origin master git-annex
+
+results in:
+
+To ssh://my.server.com/home/itz/git/annex.git
+ ! [rejected] git-annex -> git-annex (non-fast-forward)
+error: failed to push some refs to 'ssh://ahiker.mooo.com/home/itz/git/annex.git'
+hint: Updates were rejected because a pushed branch tip is behind its remote
+hint: counterpart. Check out this branch and integrate the remote changes
+hint: (e.g. 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+
+Versions: git 1:1.9.1-1~bpo70+2 , git-annex 5.20141024~bpo70+1 (both packaged by Debian).
+
+(And yes, I did do a pull on master first. Maybe I need to do a pull on git-annex as well? Since that's stepping into magic territory, I'm afraid to do so without clear instruction.)
+
+"""]]