summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:37:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:37:36 -0700
commitde91daf5e6c9346a54ec8afd331017470d280b12 (patch)
tree05302e81b1431efb8f0fb172851640054db363e0 /builtin/merge.c
parentMerge branch 'ap/strbuf-humanize' (diff)
parentadd -A: only show pathless 'add -A' warning when changes exist outside cwd (diff)
downloadtgif-de91daf5e6c9346a54ec8afd331017470d280b12.tar.xz
Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)
In Git 2.0, "git add -u" and "git add -A" without any pathspec will update the index for all paths, including those outside the current directory, making it more consistent with "commit -a". To help the migration pain, a warning is issued when the differences between the current behaviour and the upcoming behaviour matters, i.e. when the user has local changes outside the current directory. * 'jn/add-2.0-u-A-sans-pathspec' (early part): add -A: only show pathless 'add -A' warning when changes exist outside cwd add -u: only show pathless 'add -u' warning when changes exist outside cwd add: make warn_pathless_add() a no-op after first call add: add a blank line at the end of pathless 'add [-u|-A]' warning add: make pathless 'add [-u|-A]' warning a file-global function
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions