| commit | fe8cb944dcd6a40b50740d9a7c2f380dce287e84 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Aug 2009 04:16:49 +0000 (6 21:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Aug 2009 04:16:49 +0000 (6 21:16 -0700) | ||
| tree | b63404790a421cb935008ef099595f2179add06d | treesnapshot (tar.gz zip) |
| parent | a489249e8f20a51bef4896f6eda9de7eaedb3c1f | commitdiff |
| parent | 4d4d5726aee31522e90df21ef62ee3377c5d8f8d | commitdiff |
Merge branch 'jc/shortstatus' (early part) into next
* 'jc/shortstatus' (early part):
status: show worktree status of conflicted paths separately
wt-status.c: rework the way changes to the index and work tree are summarized
diff-index: keep the original index intact
diff-index: report unmerged new entries
* 'jc/shortstatus' (early part):
status: show worktree status of conflicted paths separately
wt-status.c: rework the way changes to the index and work tree are summarized
diff-index: keep the original index intact
diff-index: report unmerged new entries
| diff-lib.c | diff1 | diff2 | blobhistory |