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

Merge branch 'mm/add-u-A-finishing-touches'

Browse Source 
* mm/add-u-A-finishing-touches:
  add: update pathless 'add [-u|-A]' warning to reflect change of plan
This commit is contained in:
Junio C Hamano 2013-03-11 10:32:03 -07:00
commit c75aa630b2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/add.c
View File

@ -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 * this is not the original behavior and can't be
* changed until users trained themselves not to type * changed until users trained themselves not to type
* "git add -u" or "git add -A". For now, we warn and * "git add -u" or "git add -A". For now, we warn and
* keep the old behavior. Later, this warning can be * keep the old behavior. Later, the behavior can be changed
* turned into a die(...), and eventually we may * to tree-wide, keeping the warning for a while, and
* reallow the command with a new behavior. * eventually we can drop the warning.
*/ */
warning(_("The behavior of 'git add %s (or %s)' with no path argument from a\n" 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" "subdirectory of the tree will change in Git 2.0 and should not be used anymore.\n"