![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 14:47:03 +0000 (07:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 14:47:03 +0000 (07:47 -0700) | ||
| commit | b91ffd37d5c18046f7b0bf47e939273bead9e52e | |
| tree | 6b912973a29e5fa81340388f978904764f5a0f37 | tree | snapshot |
| parent | f2823263bd53b62831450277c746c6cbfcb95a15 | commit | diff |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 | commit | diff |
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
| builtin-apply.c | diff1 | | diff2 | | blob | history |
| builtin-fmt-merge-msg.c | diff1 | | diff2 | | blob | history |
| t/t6200-fmt-merge-msg.sh | diff1 | | diff2 | | blob | history |