git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Caleb Dougherty <caleb_dougherty@keysight.com>
To: "Randall S. Becker" <rsbecker@nexbridge.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: RE: Git stash certain files
Date: Tue, 31 Aug 2021 22:09:35 +0000	[thread overview]
Message-ID: <BN6PR17MB318540A1376CA1FACDE809DFFECC9@BN6PR17MB3185.namprd17.prod.outlook.com> (raw)
In-Reply-To: <058f01d79eb3$c5001310$4f003930$@nexbridge.com>

Hi Randall,

Thanks for the suggestion.  I'm afraid it doesn't help that much because I can only use it from the command line.  Usually I stage my files using some UI, like SourceTree.  Otherwise it would be a lot of typing and or copying multiple paths.  Think along the lines of, I modified 10 files, and they are distributed across 5 directories with deep paths.

Regards,
Caleb

-----Original Message-----
From: Randall S. Becker <rsbecker@nexbridge.com> 
Sent: Tuesday, August 31, 2021 3:02 PM
To: Caleb Dougherty <caleb_dougherty@keysight.com>; git@vger.kernel.org
Subject: RE: Git stash certain files

CAUTION: This message originates from an external sender.

On August 31, 2021 5:18 PM, Caleb Dougherty wrote:
>Let me know if I should post this somewhere else, but having used git 
>now for a couple years in my work environment, and having
come
>from years of TFS usage, I still find that I want the ability to "shelve" certain file changes for later.
>
>My workflow is to create a personal branch and make changes to 
>different parts of our codebase, and then stage certain files (not
all) that
>are ready, and then commit them.  Sometimes I need to undo certain files in my working directory but keep the changes for later.
>
>Git stash will kind of allow that, but it is messy since it snapshots 
>all my checked out files and I have to do several commands to
get the
>operation of "just stash these few files."
>
>Here is my "shelve" command.  Stage the files you want to shelve and then:
>                git commit -m '%1'
>                git switch -C shelveset/%username%/!shelvename!
>                git switch @{-1}
>                git reset --keep HEAD~
>
>Here is my "unshelve" command:
>       set branch=shelveset/%username%/%1
>       git cherry-pick %branch%
>       git reset HEAD~
>       git branch -D %branch%
>
>It would be nice if this were built into the stage command as an option 
>(to only stash staged files), or perhaps a new
shelve/unshelve set of
>commands could be added.  The additional niceties of shelve/unshelve is 
>that it is on a branch that can be pushed to a remote (so I
don't
>lose it in a moment of absentmindedness or computer failure) and 
>potentially unshelved by someone else ("Hey Joe, take a look at my code on shelveset xyz").
>
>P.s. I cannot easily use the usual git workflow where you only do X 
>feature change on X feature branch.  I work on multiple
features in
>parallel and cannot be switching branches frequently or I will incur 
>too much overhead (not only running the commands to do the
switch).

Have a look at git stash push -- <pathspec>... I think that might do what you want.
-Randall


      reply	other threads:[~2021-08-31 22:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <BN6PR17MB31854E1EB7F8D358266B2AA8FECC9@BN6PR17MB3185.namprd17.prod.outlook.com>
2021-08-31 21:17 ` Git stash certain files Caleb Dougherty
2021-08-31 22:01   ` Randall S. Becker
2021-08-31 22:09     ` Caleb Dougherty [this message]

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=BN6PR17MB318540A1376CA1FACDE809DFFECC9@BN6PR17MB3185.namprd17.prod.outlook.com \
    --to=caleb_dougherty@keysight.com \
    --cc=git@vger.kernel.org \
    --cc=rsbecker@nexbridge.com \
    /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).