diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-18 18:54:06 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-18 13:17:32 -0700 |
| commit | 49ec402d52dc8f8e55e62537c95766b623e63d6b (patch) | |
| tree | 242314d869d00b6d744b510acdd6d85ece9f2b2e /t/t7112-reset-submodule.sh | |
| parent | pull: fast-forward working tree if head is updated (diff) | |
| download | tgif-49ec402d52dc8f8e55e62537c95766b623e63d6b.tar.xz | |
pull: implement pulling into an unborn branch
b4dc085 (pull: merge into unborn by fast-forwarding from empty
tree, 2013-06-20) established git-pull's current behavior of pulling
into an unborn branch by fast-forwarding the work tree from an empty
tree to the merge head, then setting HEAD to the merge head.
Re-implement this behavior by introducing pull_into_void() which will be
called instead of run_merge() if HEAD is invalid.
Helped-by: Stephen Robin <stephen.robin@gmail.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7112-reset-submodule.sh')
0 files changed, 0 insertions, 0 deletions