![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jan 2009 08:10:14 +0000 (00:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jan 2009 08:10:14 +0000 (00:10 -0800) | ||
| commit | 7bb5321be0ecb70a990ad49da2a1366c19201372 | |
| tree | 82a8429e88beddb3b8bf8fb84aa39800670ae31d | tree | snapshot |
| parent | ff32340669a5521ca2b4b547b4853bfe22f60386 | commit | diff |
| parent | 6d0e674a575421347abe5749e645ca6dc78c8207 | commit | diff |
Merge branch 'rs/diff-ihc'
* rs/diff-ihc:
diff: add option to show context between close hunks
Conflicts:
Documentation/diff-options.txt
* rs/diff-ihc:
diff: add option to show context between close hunks
Conflicts:
Documentation/diff-options.txt
| Documentation/diff-options.txt | diff1 | | diff2 | | blob | history |
| contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |