summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-21 12:05:02 -0800
committerJunio C Hamano <gitster@pobox.com>2013-04-22 07:59:22 -0700
commitbe1a07fe27695081537d31748b989f86c82383cc (patch)
tree36bec251b5259cf89c85a47158e6f75070726d43 /commit.h
parent47d6c5f2c112df55997742eab8d974bfa1cf7b3e (diff)
downloadgit-jc/format-patch.tar.gz
format-patch: --inline-singlejc/format-patch
Some people may find it convenient to append a simple patch at the bottom of a discussion e-mail separated by a "scissors" mark, ready to be applied with "git am -c". Introduce "--inline-single" option to format-patch to do so. A typical usage example might be to start 'f'ollow-up to a discussion, write your message, conclude with "a patch to do so may look like this.", and then \C-u M-! git format-patch --inline-single -1 HEAD <ENTER> if you are an Emacs user. Users of other MUA's may want to consult their manuals to find an equivalent command to append output from an external command to the message being composed. It does not make any sense to use this mode when formatting multiple patches, or to combine this with options such as --attach, --inline, and --cover-letter, so some of such uses are forbidden. There may be more insane combination the check in this patch may not even bother to reject. Caveat emptor. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 057ff8045e..c7d026bb2d 100644
--- a/commit.h
+++ b/commit.h
@@ -86,6 +86,7 @@ struct pretty_print_context {
int preserve_subject;
enum date_mode date_mode;
unsigned date_mode_explicit:1;
+ unsigned inline_single:1;
int need_8bit_cte;
char *notes_message;
struct reflog_walk_info *reflog_info;