summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-24 01:42:06 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-24 01:42:06 -0800
commit8a13becc0dd4c8876ebf471bf880446c1a10b7e9 (patch)
tree9448f573c17a91697904e46305f09f7679e7e4dd /Makefile
parent.mailmap maintenance after pulling from git-svn (diff)
parentdiff-patch: Avoid emitting double-slashes in textual patch. (diff)
downloadtgif-8a13becc0dd4c8876ebf471bf880446c1a10b7e9.tar.xz
Merge branch 'maint'
* maint: diff-patch: Avoid emitting double-slashes in textual patch. Reword git-am 3-way fallback failure message. Limit filename for format-patch core.legacyheaders: Use the description used in RelNotes-1.5.0 git-show-ref --verify: Fail if called without a reference Conflicts: builtin-show-ref.c diff.c
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions