| Message ID | f4df1a271333bcf82c5ea1c5d9604ceb1c0374f8.1537913094.git.ungureanupaulsebastian@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Convert "git stash" to C builtin | expand |
> Subject: stash: mention options in `show` synopsis. Really minor point, but the '.' in the end should be dropped. Also as this is fixing a pre-existing problem I would have put this patch near the beginning of the series, rather than in between conversions of functions, and just incorporated the bits that changed in the helper into the patch that converts 'git stash show'. The rest of the patch looks good to me. On 09/26, Paul-Sebastian Ungureanu wrote: > Mention in the usage text and in the documentation, that `show` > accepts any option known to `git diff`. > > Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com> > --- > Documentation/git-stash.txt | 4 ++-- > builtin/stash--helper.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt > index 7ef8c47911..e31ea7d303 100644 > --- a/Documentation/git-stash.txt > +++ b/Documentation/git-stash.txt > @@ -9,7 +9,7 @@ SYNOPSIS > -------- > [verse] > 'git stash' list [<options>] > -'git stash' show [<stash>] > +'git stash' show [<options>] [<stash>] > 'git stash' drop [-q|--quiet] [<stash>] > 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] > 'git stash' branch <branchname> [<stash>] > @@ -106,7 +106,7 @@ stash@{1}: On master: 9cc0589... Add git-stash > The command takes options applicable to the 'git log' > command to control what is shown and how. See linkgit:git-log[1]. > > -show [<stash>]:: > +show [<options>] [<stash>]:: > > Show the changes recorded in the stash entry as a diff between the > stashed contents and the commit back when the stash entry was first > diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c > index 1bc838ee6b..1f02f5f2e9 100644 > --- a/builtin/stash--helper.c > +++ b/builtin/stash--helper.c > @@ -15,7 +15,7 @@ > > static const char * const git_stash_helper_usage[] = { > N_("git stash--helper list [<options>]"), > - N_("git stash--helper show [<stash>]"), > + N_("git stash--helper show [<options>] [<stash>]"), > N_("git stash--helper drop [-q|--quiet] [<stash>]"), > N_("git stash--helper ( pop | apply ) [--index] [-q|--quiet] [<stash>]"), > N_("git stash--helper branch <branchname> [<stash>]"), > @@ -29,7 +29,7 @@ static const char * const git_stash_helper_list_usage[] = { > }; > > static const char * const git_stash_helper_show_usage[] = { > - N_("git stash--helper show [<stash>]"), > + N_("git stash--helper show [<options>] [<stash>]"), > NULL > }; > > -- > 2.19.0.rc0.23.g1fb9f40d88 >
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 7ef8c47911..e31ea7d303 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git stash' list [<options>] -'git stash' show [<stash>] +'git stash' show [<options>] [<stash>] 'git stash' drop [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] @@ -106,7 +106,7 @@ stash@{1}: On master: 9cc0589... Add git-stash The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]. -show [<stash>]:: +show [<options>] [<stash>]:: Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c index 1bc838ee6b..1f02f5f2e9 100644 --- a/builtin/stash--helper.c +++ b/builtin/stash--helper.c @@ -15,7 +15,7 @@ static const char * const git_stash_helper_usage[] = { N_("git stash--helper list [<options>]"), - N_("git stash--helper show [<stash>]"), + N_("git stash--helper show [<options>] [<stash>]"), N_("git stash--helper drop [-q|--quiet] [<stash>]"), N_("git stash--helper ( pop | apply ) [--index] [-q|--quiet] [<stash>]"), N_("git stash--helper branch <branchname> [<stash>]"), @@ -29,7 +29,7 @@ static const char * const git_stash_helper_list_usage[] = { }; static const char * const git_stash_helper_show_usage[] = { - N_("git stash--helper show [<stash>]"), + N_("git stash--helper show [<options>] [<stash>]"), NULL };
Mention in the usage text and in the documentation, that `show` accepts any option known to `git diff`. Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com> --- Documentation/git-stash.txt | 4 ++-- builtin/stash--helper.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)