{"thread":{"id":"46948","subject":"slight addition to t.gummerer's proposed \"git stash\" patch","startedAt":"2017-10-11T09:04:18Z","lastAt":"2017-10-16T18:33:47Z","messageCount":4,"participants":["Robert P. J. Day","Thomas Gummerer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"330166","messageId":"alpine.LFD.2.21.1710110454240.11490@localhost.localdomain","threadId":"46948","inReplyTo":null,"subject":"slight addition to t.gummerer's proposed \"git stash\" patch","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2017-10-11T09:04:07Z","receivedAt":"2017-10-11T09:04:18Z","isPatch":false,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"\n was perusing thomas gummerer's proposed \"git stash\" patch here:\n\nhttps://www.spinics.net/lists/git/msg313993.html\n\nand i'd make one more change -- i'd separate the OPTIONS entries for\n\"git stash push\" and \"git stash save\" so they don't end up being\nrendered all crushed together when displaying the man page:\n\nOPTIONS\n save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet]\n [], push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]\n [-q|--quiet] [-m|--message ] [--] [...]\n Save your local modifications to a new stash and roll them back to HEAD (in the working\n tree and in the index). The part is optional and gives the description along\n with the stashed state.\n ... snip ...\n\nso rather than:\n\nOPTIONS\n-------\n\npush [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n[-a|--all] [-q|--quiet] [-m|--message ] [--]\n[...]::\nsave [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n[-a|--all] [-q|--quiet] []::\n\n Save your local modifications to a new 'stash entry' and roll them\n back to HEAD (in the working tree and in the index).\n The part is optional and gives\n the description along with the stashed state.\n ...\n\ni'd suggest:\n\npush [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n[-a|--all] [-q|--quiet] [-m|--message ] [--]\n[...]::\n\n Save your local modifications to a new 'stash entry' and roll them\n back to HEAD (in the working tree and in the index).\n The part is optional and gives\n the description along with the stashed state.\n ...\n\nsave [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n[-a|--all] [-q|--quiet] []::\n\n This option is deprecated in favour of 'git stash push'.\n\n\nor something like that.\n\nrday\n\n-- \n\n========================================================================\nRobert P. J. Day Ottawa, Ontario, CANADA\n http://crashcourse.ca\n\nTwitter: http://twitter.com/rpjday\nLinkedIn: http://ca.linkedin.com/in/rpjday\n========================================================================\n\n"},{"id":"330202","messageId":"20171011192109.GC15399@hank","threadId":"46948","inReplyTo":"alpine.LFD.2.21.1710110454240.11490@localhost.localdomain","subject":"Re: slight addition to t.gummerer's proposed \"git stash\" patch","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2017-10-11T19:21:09Z","receivedAt":"2017-10-11T19:20:22Z","isPatch":false,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"On 10/11, Robert P. J. Day wrote:\n> \n> was perusing thomas gummerer's proposed \"git stash\" patch here:\n> \n> https://www.spinics.net/lists/git/msg313993.html\n> \n> and i'd make one more change -- i'd separate the OPTIONS entries for\n> \"git stash push\" and \"git stash save\" so they don't end up being\n> rendered all crushed together when displaying the man page:\n\nI for one would like that. I sent a patch recently [1] that would\nshow git stash push first on the man page, which didn't seem to get\nmuch traction. This goes a bit further than that, which I'd be happy\nwith.\n\n[1]: https://public-inbox.org/git/20171005201029.4173-1-t.gummerer@gmail.com/\n\n> OPTIONS\n> save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet]\n> [], push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]\n> [-q|--quiet] [-m|--message ] [--] [...]\n> Save your local modifications to a new stash and roll them back to HEAD (in the working\n> tree and in the index). The part is optional and gives the description along\n> with the stashed state.\n> ... snip ...\n> \n> so rather than:\n> \n> OPTIONS\n> -------\n> \n> push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n> [-a|--all] [-q|--quiet] [-m|--message ] [--]\n> [...]::\n> save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n> [-a|--all] [-q|--quiet] []::\n> \n> Save your local modifications to a new 'stash entry' and roll them\n> back to HEAD (in the working tree and in the index).\n> The part is optional and gives\n> the description along with the stashed state.\n> ...\n> \n> i'd suggest:\n> \n> push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n> [-a|--all] [-q|--quiet] [-m|--message ] [--]\n> [...]::\n> \n> Save your local modifications to a new 'stash entry' and roll them\n> back to HEAD (in the working tree and in the index).\n> The part is optional and gives\n> the description along with the stashed state.\n> ...\n> \n> save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked]\n> [-a|--all] [-q|--quiet] []::\n> \n> This option is deprecated in favour of 'git stash push'.\n\nThis sounds good to me. This can probably be done at the same time\n(or after) something like my patch [2], which removes the mentions of\n'git stash save' from the man pages, and replaces them with 'git stash\npush'. I guess it would be a bit confusing to see a deprecated\ncommand in the man pages, especially since there is a good (almost\ndrop-in) replacement :)\n\n[2]: https://public-inbox.org/git/20171005200049.GF30301@hank/#t\n\n> or something like that.\n> \n> rday\n> \n> -- \n> \n> ========================================================================\n> Robert P. J. Day Ottawa, Ontario, CANADA\n> http://crashcourse.ca\n> \n> Twitter: http://twitter.com/rpjday\n> LinkedIn: http://ca.linkedin.com/in/rpjday\n> ========================================================================\n> \n"},{"id":"330204","messageId":"alpine.LFD.2.21.1710111523510.4185@localhost.localdomain","threadId":"46948","inReplyTo":"20171011192109.GC15399@hank","subject":"Re: slight addition to t.gummerer's proposed \"git stash\" patch","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2017-10-11T19:24:48Z","receivedAt":"2017-10-11T19:24:56Z","isPatch":false,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"On Wed, 11 Oct 2017, Thomas Gummerer wrote:\n\n> On 10/11, Robert P. J. Day wrote:\n> >\n> > was perusing thomas gummerer's proposed \"git stash\" patch here:\n> >\n> > https://www.spinics.net/lists/git/msg313993.html\n> >\n> > and i'd make one more change -- i'd separate the OPTIONS entries for\n> > \"git stash push\" and \"git stash save\" so they don't end up being\n> > rendered all crushed together when displaying the man page:\n>\n> I for one would like that. I sent a patch recently [1] that would\n> show git stash push first on the man page, which didn't seem to get\n> much traction. This goes a bit further than that, which I'd be happy\n> with.\n>\n> [1]: https://public-inbox.org/git/20171005201029.4173-1-t.gummerer@gmail.com/\n\n ... snip ...\n\nif you want, just crush my suggestion into your earlier patch and\nresubmit it.\n\nrday\n\n-- \n\n========================================================================\nRobert P. J. Day Ottawa, Ontario, CANADA\n http://crashcourse.ca\n\nTwitter: http://twitter.com/rpjday\nLinkedIn: http://ca.linkedin.com/in/rpjday\n========================================================================\n"},{"id":"330477","messageId":"20171016183439.GF15399@hank","threadId":"46948","inReplyTo":"alpine.LFD.2.21.1710111523510.4185@localhost.localdomain","subject":"Re: slight addition to t.gummerer's proposed \"git stash\" patch","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2017-10-16T18:34:39Z","receivedAt":"2017-10-16T18:33:47Z","isPatch":false,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"On 10/11, Robert P. J. Day wrote:\n> On Wed, 11 Oct 2017, Thomas Gummerer wrote:\n> \n> > On 10/11, Robert P. J. Day wrote:\n> > >\n> > > was perusing thomas gummerer's proposed \"git stash\" patch here:\n> > >\n> > > https://www.spinics.net/lists/git/msg313993.html\n> > >\n> > > and i'd make one more change -- i'd separate the OPTIONS entries for\n> > > \"git stash push\" and \"git stash save\" so they don't end up being\n> > > rendered all crushed together when displaying the man page:\n> >\n> > I for one would like that. I sent a patch recently [1] that would\n> > show git stash push first on the man page, which didn't seem to get\n> > much traction. This goes a bit further than that, which I'd be happy\n> > with.\n> >\n> > [1]: https://public-inbox.org/git/20171005201029.4173-1-t.gummerer@gmail.com/\n> \n> ... snip ...\n> \n> if you want, just crush my suggestion into your earlier patch and\n> resubmit it.\n\nThanks, before doing that let me see where that discussion goes. My\nplan was to be a bit more careful and first get rid of mentions of\n'git stash save', and mark it deprecated as a next step. In which\ncase I'd submit a patch with your suggestions in a few cycles.\n\n> rday\n> \n> -- \n> \n> ========================================================================\n> Robert P. J. Day Ottawa, Ontario, CANADA\n> http://crashcourse.ca\n> \n> Twitter: http://twitter.com/rpjday\n> LinkedIn: http://ca.linkedin.com/in/rpjday\n> ========================================================================\n"}]}