summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-17 15:39:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-17 15:39:43 -0700
commit1c71541ddd51968ca2957063b00da42941d13d98 (patch)
tree8d7033f891dbb1964103488e5b7045e556c2cc84 /git-rebase--merge.sh
parentMerge branch 'maint' (diff)
parentt1507: Test that branchname@{upstream} is interpreted as branch (diff)
downloadtgif-1c71541ddd51968ca2957063b00da42941d13d98.tar.xz
Merge branch 'maint'
* maint: t1507: Test that branchname@{upstream} is interpreted as branch
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions