| commit | fce56648056acf476aa810a02c6eb33cbcabb6c9 | |
| author | Jeff King <peff@peff.net> | |
| Mon, 5 Nov 2018 06:38:39 +0000 (5 01:38 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Nov 2018 03:55:35 +0000 (6 12:55 +0900) | ||
| tree | 6763cc696a759ce78b35c5204961ab727fad8c8d | treesnapshot (tar.gz zip) |
| parent | d5d202537f2cfec41304b559624b4cc0a2d8c9fe | commitdiff |
am: handle --no-patch-format option
Running "git am --no-patch-format" will currently segfault, since it
tries to parse a NULL argument. Instead, let's have it cancel any
previous --patch-format option.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Running "git am --no-patch-format" will currently segfault, since it
tries to parse a NULL argument. Instead, let's have it cancel any
previous --patch-format option.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/am.c | diffblobblamehistory |