diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:29:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:29:52 -0700 |
| commit | 833cd7fc9fed8568a3612e9b1b204290b0f0e15d (patch) | |
| tree | ca145ec8b6e1b0376504a4faa8f6f2bafdfcedeb /column.c | |
| parent | dc2ed04c23e59bf2ea93021fdb3660d7ded1f46c (diff) | |
| parent | b4dc085a8dc2ec2fb5f6366fa672222b807ed655 (diff) | |
| download | git-833cd7fc9fed8568a3612e9b1b204290b0f0e15d.tar.gz | |
Merge branch 'jk/pull-into-dirty-unborn'
"git pull" into nothing trashed "local changes" that were in the
index, and this avoids it.
* 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 'column.c')
0 files changed, 0 insertions, 0 deletions