File: version_3_upgrade.mdwn

package info (click to toggle)
git-annex 5.20141125
  • links: PTS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 37,828 kB
  • ctags: 583
  • sloc: haskell: 42,582; sh: 1,080; ansic: 498; makefile: 316; perl: 125
file content (9 lines) | stat: -rw-r--r-- 455 bytes parent folder | download | duplicates (12) 
1
2
3
4
5
6
7
8
9
 
after upgrading to git-annex 3, i'm stuck with diverging git-annex branches -- i didn't manage to follow this line in the directions:

> After this upgrade, you should make sure you include the git-annex branch when git pushing and pulling.

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"]
    	remote = origin
    	merge = git-annex