diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 13:36:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 13:36:51 -0700 |
| commit | 4c7114308ea12de7b69a3b282881398212dec8dd (patch) | |
| tree | c59fd9f578a2a3345dc82960021b245c4c85b8d8 | |
| parent | 9f60f49b9222f9200e688a64cd80610305b03cc5 (diff) | |
| download | git-4c7114308ea12de7b69a3b282881398212dec8dd.tar.gz | |
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>
| -rw-r--r-- | builtin/add.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/add.c b/builtin/add.c index aefbc45570..c55615be4c 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -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" |