git-am: add am.threeWay config variable

diff --git a/git.c b/git.c
index 38d9ad531eb2c34a7ac02ced0e10cc13dbc37e0c..5feba410cab6d95e3b9ff9745db56a9d045f0c20 100644 (file)
--- a/git.c
+++ b/git.c
@@ -370,12 +370,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 
 static struct cmd_struct commands[] = {
        { "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
-       /*
-        * NEEDSWORK: Once the redirection to git-am.sh in builtin/am.c has
-        * been removed, this entry should be changed to
-        * RUN_SETUP | NEED_WORK_TREE
-        */
-       { "am", cmd_am },
+       { "am", cmd_am, RUN_SETUP | NEED_WORK_TREE },
        { "annotate", cmd_annotate, RUN_SETUP },
        { "apply", cmd_apply, RUN_SETUP_GENTLY },
        { "archive", cmd_archive },