diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2015-05-27 23:52:23 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-05-28 12:38:46 -0700 |
| commit | fc0aa395f3205a049e917d391e2afa93cda0c8af (patch) | |
| tree | ef6971192c0ed08b494114aec06d2b36a4918581 /compat/obstack.c | |
| parent | Git 2.2.2 (diff) | |
| download | tgif-fc0aa395f3205a049e917d391e2afa93cda0c8af.tar.xz | |
Documentation: include 'merge.branchdesc' for merge and config as well
'merge.branchdesc' is only mentioned in the docs of 'git fmt-merge-msg'.
The description of 'merge.log' is already duplicated between
'merge-config.txt' and 'git-fmt-merge-msg.txt'; instead of duplicating the
description of another config variable, extract the descriptions of both
of these variables from 'git-fmt-merge-msg.txt' into a separate file and
include it there and in 'merge-config.txt'.
Leave 'merge.summary' only in git-fmt-merge-msg.txt, as it is marked
as deprecated.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/obstack.c')
0 files changed, 0 insertions, 0 deletions