summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2019-04-07 21:52:11 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-08 17:01:09 +0900
commitd257e0fb0adc1eefa8e237391cd0e3aaa9d69e9d (patch)
tree5d4c31e1c9112fb57689661aea3bc40890f95db2 /merge-recursive.c
parentgc docs: include the "gc.*" section from "config" in "gc" (diff)
downloadtgif-d257e0fb0adc1eefa8e237391cd0e3aaa9d69e9d.tar.xz
gc docs: re-flow the "gc.*" section in "config"
Re-flow the "gc.*" section in "config". A previous commit moved this over from the "gc" docs, but tried to keep as many of the lines identical to benefit from diff's move detection. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions