git add: rephrase -A/--no-all warning
Now we have a synonym --ignore-removal for --no-all, we can rephrase the Git 2.0 transition warning message in a more natural way. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 22, 2013 at 13:36 UTC
4c7114308ea12de7b69a3b282881398212dec8dd
1 file changed
+6
-6
builtin/add.c
+6
-6
@@ -97,13 +97,13 @@ static int fix_unmerged_status(struct diff_filepair *p,
97
}
98
99
static const char *add_would_remove_warning = N_(
100
- "You ran 'git add' with neither '-A (--all)' or '--no-all', whose\n"
101
-"behaviour will change in Git 2.0 with respect to paths you removed from\n"
102
-"your working tree. Paths like '%s' that are\n"
103
-"removed are ignored with this version of Git.\n"
100
+ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
101
+"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
102
+"Paths like '%s' that are\n"
103
+"removed from your working tree are ignored with this version of Git.\n"
104
"\n"
105
-"* 'git add --no-all <pathspec>', which is the current default, ignores\n"
106
-" paths you removed from your working tree.\n"
105
+"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
106
+" ignores paths you removed from your working tree.\n"
107
"\n"
108
"* 'git add --all <pathspec>' will let you also record the removals.\n"
109
"\n"