summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:19 (GMT)
commit630724ca79b1a7893a8d9c04367eae857ff1a7b0 (patch)
treeb1eb1c999bf904e164a0f48e1621ee74c981514d /compat
parent78bc024ab075f4d5d9cc0b6540b538f3d93d04cb (diff)
parent99c419c91554e9f60940228006b7d39d42704da7 (diff)
downloadgit-630724ca79b1a7893a8d9c04367eae857ff1a7b0.zip
git-630724ca79b1a7893a8d9c04367eae857ff1a7b0.tar.gz
git-630724ca79b1a7893a8d9c04367eae857ff1a7b0.tar.bz2
Merge branch 'jc/branch-d'
* jc/branch-d: branch -d: base the "already-merged" safety on the branch it merges with
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions