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
Junio C Hamano committed
Feb 24, 2007 at 01:42 UTC
8a13becc0dd4c8876ebf471bf880446c1a10b7e9
No changes.