diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:47:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:47:03 -0700 |
| commit | b91ffd37d5c18046f7b0bf47e939273bead9e52e (patch) | |
| tree | 6b912973a29e5fa81340388f978904764f5a0f37 /builtin-fmt-merge-msg.c | |
| parent | f2823263bd53b62831450277c746c6cbfcb95a15 (diff) | |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 (diff) | |
| download | git-b91ffd37d5c18046f7b0bf47e939273bead9e52e.tar.gz | |
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
Diffstat (limited to 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index a7883690d7..fae1482ba9 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -363,6 +363,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0); if (argc > 0) usage_with_options(fmt_merge_msg_usage, options); + inpath = parse_options_fix_filename(prefix, inpath); if (inpath && strcmp(inpath, "-")) { in = fopen(inpath, "r"); |