summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-22 13:05:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-22 13:05:56 -0700
commitfe3fec53a63a1c186452f61b0e55ac2837bf18a1 (patch)
tree77b3e530bb16e516691fbeaaa1f6f073eef6b473 /builtin/merge-recursive.c
parentMerge branch 'ab/imap-send-read-everything-simplify' (diff)
parentrev-list: add option for --pretty=format without header (diff)
downloadtgif-fe3fec53a63a1c186452f61b0e55ac2837bf18a1.tar.xz
Merge branch 'bc/rev-list-without-commit-line'
"git rev-list" learns to omit the "commit <object-name>" header lines from the output with the `--no-commit-header` option. * bc/rev-list-without-commit-line: rev-list: add option for --pretty=format without header
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions