Junio C Hamano 833cd7fc9f 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

2013-06-27 14:29:52 -07:00

8.0 KiB

Executable File

Raw Blame History

View Raw