undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git add: rephrase -A/--no-all warning

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2013-04-22 13:36:51 -07:00
parent 9f60f49b92
commit 4c7114308e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/add.c
View File

@ -97,13 +97,13 @@ static int fix_unmerged_status(struct diff_filepair *p,
} }
static const char *add_would_remove_warning = N_( static const char *add_would_remove_warning = N_(
"You ran 'git add' with neither '-A (--all)' or '--no-all', whose\n" "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
"behaviour will change in Git 2.0 with respect to paths you removed from\n" "whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
"your working tree. Paths like '%s' that are\n" "Paths like '%s' that are\n"
"removed are ignored with this version of Git.\n" "removed from your working tree are ignored with this version of Git.\n"
"\n" "\n"
"* 'git add --no-all <pathspec>', which is the current default, ignores\n" "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
" paths you removed from your working tree.\n" " ignores paths you removed from your working tree.\n"
"\n" "\n"
"* 'git add --all <pathspec>' will let you also record the removals.\n" "* 'git add --all <pathspec>' will let you also record the removals.\n"
"\n" "\n"