Documentation/git-read-tree: clarify 2-tree merge

diff --git a/builtin-push.c b/builtin-push.c
index 5633f0ade49f7c845665b7aab202be18a8cc9d8d..f7bc2b292fb85725d9cc26ce09f2302aaa7167fe 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -68,7 +68,7 @@ static void setup_push_tracking(void)
        struct branch *branch = branch_get(NULL);
        if (!branch)
                die("You are not currently on a branch.");
-       if (!branch->merge_nr)
+       if (!branch->merge_nr || !branch->merge)
                die("The current branch %s is not tracking anything.",
                    branch->name);
        if (branch->merge_nr != 1)