summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-11-18 06:13:08 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-18 11:55:58 -0800
commit73b7eae60c18036eab21a84e42bfa8b5297fe679 (patch)
tree6aa3fd7d4591f15fb4def0d2f71ada7a7898336e /Documentation/git-merge-file.txt
parentrefresh_index: rename format variables (diff)
downloadtgif-73b7eae60c18036eab21a84e42bfa8b5297fe679.tar.xz
refresh_index: make porcelain output more specific
If you have a deleted file and a porcelain refreshes the cache, we print: Unstaged changes after reset: M file This is technically correct, in that the file is modified, but it's friendlier to the user if we further differentiate the case of a deleted file (especially because this output looks a lot like "diff --name-status", which would also make the distinction). Similarly, we can distinguish typechanges ("T") and intent-to-add files ("A"), both of which appear as just "M" in the current output. The plumbing output for all cases remains "needs update" for historical compatibility. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions