summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-06 23:12:09 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-07 10:11:47 -0700
commit898eacd8ada2d012f977948350ed60845e238037 (patch)
tree5d50d06cd00be020a74e1c14b52b3a10d6024a26 /environment.c
parentc0168147831fce00975949213eef3471b7a2b76b (diff)
downloadgit-898eacd8ada2d012f977948350ed60845e238037.tar.gz
fmt-merge-msg: use branch.$name.description
This teaches "merge --log" and fmt-merge-msg to use branch description information when merging a local topic branch into the mainline. The description goes between the branch name label and the list of commit titles. The refactoring to share the common configuration parsing between merge and fmt-merge-msg needs to be made into a separate patch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index e96edcfebc..ba9781b713 100644
--- a/environment.c
+++ b/environment.c
@@ -58,6 +58,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
char *notes_ref_name;
int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
+int merge_log_config = -1;
struct startup_info *startup_info;
/* Parallel index stat data preload? */