summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:14 -0700
commite2ab0227aab5cdcede3b39e4c95b118f09a71d29 (patch)
treeb066fb12c3e9f50c18d6e26086e277c978487228 /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'maint' (diff)
parentgit checkout: create unparented branch by --orphan (diff)
downloadtgif-e2ab0227aab5cdcede3b39e4c95b118f09a71d29.tar.xz
Merge branch 'em/checkout-orphan'
* em/checkout-orphan: git checkout: create unparented branch by --orphan
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions