diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:14 +0900 |
| commit | 4a3ed2bec6031545aea38db10e443a979951346f (patch) | |
| tree | dbb5ba4597bdd046ac9ed9dc0e57a7de9250a636 /path.c | |
| parent | Merge branch 'js/difftool-no-index' (diff) | |
| parent | checkout: prevent losing staged changes with --merge (diff) | |
| download | tgif-4a3ed2bec6031545aea38db10e443a979951346f.tar.xz | |
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
Diffstat (limited to 'path.c')
0 files changed, 0 insertions, 0 deletions