forked from pieter/gitx
-
Notifications
You must be signed in to change notification settings - Fork 204
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Stash support #431
Closed
Closed
Stash support #431
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
As Objective-Git doesn't yet offer stash support use libgit2 right away. should be replaced by Objective-Git equivalent when available
add menu items for stash items: "Pop stash@..", "Apply", "View Diff" and "Drop" but only "View Diff" functional yet
Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.
Therefore the old controls, e.g. "Amend" checkbox, "Sign-off" and "Commit" buttons, have been moved into a tab-less NSTabView. The tab switches to the stash controls when holding the Alt-Key down.
Note: use of deprecated [PBGitRepository outputInWorkdirForArguments:…] should be replaced with objective-git equivalent once stash-support is available.
- added IBOutlet for stashButton - added a trackedFilesController to easily get a count of tracked files
- "Stash Save ⌘Y" - "Stash Save - Keep Index ⌥⌘Y" (alternate) - "Stash Pop ⇧⌘Y"
tiennou
force-pushed
the
stash-support
branch
from
February 13, 2015 21:32
fcd9f1a
to
dba3888
Compare
Looks like the C part is cooking in in libgit2/libgit2#2705. |
+1 Better stash support would be amazing. |
why hasn't this merged yet?:( |
👍 |
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.
This is a rebase of #239 on top of #301. It might be possible to have it against master if you prefer, but I felt compelled to force your hand a little ;-).
Notes :
stash pop
, so I didn't switch it away from the CLI at all. I might go do some C for this ;-).