Junio C Hamano 4a3ed2bec6 Merge branch 'nd/checkout-m'
"git checkout -m <other>" was about carrying the differences
between HEAD and the working-tree files forward while checking out
another branch, and ignored the differences between HEAD and the
index.  The command has been taught to abort when the index and the
HEAD are different.

* nd/checkout-m:
  checkout: prevent losing staged changes with --merge
  read-tree: add --quiet
  unpack-trees: rename "gently" flag to "quiet"
  unpack-trees: keep gently check inside add_rejected_path
2019-04-25 16:41:14 +09:00
..
2019-04-22 11:14:45 +09:00
2019-04-22 11:15:06 +09:00
2019-03-18 15:54:17 +09:00
2018-06-25 13:22:36 -07:00
2019-01-23 11:37:29 -08:00
2019-01-23 11:37:29 -08:00
2019-01-23 11:37:29 -08:00
2019-03-20 15:16:06 +09:00
2019-03-11 16:16:26 +09:00
2019-01-23 11:37:29 -08:00
2019-04-25 16:41:14 +09:00
2018-09-17 13:53:55 -07:00
2019-01-23 11:37:29 -08:00
2019-04-22 11:14:45 +09:00
2019-01-23 11:37:29 -08:00
2019-01-23 11:37:29 -08:00
2019-03-18 14:45:21 +09:00
2018-12-26 14:59:37 -08:00
2019-04-22 11:14:45 +09:00
2019-04-22 11:14:46 +09:00