kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
25,951 Commits
6 Branches
978 Tags
171 MiB
Commit Graph

2 Commits (cbbc935ce0ce51ecb51bea7f841d578297f8b8ae)

Author SHA1 Message Date
Jeff King e9fe74cba4 t3503: test cherry picking and reverting root commits 
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>
 2011-05-16 13:05:03 -07:00
Johannes Schindelin f95ebf7429 Allow cherry-picking root commits 
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>
 2008-07-07 13:23:42 -07:00