From: Robert P. J. Day <rpjday@crashcourse.ca>
Date: Wed, 11 Oct 2017 09:04:07 GMT
Subject: slight addition to t.gummerer's proposed "git stash" patch
Message-ID: <alpine.LFD.2.21.1710110454240.11490@localhost.localdomain>


  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:

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'.


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
========================================================================