summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-09-18 20:30:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-18 20:30:12 -0700
commit3791f77c28f233df121da2f83abf7eefc7b49b69 (patch)
tree8c50a58cf599933aa412a30d7cac615092d42aa0 /diff.c
parentMerge branch 'jc/diff-prefix' (diff)
parentMerge branch 'dp/maint-rebase-fix' into maint (diff)
downloadtgif-3791f77c28f233df121da2f83abf7eefc7b49b69.tar.xz
Merge branch 'maint'
* maint: sha1_file: link() returns -1 on failure, not errno Make git archive respect core.autocrlf when creating zip format archives Add new test to demonstrate git archive core.autocrlf inconsistency gitweb: avoid warnings for commits without body Clarified gitattributes documentation regarding custom hunk header. git-svn: fix handling of even funkier branch names git-svn: Always create a new RA when calling do_switch for svn:// git-svn: factor out svnserve test code for later use diff/diff-files: do not use --cc too aggressively
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions