diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-12 23:46:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-12 23:46:32 +0100 |
| commit | fce8b5d82fadd0bc27b12ae91bf7ad74d6488e97 (patch) | |
| tree | b5e532b473b7bde254ad1218265369965191133c /resolve-undo.c | |
| parent | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maint (diff) | |
| parent | diff -p: squelch "diff --git" header for stat-dirty paths (diff) | |
| download | git-fce8b5d82fadd0bc27b12ae91bf7ad74d6488e97.tar.xz git-fce8b5d82fadd0bc27b12ae91bf7ad74d6488e97.zip | |
Merge branch 'jc/maint-diff-patch-header' into maint
"git diff-index" and its friends at the plumbing level showed the
"diff --git" header and nothing else for a path whose cached stat
info is dirty without actual difference when asked to produce a
patch. This was a longstanding bug that we could have fixed long
time ago.
By Junio C Hamano
* jc/maint-diff-patch-header:
diff -p: squelch "diff --git" header for stat-dirty paths
t4011: illustrate "diff-index -p" on stat-dirty paths
t4011: modernise style
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions