![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Feb 2007 09:42:06 +0000 (01:42 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Feb 2007 09:42:06 +0000 (01:42 -0800) | ||
| commit | 8a13becc0dd4c8876ebf471bf880446c1a10b7e9 | |
| tree | 9448f573c17a91697904e46305f09f7679e7e4dd | tree | snapshot |
| parent | 509b4d73b26bb442fd409bbca3772ba22875d310 | commit | diff |
| parent | 5089277718503a4de7817b5f6754cb03116d5524 | commit | diff |
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
* 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
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| builtin-log.c | diff1 | | diff2 | | blob | history |
| builtin-show-ref.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |