git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.44k stars 1.23k forks source link

Add a "Stash" menu #956

Open rgorsuch opened 7 months ago

rgorsuch commented 7 months ago

I propose adding a menu for basic managing stash management that could be used from any of the three views, "Map view", "Commit view" and "Stashes view" and would include the following options with keyboard shortcuts.

  1. Push stash
  2. Push stash with untracked files
  3. Pop stash

Oftentimes I find that I'm blocked by working changes when I want to pull, switch branches, or rebase. In those cases it feels like an interruption to stash and pop because I need to switch to the stash tab, move my hand away from the keyboard to the mouse, click the plus, click the "Include untracked files", click Save, and switch back to the view I was on. Then I can continue with what I was working on. But then to really return to my previous state, I need to go back to the stashes view, click the apply button, confirm that I'm really sure, and then click the minus button to "pop" it.

When I'm working at the command line this is a lot simpler.

git stash -u
[take action]
git stash pop

Adding this menu with keyboard shortcuts would allow me to stay focused. If the "stash pop" causes conflicts, then the stash should not be removed, just like the git cli.

lucasderraugh commented 7 months ago

I agree that a menu item for this would be more appropriate (true for most of the app), but there are shortcuts. If you want to stash quickly, command-3 will get you to the stash view, and simply pressing the s key will initiate a stash where you can hit return to create one. I never touch my mouse for stashing.

rgorsuch commented 7 months ago

Oh thanks, that's a big improvement for my workflow!

On Fri, Dec 1, 2023 at 6:16 PM Lucas Derraugh @.***> wrote:

I agree that a menu item for this would be more appropriate (true for most of the app), but there are shortcuts. If you want to stash quickly, command-3 will get you to the stash view, and simply pressing the s key will initiate a stash where you can hit return to create one. I never touch my mouse for stashing.

— Reply to this email directly, view it on GitHub https://github.com/git-up/GitUp/issues/956#issuecomment-1836977154, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAXRAYEMSJKJAUKSMAGGKQ3YHJ6O3AVCNFSM6AAAAABADEZN66VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQMZWHE3TOMJVGQ . You are receiving this because you authored the thread.Message ID: @.***>