summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-30 15:39:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-30 15:39:41 -0700
commit96ffd4ca937616c4a419cb9e2ef80b3156acaf80 (patch)
treec876e8fe5c1ca4514fc1d2c23cf142e407d44288 /Documentation/git-merge.txt
parentMerge branch 'jk/submodule-subdirectory-ok' (diff)
parentname-rev: allow to specify a subpath for --refs option (diff)
downloadtgif-96ffd4ca937616c4a419cb9e2ef80b3156acaf80.tar.xz
Merge branch 'nk/name-rev-abbreviated-refs'
"git name-rev --refs=tags/v*" were forbidden, which was a bit inconvenient (you had to give a pattern to match refs fully, like --refs=refs/tags/v*). * nk/name-rev-abbreviated-refs: name-rev: allow to specify a subpath for --refs option
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions