summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-04-25 14:29:47 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-26 12:28:43 +0900
commit25cff9f109afbd6d21b199a38d15911b1f0c5069 (patch)
treefef849490518e7533a4411c730c7bd9baf53e302 /builtin/difftool.c
parentrebase -i: introduce --rebase-merges=[no-]rebase-cousins (diff)
downloadtgif-25cff9f109afbd6d21b199a38d15911b1f0c5069.tar.xz
rebase -i --rebase-merges: add a section to the man page
The --rebase-merges mode is probably not half as intuitive to use as its inventor hopes, so let's document it some. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/difftool.c')
0 files changed, 0 insertions, 0 deletions