summaryrefslogtreecommitdiff
path: root/t/t6134-pathspec-in-submodule.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-09 11:21:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-09 11:21:19 -0700
commit0e0d717537547e8fcba441e4f65237c7fd227a34 (patch)
tree1cb5ad50202b03853e3baef2b26fd13a29df45ac /t/t6134-pathspec-in-submodule.sh
parentMerge branch 'am/pathspec-f-f-more' (diff)
parentam: support --show-current-patch=diff to retrieve .git/rebase-apply/patch (diff)
downloadtgif-0e0d717537547e8fcba441e4f65237c7fd227a34.tar.xz
Merge branch 'pb/am-show-current-patch'
"git am --short-current-patch" is a way to show the piece of e-mail for the stopped step, which is not suitable to directly feed "git apply" (it is designed to be a good "git am" input). It learned a new option to show only the patch part. * pb/am-show-current-patch: am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE()
Diffstat (limited to 't/t6134-pathspec-in-submodule.sh')
0 files changed, 0 insertions, 0 deletions