diff options
| author |  http://christian.amsuess.com/chrysn <chrysn@web> | 2011-08-10 17:00:09 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-08-10 17:00:09 +0000 |
| commit | 8b847517a810d384a79178124b9766141b89bc17 (patch) | |
| tree | f4148c538fd9b5676f77ec499aef3330aaec5b41 | |
| parent | f8282b55cece7561cd04788637627e79d2f29e17 (diff) | |
(i don't have a remote origin, but it's more common and doesn't change the example)
| -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 |