summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2020-12-21 18:19:59 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-21 13:47:32 -0800
commit1d24509b7b865115836982267a5e54b2f7d77c42 (patch)
tree44cf3e0bc89d3dfc755f8a859b8eaf91332f9cdc /merge.c
parentdoc/rev-list-options: document --first-parent changes merges format (diff)
downloadtgif-1d24509b7b865115836982267a5e54b2f7d77c42.tar.xz
doc/git-show: include --diff-merges description
Move description of --diff-merges option from git-log.txt to diff-options.txt so that it is included in the git-show help. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions