Add git stash --staged #9848
Merged
Add git stash --staged #9848
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gerhardol
requested changes
Feb 1, 2022
| @@ -1178,11 +1180,25 @@ private void InitializeComponent() | |||
| this.ResetAuthor.UseVisualStyleBackColor = true; | |||
| this.ResetAuthor.Visible = false; | |||
| // | |||
| // StashStaged | |||
There was a problem hiding this comment.
These controls should be in the bottom of the side.
Mono did not support that setup, why it was like this originally.
There was a problem hiding this comment.
Reverted to only insert StashStaged.
Have I got it right?
Should the private Button ResetUnStaged; be moved up to the section with the other Buttons, too?
ghost
added
the
📭 needs: author feedback
ghost
removed
the
📭 needs: author feedback
gerhardol
reviewed
Feb 1, 2022
GitUI/CommandsDialogs/FormBrowse.cs
Outdated
| @@ -266,7 +266,7 @@ public FormBrowse(GitUICommands commands, BrowseArguments args) | |||
| MainSplitContainer.Visible = false; | |||
| MainSplitContainer.SplitterDistance = DpiUtil.Scale(260); | |||
|
|
|||
| stashStagedToolStripMenuItem.Visible = GitVersion.Current.SupportStashStaged; | |||
| stashStagedToolStripMenuItem.Visible = Module.GitVersion.SupportStashStaged; | |||
There was a problem hiding this comment.
Also need to be moved to InternalInitialize() as it may change when the module is updated.
A change still required to GitVersion, this was the first change that affected a supported setup...
Check for WSL Git version was always using Windows version
|
I pushed changes to a private branch. |
gerhardol
approved these changes
Feb 1, 2022
RussKie
approved these changes
Feb 5, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #9839
Proposed changes
git stash --stagedcommand to FormBrowse and to FormCommitif Git version is >= 2.35.0
My use case: Occasionally, I want to swap staged and unstaged, e.g. if the previous commit needs to be amended or when something different is to be committed urgently.
Screenshots
Before
After
Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.