search

maks / MGit

A Git client for Android.
https://manichord.com/projects/mgit.html
GNU General Public License v3.0
1.26k stars 169 forks source link

Basic stash support #37

Open maks opened 8 years ago

maks commented 8 years ago

From @memeplex on August 31, 2016 0:28

When pulling there is the chance that local changes already happened. I can't see any reasonable way to deal with this situation besides dirty committing. Add at least the ability to "pull stashing": stash pull stash-pop.

Copied from original issue: sheimi/SGit#244

maks commented 8 years ago

From @memeplex on August 31, 2016 1:18

One more or less general and simple solution may be to detect the event "merging over uncommited changes" and show the user a dialog asking if he wants to abort or stash-merge-reapply local changes. This will work for pull and fetch-merge and doesn't add any new buttons or checkboxes to the ui.

maks commented 8 years ago

From @memeplex on August 31, 2016 1:42

Now I see the option "amend previous commit" does what I asked for, although it's a bit cumbersome to use: first commit, then pull, then fix conflicts, then stage (commit all won't work when merging), then commit ammending.

maks commented 8 years ago

I think stash functionality is very useful in its own right, I use it all the time with git, so I'm happy to get it added into SGit.