aboutsummaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-07 00:10:14 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-07 00:10:14 -0800
commit7bb5321be0ecb70a990ad49da2a1366c19201372 (patch)
tree82a8429e88beddb3b8bf8fb84aa39800670ae31d /remote.c
parentff32340669a5521ca2b4b547b4853bfe22f60386 (diff)
parent6d0e674a575421347abe5749e645ca6dc78c8207 (diff)
downloadgit-7bb5321be0ecb70a990ad49da2a1366c19201372.tar.gz
git-7bb5321be0ecb70a990ad49da2a1366c19201372.tar.xz
Merge branch 'rs/diff-ihc'
* rs/diff-ihc: diff: add option to show context between close hunks Conflicts: Documentation/diff-options.txt
Diffstat (limited to 'remote.c')
0 files changed, 0 insertions, 0 deletions