* [PATCH] doc: restore: remove note on --patch w/ pathspecs
@ 2023-05-05 10:32 Adam Johnson via GitGitGadget
2023-05-25 7:25 ` Adam Johnson
2023-06-01 21:14 ` [PATCH v2] " Adam Johnson via GitGitGadget
0 siblings, 2 replies; 4+ messages in thread
From: Adam Johnson via GitGitGadget @ 2023-05-05 10:32 UTC (permalink / raw)
To: git; +Cc: Johannes Schindelin, Junio C Hamano, Adam Johnson, Adam Johnson
From: Adam Johnson <me@adamj.eu>
This note was added with the command in 46e91b663b (checkout: split part of
it to new command 'restore', 2019-04-25), but it is now inaccurate. The
underlying builtin `add -i` implementation, made default in 0527ccb1b5 (add
-i: default to the built-in implementation, 2021-11-30), supports pathspecs,
so `git restore -p <pathspec>...` has worked for all users since then. I
bisected to verify this was the commit that added support.
Signed-off-by: Adam Johnson <me@adamj.eu>
---
doc: restore: remove note on --patch w/ pathspecs
This note was added with the command in 46e91b663b, but it is now
inaccurate. The underlying builtin add -i implementation, made default
in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>...
has worked for all users since then. I bisected to verify this.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v1
Pull-Request: https://github.com/git/git/pull/1504
Documentation/git-restore.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 5964810caa4..d31a06a673e 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
restore source and the restore location. See the ``Interactive
Mode'' section of linkgit:git-add[1] to learn how to operate
the `--patch` mode.
-+
-Note that `--patch` can accept no pathspec and will prompt to restore
-all modified paths.
-W::
--worktree::
base-commit: f285f68a132109c234d93490671c00218066ace9
--
gitgitgadget
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: restore: remove note on --patch w/ pathspecs
2023-05-05 10:32 [PATCH] doc: restore: remove note on --patch w/ pathspecs Adam Johnson via GitGitGadget
@ 2023-05-25 7:25 ` Adam Johnson
2023-06-01 5:09 ` Junio C Hamano
2023-06-01 21:14 ` [PATCH v2] " Adam Johnson via GitGitGadget
1 sibling, 1 reply; 4+ messages in thread
From: Adam Johnson @ 2023-05-25 7:25 UTC (permalink / raw)
To: Adam Johnson via GitGitGadget; +Cc: git, Johannes Schindelin, Junio C Hamano
Hi, is there anything I can do to help with review?
On Fri, May 5, 2023 at 11:32 AM Adam Johnson via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: Adam Johnson <me@adamj.eu>
>
> This note was added with the command in 46e91b663b (checkout: split part of
> it to new command 'restore', 2019-04-25), but it is now inaccurate. The
> underlying builtin `add -i` implementation, made default in 0527ccb1b5 (add
> -i: default to the built-in implementation, 2021-11-30), supports pathspecs,
> so `git restore -p <pathspec>...` has worked for all users since then. I
> bisected to verify this was the commit that added support.
>
> Signed-off-by: Adam Johnson <me@adamj.eu>
> ---
> doc: restore: remove note on --patch w/ pathspecs
>
> This note was added with the command in 46e91b663b, but it is now
> inaccurate. The underlying builtin add -i implementation, made default
> in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>...
> has worked for all users since then. I bisected to verify this.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v1
> Pull-Request: https://github.com/git/git/pull/1504
>
> Documentation/git-restore.txt | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
> index 5964810caa4..d31a06a673e 100644
> --- a/Documentation/git-restore.txt
> +++ b/Documentation/git-restore.txt
> @@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
> restore source and the restore location. See the ``Interactive
> Mode'' section of linkgit:git-add[1] to learn how to operate
> the `--patch` mode.
> -+
> -Note that `--patch` can accept no pathspec and will prompt to restore
> -all modified paths.
>
> -W::
> --worktree::
>
> base-commit: f285f68a132109c234d93490671c00218066ace9
> --
> gitgitgadget
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: restore: remove note on --patch w/ pathspecs
2023-05-25 7:25 ` Adam Johnson
@ 2023-06-01 5:09 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2023-06-01 5:09 UTC (permalink / raw)
To: Adam Johnson; +Cc: Adam Johnson via GitGitGadget, git, Johannes Schindelin
Adam Johnson <me@adamj.eu> writes:
> Hi, is there anything I can do to help with review?
One good thing you can do is to ping like you did ;-)
I have been down/sick and will be a bit busy with release work but
after that I may find time to review it myself, as it sounds like an
easy change. But I'll comment on something I immediately spotted.
>
> On Fri, May 5, 2023 at 11:32 AM Adam Johnson via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> From: Adam Johnson <me@adamj.eu>
>>
>> This note was added with the command in 46e91b663b (checkout: split part of
"command" -> "commit", I think.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] doc: restore: remove note on --patch w/ pathspecs
2023-05-05 10:32 [PATCH] doc: restore: remove note on --patch w/ pathspecs Adam Johnson via GitGitGadget
2023-05-25 7:25 ` Adam Johnson
@ 2023-06-01 21:14 ` Adam Johnson via GitGitGadget
1 sibling, 0 replies; 4+ messages in thread
From: Adam Johnson via GitGitGadget @ 2023-06-01 21:14 UTC (permalink / raw)
To: git; +Cc: Johannes Schindelin, Junio C Hamano, Adam Johnson, Adam Johnson
From: Adam Johnson <me@adamj.eu>
This note was added with the restore command docs in 46e91b663b
(checkout: split part of it to new command 'restore', 2019-04-25), but it is
now inaccurate. The underlying builtin `add -i` implementation, made default
in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30),
supports pathspecs, so `git restore -p <pathspec>...` has worked for all
users since then. I bisected to verify this was the commit that added
support.
Signed-off-by: Adam Johnson <me@adamj.eu>
---
doc: restore: remove note on --patch w/ pathspecs
This note was added with the command in 46e91b663b, but it is now
inaccurate. The underlying builtin add -i implementation, made default
in 0527ccb1b5, does support pathspecs, so git restore -p <pathspec>...
has worked for all users since then. I bisected to verify this.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1504%2Fadamchainz%2Faj%2Fgit-restore-patch-docs-fix-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1504/adamchainz/aj/git-restore-patch-docs-fix-v2
Pull-Request: https://github.com/git/git/pull/1504
Range-diff vs v1:
1: 784143b9949 ! 1: 556f4323ce6 doc: restore: remove note on --patch w/ pathspecs
@@ Metadata
## Commit message ##
doc: restore: remove note on --patch w/ pathspecs
- This note was added with the command in 46e91b663b (checkout: split part of
- it to new command 'restore', 2019-04-25), but it is now inaccurate. The
- underlying builtin `add -i` implementation, made default in 0527ccb1b5 (add
- -i: default to the built-in implementation, 2021-11-30), supports pathspecs,
- so `git restore -p <pathspec>...` has worked for all users since then. I
- bisected to verify this was the commit that added support.
+ This note was added with the restore command docs in 46e91b663b
+ (checkout: split part of it to new command 'restore', 2019-04-25), but it is
+ now inaccurate. The underlying builtin `add -i` implementation, made default
+ in 0527ccb1b5 (add -i: default to the built-in implementation, 2021-11-30),
+ supports pathspecs, so `git restore -p <pathspec>...` has worked for all
+ users since then. I bisected to verify this was the commit that added
+ support.
Signed-off-by: Adam Johnson <me@adamj.eu>
Documentation/git-restore.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 5964810caa4..d31a06a673e 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -51,9 +51,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
restore source and the restore location. See the ``Interactive
Mode'' section of linkgit:git-add[1] to learn how to operate
the `--patch` mode.
-+
-Note that `--patch` can accept no pathspec and will prompt to restore
-all modified paths.
-W::
--worktree::
base-commit: f285f68a132109c234d93490671c00218066ace9
--
gitgitgadget
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-01 21:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-05 10:32 [PATCH] doc: restore: remove note on --patch w/ pathspecs Adam Johnson via GitGitGadget
2023-05-25 7:25 ` Adam Johnson
2023-06-01 5:09 ` Junio C Hamano
2023-06-01 21:14 ` [PATCH v2] " Adam Johnson via GitGitGadget
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).