diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:14 (GMT) |
| commit | 4a3ed2bec6031545aea38db10e443a979951346f (patch) | |
| tree | dbb5ba4597bdd046ac9ed9dc0e57a7de9250a636 /Documentation | |
| parent | b72e90712eb0e802b232ad4c88460d04279c7111 (diff) | |
| parent | 6eff409e8a760645ae5357d1e95e7e7ff3c04456 (diff) | |
| download | git-4a3ed2bec6031545aea38db10e443a979951346f.zip git-4a3ed2bec6031545aea38db10e443a979951346f.tar.gz git-4a3ed2bec6031545aea38db10e443a979951346f.tar.bz2 | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-read-tree.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 7061d66..d271842 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -129,6 +129,10 @@ OPTIONS Instead of reading tree object(s) into the index, just empty it. +-q:: +--quiet:: + Quiet, suppress feedback messages. + <tree-ish#>:: The id of the tree object(s) to be read/merged. |