summaryrefslogtreecommitdiff
path: root/Documentation/git-fetch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-22 14:30:22 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-22 21:06:06 -0700
commitfdc97abd4a8b04781356dc561b4ba5a634f9854f (patch)
tree9935522fd27a8962b2567bca42997504408529fb /Documentation/git-fetch.txt
parent4c7114308ea12de7b69a3b282881398212dec8dd (diff)
downloadgit-fdc97abd4a8b04781356dc561b4ba5a634f9854f.tar.gz
git add <pathspec>... defaults to "-A"jc/add-2.0-ignore-removal
Make "git add <pathspec>..." notice paths that have been removed from the working tree, i.e. the same as "git add -A <pathspec>...". Given that "git add <pathspec>" is to update the index with the state of the named part of the working tree as a whole, it makes it more intuitive, and also makes it possible to simplify the advice we give while marking the paths the user finished resolving conflicts with. We used to say "to record removal as a resolution, remove the path from the working tree and say 'git rm'; for all other cases, edit the path in the working tree and say 'git add'", but we can now say "update the path in the working tree and say 'git add'" instead. As promised, this merges the temporary update_files_in_cache() helper function back to add_files_to_cache() function. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fetch.txt')
0 files changed, 0 insertions, 0 deletions