summaryrefslogtreecommitdiff
path: root/Documentation/git-lost-found.txt
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-12-11 16:38:58 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-13 23:40:24 -0800
commit85bf49f9a55fd9ded396460d245a55b651d7bdaa (patch)
treef7927bdd30d780307a963ddf63a71f5543ebe09e /Documentation/git-lost-found.txt
parentoctopus: make merge process simpler to follow (diff)
downloadtgif-85bf49f9a55fd9ded396460d245a55b651d7bdaa.tar.xz
octopus: reenable fast-forward merges
The fast-forward logic is never being triggered because $common and $MRC are never equivalent. $common is initialized to a commit id by merge-base and MRC is initialized to HEAD. Fix this by initializing $MRC to the commit id for HEAD so that its possible for $MRC and $common to be equal. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-lost-found.txt')
0 files changed, 0 insertions, 0 deletions