merge-recursive: When we detect we can skip an update, actually skip it

diff --git a/branch.h b/branch.h
index eed817a64c7620bfe67f395e39b4eef2f85a4ab3..4026e3832b265c4cef6e5bc151976771867b3da9 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -22,8 +22,8 @@ void create_branch(const char *head, const char *name, const char *start_name,
 void remove_branch_state(void);
 
 /*
- * Configure local branch "local" to merge remote branch "remote"
- * taken from origin "origin".
+ * Configure local branch "local" as downstream to branch "remote"
+ * from remote "origin".  Used by git branch --set-upstream.
  */
 #define BRANCH_CONFIG_VERBOSE 01
 extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);