| commit | f55734fd8c7209855d50c0acb45e7228899e41f7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 May 2017 03:34:45 +0000 (29 12:34 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 May 2017 03:34:45 +0000 (29 12:34 +0900) | ||
| tree | 47f36515b7ee83b8d515113fff29c98c2d01d296 | treesnapshot (tar.gz zip) |
| parent | 849e671b52e11d4a2f70d577dd2c806f3ca756fe | commitdiff |
| parent | b9b10d36816b8c7276bb83eb08fdbb59f68ef99b | commitdiff |
Merge branch 'jc/read-tree-empty-with-m'
"git read-tree -m" (no tree-ish) gave a nonsense suggestion "use
--empty if you want to clear the index". With "-m", such a request
will still fail anyway, as you'd need to name at least one tree-ish
to be merged.
* jc/read-tree-empty-with-m:
read-tree: "read-tree -m --empty" does not make sense
"git read-tree -m" (no tree-ish) gave a nonsense suggestion "use
--empty if you want to clear the index". With "-m", such a request
will still fail anyway, as you'd need to name at least one tree-ish
to be merged.
* jc/read-tree-empty-with-m:
read-tree: "read-tree -m --empty" does not make sense
| builtin/read-tree.c | diff1 | diff2 | blobhistory |