diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-06 19:46:09 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-08 13:06:44 -0700 |
| commit | f8da6801e2fb3e46a42031b860c6411ef76a0335 (patch) | |
| tree | 2f6c105cb4997b6f42a49aee4e8a617729cd78c7 /notes-merge.h | |
| parent | am -3: support 3way merge on unborn branch (diff) | |
| download | tgif-f8da6801e2fb3e46a42031b860c6411ef76a0335.tar.xz | |
am --skip: support skipping while on unborn branch
When git am --skip is run, git am will copy HEAD's tree entries to the
index with "git reset HEAD". However, on an unborn branch, HEAD does not
point to a tree, so "git reset HEAD" will fail.
Fix this by treating HEAD as en empty tree when we are on an unborn
branch.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions