| commit | 194e9a9b538da221d560364e96bd28ea7ee58800 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Jun 2010 05:15:46 +0000 (7 22:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Jun 2010 05:15:46 +0000 (7 22:15 -0700) | ||
| tree | a5b0875d02dc5d1916a34a08a699f7596f1514e2 | treesnapshot (tar.gz zip) |
| parent | 83cf3b842d2bb0bb2704a88d6db24adf2a8ab14a | commitdiff |
| parent | 3e5a188f1d5b48dcc0bc73ad520925cdb846dfaf | commitdiff |
Merge branch 'jh/diff-index-line-abbrev' into next
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
Conflicts:
diff.c
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
Conflicts:
diff.c
| diff.c | diff1 | diff2 | blobhistory |