Merge branch 'jk/sha1dc'

diff --git a/builtin/pull.c b/builtin/pull.c
index 701d1473dc59e018247f337d37f00fe04f83cb98..33db889955402168f95083d741d4094db89cb503 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -56,6 +56,10 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
                return REBASE_MERGES;
        else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
                return REBASE_INTERACTIVE;
+       /*
+        * Please update _git_config() in git-completion.bash when you
+        * add new rebase modes.
+        */
 
        if (fatal)
                die(_("Invalid value for %s: %s"), key, value);