summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:32 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:32 +0900
commit022dd4a0d3153c28b763b5fcf43a14afc6bc1a74 (patch)
treeb8c9ab420f2a8fffe94cc3cbb4e9d3ee9a153421 /git-mergetool.sh
parentMerge branch 'jc/ignore-cr-at-eol' (diff)
parentmerge-base --fork-point doc: clarify the example and failure modes (diff)
downloadtgif-022dd4a0d3153c28b763b5fcf43a14afc6bc1a74.tar.xz
Merge branch 'jc/merge-base-fork-point-doc'
Clarify and enhance documentation for "merge-base --fork-point", as it was clear what it computed but not why/what for. * jc/merge-base-fork-point-doc: merge-base --fork-point doc: clarify the example and failure modes
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions