From: Denton Liu Date: Sun, 04 Oct 2020 12:30:32 GMT Subject: [PATCH 0/2] checkout/restore: fix `git checkout -p HEAD...` bug Message-ID: As reported earlier[0], `git checkout -p HEAD...` results in the following error: $ git checkout -p HEAD... usage: git diff-index [-m] [--cached] [] [...] common diff options: -z output diff-raw with lines terminated with NUL. -p output patch format. -u synonym for -p. --patch-with-raw output both a patch and the diff-raw format. --stat show diffstat instead of patch. --numstat show numeric diffstat instead of patch. --patch-with-stat output a patch and prepend its diffstat. --name-only show only names of changed files. --name-status show names and status of changed files. --full-index show full object name on index lines. --abbrev= abbreviate object names in diff-tree header and diff-raw. -R swap input file pairs. -B detect complete rewrites. -M detect renames. -C detect copies. --find-copies-harder try unchanged files as candidate for copy detection. -l limit rename attempts up to paths. -O reorder diffs according to the . -S find filepair whose only one side contains the string. --pickaxe-all show all files diff when -S is used and hit is found. -a --text treat all files as text. Cannot close git diff-index --cached --numstat --summary HEAD... -- () at /libexec/git-core/git-add--interactive line 183. Since it was decided that should also officially support the merge-base revs, fix `git checkout -p ...` and officially document the support. [0]: https://lore.kernel.org/git/20200929061830.GA40759@generichostname/ Denton Liu (2): builtin/checkout: fix `git checkout -p HEAD...` bug Doc: document "A...B" form for in checkout and switch Documentation/git-checkout.txt | 4 ++++ Documentation/git-restore.txt | 4 ++++ builtin/checkout.c | 14 +++++++++++++- t/t2016-checkout-patch.sh | 7 +++++++ t/t2071-restore-patch.sh | 8 ++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) -- 2.28.0.942.g77c4c6094c