diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-11 10:32:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-11 10:32:03 -0700 |
| commit | c75aa630b2f7c9a6cbdaa3333daa1b128b3b8a01 (patch) | |
| tree | ce81837ff2d9541b7fc68a4c871407ee5c7bc166 | |
| parent | Merge branch 'gp/add-u-A-documentation' (diff) | |
| parent | add: update pathless 'add [-u|-A]' warning to reflect change of plan (diff) | |
| download | tgif-c75aa630b2f7c9a6cbdaa3333daa1b128b3b8a01.tar.xz | |
Merge branch 'mm/add-u-A-finishing-touches'
* mm/add-u-A-finishing-touches:
add: update pathless 'add [-u|-A]' warning to reflect change of plan
| -rw-r--r-- | builtin/add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/add.c b/builtin/add.c index 0dd014eb96..ab1c9e8fb7 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -328,9 +328,9 @@ static void warn_pathless_add(const char *option_name, const char *short_name) { * this is not the original behavior and can't be * changed until users trained themselves not to type * "git add -u" or "git add -A". For now, we warn and - * keep the old behavior. Later, this warning can be - * turned into a die(...), and eventually we may - * reallow the command with a new behavior. + * keep the old behavior. Later, the behavior can be changed + * to tree-wide, keeping the warning for a while, and + * eventually we can drop the warning. */ warning(_("The behavior of 'git add %s (or %s)' with no path argument from a\n" "subdirectory of the tree will change in Git 2.0 and should not be used anymore.\n" |