summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 15:20:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 15:20:28 -0800
commit9ba366f12baa9eae07c07fad0e873940dfc25e11 (patch)
tree5399b7640d2234e090218cf161d04d5a97fa279e /git-mergetool.sh
parentMerge branch 'ew/decline-core-abbrev' (diff)
parentrev-parse: add option for absolute or relative path formatting (diff)
downloadtgif-9ba366f12baa9eae07c07fad0e873940dfc25e11.tar.xz
Merge branch 'bc/rev-parse-path-format'
"git rev-parse" can be explicitly told to give output as absolute or relative path with the `--path-format=(absolute|relative)` option. * bc/rev-parse-path-format: rev-parse: add option for absolute or relative path formatting abspath: add a function to resolve paths with missing components
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions