From: Thomas Gummerer <t.gummerer@gmail.com>
To: "Robert P. J. Day" <rpjday@crashcourse.ca>
Cc: Git Mailing list <git@vger.kernel.org>
Subject: Re: slight addition to t.gummerer's proposed "git stash" patch
Date: Wed, 11 Oct 2017 20:21:09 +0100 [thread overview]
Message-ID: <20171011192109.GC15399@hank> (raw)
In-Reply-To: <alpine.LFD.2.21.1710110454240.11490@localhost.localdomain>
On 10/11, Robert P. J. Day wrote:
>
> was perusing thomas gummerer's proposed "git stash" patch here:
>
> https://www.spinics.net/lists/git/msg313993.html
>
> and i'd make one more change -- i'd separate the OPTIONS entries for
> "git stash push" and "git stash save" so they don't end up being
> rendered all crushed together when displaying the man page:
I for one would like that. I sent a patch recently [1] that would
show git stash push first on the man page, which didn't seem to get
much traction. This goes a bit further than that, which I'd be happy
with.
[1]: https://public-inbox.org/git/20171005201029.4173-1-t.gummerer@gmail.com/
> OPTIONS
> save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet]
> [<message>], push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]
> [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]
> Save your local modifications to a new stash and roll them back to HEAD (in the working
> tree and in the index). The <message> part is optional and gives the description along
> with the stashed state.
> ... snip ...
>
> so rather than:
>
> OPTIONS
> -------
>
> push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]
> [-a|--all] [-q|--quiet] [-m|--message <message>] [--]
> [<pathspec>...]::
> save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]
> [-a|--all] [-q|--quiet] [<message>]::
>
> Save your local modifications to a new 'stash entry' and roll them
> back to HEAD (in the working tree and in the index).
> The <message> part is optional and gives
> the description along with the stashed state.
> ...
>
> i'd suggest:
>
> push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]
> [-a|--all] [-q|--quiet] [-m|--message <message>] [--]
> [<pathspec>...]::
>
> Save your local modifications to a new 'stash entry' and roll them
> back to HEAD (in the working tree and in the index).
> The <message> part is optional and gives
> the description along with the stashed state.
> ...
>
> save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]
> [-a|--all] [-q|--quiet] [<message>]::
>
> This option is deprecated in favour of 'git stash push'.
This sounds good to me. This can probably be done at the same time
(or after) something like my patch [2], which removes the mentions of
'git stash save' from the man pages, and replaces them with 'git stash
push'. I guess it would be a bit confusing to see a deprecated
command in the man pages, especially since there is a good (almost
drop-in) replacement :)
[2]: https://public-inbox.org/git/20171005200049.GF30301@hank/#t
> or something like that.
>
> rday
>
> --
>
> ========================================================================
> Robert P. J. Day Ottawa, Ontario, CANADA
> http://crashcourse.ca
>
> Twitter: http://twitter.com/rpjday
> LinkedIn: http://ca.linkedin.com/in/rpjday
> ========================================================================
>
next prev parent reply other threads:[~2017-10-11 19:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 9:04 slight addition to t.gummerer's proposed "git stash" patch Robert P. J. Day
2017-10-11 19:21 ` Thomas Gummerer [this message]
2017-10-11 19:24 ` Robert P. J. Day
2017-10-16 18:34 ` Thomas Gummerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171011192109.GC15399@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=rpjday@crashcourse.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).