Instead of using stash as part of your normal process, consider using topic branches instead. Before working, switch to a new topic branch. If you forget, stash, switch, apply, then go forth. While on the topic branch, you can use add and commit on a hunk or file basis to satisfy what appears to be the requirement here. You can then merge the desired commits from your topic branch into wherever you want to merge them either preserving the commit or by squashing commits together.
In my shop, stash is only used for the "I forgot to switch to a topic branch, oops" process. I try to encourage people not to use it. I also discourage squashed commits, but that's because I like knowing what's in my sausages 😊
Cheers,
Randall
Hi Randall,
I completely agree to what you are saying, but sometimes it just so
happens that in the middle of a change, i feel like if some portion of
the changes are fine I can commit them. Stashing some of the files
and being able to check the compile/tests at this point would be a
really awesome change.
Stash supports a -p option to deal with this, it becomes cumbersome
when the number of files are many. Maybe it is something which would
be a good to have feature. People need not use it if they dont want
to.
Thanks
Rajdeep
On Tue, Jun 6, 2017 at 9:31 AM, Randall S. Becker
[off-list ref] wrote:
-----Original Message-----
On June 6, 2017 9:23 AM, rajdeep mondal wrote:
Instead of using stash as part of your normal process, consider using topic branches instead. Before working, switch to a new topic branch. If you forget, stash, switch, apply, then go forth. While on the topic branch, you can use add and commit on a hunk or file basis to satisfy what appears to be the requirement here. You can then merge the desired commits from your topic branch into wherever you want to merge them either preserving the commit or by squashing commits together.
In my shop, stash is only used for the "I forgot to switch to a topic branch, oops" process. I try to encourage people not to use it. I also discourage squashed commits, but that's because I like knowing what's in my sausages 😊
Cheers,
Randall
From: Mike Hommey <hidden> Date: 2017-06-06 21:03:34
On Tue, Jun 06, 2017 at 02:38:08PM -0400, rajdeep mondal wrote:
Hi Randall,
I completely agree to what you are saying, but sometimes it just so
happens that in the middle of a change, i feel like if some portion of
the changes are fine I can commit them. Stashing some of the files
and being able to check the compile/tests at this point would be a
really awesome change.
Stash supports a -p option to deal with this, it becomes cumbersome
when the number of files are many. Maybe it is something which would
be a good to have feature. People need not use it if they dont want
to.
Git 2.13.0 has that already.
git stash -- file1 file2
Mike
Thanks Mike.
On Tue, Jun 6, 2017 at 5:03 PM, Mike Hommey [off-list ref] wrote:
On Tue, Jun 06, 2017 at 02:38:08PM -0400, rajdeep mondal wrote:
quoted
Hi Randall,
I completely agree to what you are saying, but sometimes it just so
happens that in the middle of a change, i feel like if some portion of
the changes are fine I can commit them. Stashing some of the files
and being able to check the compile/tests at this point would be a
really awesome change.
Stash supports a -p option to deal with this, it becomes cumbersome
when the number of files are many. Maybe it is something which would
be a good to have feature. People need not use it if they dont want
to.
Git 2.13.0 has that already.
git stash -- file1 file2
Mike