summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-03-06 21:25:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-06 21:25:33 -0800
commit7a4e06c42a1e06f43f90b302cad09f31ec438ff1 (patch)
tree59552439230232daa74fa3f58a3a2a099f206bbf /git-merge-one-file.sh
parentMerge branch 'gc/stash-on-branch-with-multi-level-name' (diff)
parentls-files: support --recurse-submodules --stage (diff)
downloadtgif-7a4e06c42a1e06f43f90b302cad09f31ec438ff1.tar.xz
Merge branch 'jt/ls-files-stage-recurse'
Many output modes of "ls-files" do not work with its "--recurse-submodules" option, but the "-s" mode has been taught to work with it. * jt/ls-files-stage-recurse: ls-files: support --recurse-submodules --stage
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions