mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

(i don't have a remote origin, but it's more common and doesn't change the example)

Browse source
This commit is contained in:
http://christian.amsuess.com/chrysn 2011-08-10 17:00:09 +00:00 committed by admin
parent f8282b55ce
commit 8b847517a8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/forum/version_3_upgrade.mdwn
View file

@ -5,5 +5,5 @@ after upgrading to git-annex 3, i'm stuck with diverging git-annex branches -- i
could you explain how to do that in a littel more detail? git pull seems to only merge master, although i have these ``.git/config`` settings: could you explain how to do that in a littel more detail? git pull seems to only merge master, although i have these ``.git/config`` settings:
[branch "git-annex"] [branch "git-annex"]
remote = poseidon remote = origin
merge = git-annex merge = git-annex