diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/version_3_upgrade.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/forum/version_3_upgrade.mdwn b/doc/forum/version_3_upgrade.mdwn index 476b8c235..7fdbcbc80 100644 --- a/doc/forum/version_3_upgrade.mdwn +++ b/doc/forum/version_3_upgrade.mdwn @@ -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: [branch "git-annex"] - remote = poseidon + remote = origin merge = git-annex |