diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:35:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:35:43 -0700 |
| commit | d2db8f78c469f4b346a048b5deed7c6fdd4b8d05 (patch) | |
| tree | 62ec3225da5092e637353ada32cc43744d66dd97 /builtin/merge-file.c | |
| parent | Merge branch 'fg/submodule-non-ascii-path' into maint (diff) | |
| parent | pull: merge into unborn by fast-forwarding from empty tree (diff) | |
| download | tgif-d2db8f78c469f4b346a048b5deed7c6fdd4b8d05.tar.xz | |
Merge branch 'jk/pull-into-dirty-unborn' into maint
"git pull" into nothing trashed "local changes" that were in the
index.
* jk/pull-into-dirty-unborn:
pull: merge into unborn by fast-forwarding from empty tree
pull: update unborn branch tip after index
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions