Merge branch 'jk/mergetool-lib-refactor'

diff --git a/builtin/commit.c b/builtin/commit.c
index b589ce02ff1d22d349799a8296a93d6bd21e003e..6b693c16d8842b70b0e1c7bd7df5095947ed0a64 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -29,6 +29,7 @@
 #include "gpg-interface.h"
 #include "column.h"
 #include "sequencer.h"
+#include "notes-utils.h"
 
 static const char * const builtin_commit_usage[] = {
        N_("git commit [options] [--] <pathspec>..."),
@@ -1112,17 +1113,6 @@ static int git_status_config(const char *k, const char *v, void *cb)
                        s->submodule_summary = -1;
                return 0;
        }
-       if (!strcmp(k, "status.short")) {
-               if (git_config_bool(k, v))
-                       status_format = STATUS_FORMAT_SHORT;
-               else
-                       status_format = STATUS_FORMAT_NONE;
-               return 0;
-       }
-       if (!strcmp(k, "status.branch")) {
-               s->show_branch = git_config_bool(k, v);
-               return 0;
-       }
        if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
                s->use_color = git_config_colorbool(k, v);
                return 0;
@@ -1604,7 +1594,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                if (cfg) {
                        /* we are amending, so current_head is not NULL */
                        copy_note_for_rewrite(cfg, current_head->object.sha1, sha1);
-                       finish_copy_notes_for_rewrite(cfg);
+                       finish_copy_notes_for_rewrite(cfg, "Notes added by 'git commit --amend'");
                }
                run_rewrite_hook(current_head->object.sha1, sha1);
        }