| commit | f95ebf74296077d5fdccaa2668edc527841db521 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Fri, 4 Jul 2008 15:19:52 +0000 (4 16:19 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Jul 2008 20:23:42 +0000 (7 13:23 -0700) | ||
| tree | b3744edcbc4ee2fdad99c93ad2f161ebd7a38ed4 | treesnapshot (tar.gz zip) |
| parent | 44701c67fd1d5d771b440c8646b7b268d4f1402d | commitdiff |
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>
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>
| builtin-revert.c | diffblobblamehistory | |
| t/t3503-cherry-pick-root.sh | [new file with mode: 0755] | blob |