summaryrefslogtreecommitdiff
path: root/t/t3503-cherry-pick-root.sh
AgeCommit message (Collapse)AuthorFilesLines
2011-05-16t3503: test cherry picking and reverting root commitsLibravatar Jeff King1-2/+25
We already tested cherry-picking a root commit, but only with the internal merge-recursive strategy. Let's also test the recently-allowed reverting of a root commit, as well as testing with external strategies (which until recently triggered a segfault). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-07Allow cherry-picking root commitsLibravatar Johannes Schindelin1-0/+30
A root commit couldn't be cherry-picked. But its semantics can be defined as simply merging two trees by overlaying disjoint parts and merging overlapping files without any common ancestor. You should be able to rebase originally independent branches on top of another branch by using this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>