![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2009 22:01:16 +0000 (15:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2009 22:01:16 +0000 (15:01 -0700) | ||
| commit | 9affecbc89538b6fd63f772b6f14047bced9345e | |
| tree | b4047fd9dec7f6dde2c1d41eae23d8ce74375dc4 | tree | snapshot |
| parent | 659f09689614d3d745b9aea746672bf43216d294 | commit | diff |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 | commit | diff |
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
* 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 |