From 8b847517a810d384a79178124b9766141b89bc17 Mon Sep 17 00:00:00 2001 From: "http://christian.amsuess.com/chrysn" Date: Wed, 10 Aug 2011 17:00:09 +0000 Subject: (i don't have a remote origin, but it's more common and doesn't change the example) --- doc/forum/version_3_upgrade.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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 -- cgit v1.2.3