summaryrefslogtreecommitdiff
path: root/var.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-04 16:19:52 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-07 13:23:42 -0700
commitf95ebf74296077d5fdccaa2668edc527841db521 (patch)
treeb3744edcbc4ee2fdad99c93ad2f161ebd7a38ed4 /var.c
parentMerge branch 'qq/maint' (diff)
downloadtgif-f95ebf74296077d5fdccaa2668edc527841db521.tar.xz
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>
Diffstat (limited to 'var.c')
0 files changed, 0 insertions, 0 deletions