mirror of
https://github.com/git/git
synced 2024-10-29 17:08:46 +00:00
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>
This commit is contained in:
parent
9f60f49b92
commit
4c7114308e
1 changed files with 6 additions and 6 deletions
|
@ -97,13 +97,13 @@ static int fix_unmerged_status(struct diff_filepair *p,
|
|||
}
|
||||
|
||||
static const char *add_would_remove_warning = N_(
|
||||
"You ran 'git add' with neither '-A (--all)' or '--no-all', whose\n"
|
||||
"behaviour will change in Git 2.0 with respect to paths you removed from\n"
|
||||
"your working tree. Paths like '%s' that are\n"
|
||||
"removed are ignored with this version of Git.\n"
|
||||
"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
|
||||
"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
|
||||
"Paths like '%s' that are\n"
|
||||
"removed from your working tree are ignored with this version of Git.\n"
|
||||
"\n"
|
||||
"* 'git add --no-all <pathspec>', which is the current default, ignores\n"
|
||||
" paths you removed from your working tree.\n"
|
||||
"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
|
||||
" ignores paths you removed from your working tree.\n"
|
||||
"\n"
|
||||
"* 'git add --all <pathspec>' will let you also record the removals.\n"
|
||||
"\n"
|
||||
|
|
Loading…
Reference in a new issue