Smartgit: Moving local changes from stash to branch

git smartgit
OZZIE picture OZZIE · May 14, 2013 · Viewed 8.4k times · Source

I have local changes which I have stored in stash. I have now (afterwards) created a new branch and want to push my changes from stash to this branch. SmartGit: Local > Apply stash.

When I try to SmartGit asks me: Restore Index (checkbox), what is this? Should I select it or not?

enter image description here

Answer

mstrap picture mstrap · May 14, 2013

The Restore Index option will result in a git stash apply --index. According to the git man page, this means:

If the --index option is used, then tries to reinstate not only the working tree’s changes, but also the index’s ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).

So, in general, yes, you should try to apply the stash having this option enabled.

Related questions

Unable to auto-detect email address

I'm new to SmartGit. I can't commit through my repository, the message I'm receiving is: Unable to auto-detect email address (got 'Arreane@Arreane-PC.(none)') *** Please tell me who you are. Run git config --global user.email "[email protected]" …

Read More
How to change SmartGit's licensing option after 30 days of commercial use on ubuntu?

while installing smartgit 3.0.4 I checked the commercial licensing option, because I was just clicking "next" button : ) (30 day trial and then you have to buy it). Now today is my 31st day of using SG and I can't change my licensing …

Read More
How to install Github for Windows offline?

As the question says how to install Github for Windows without an internet connection? If it is not possible then is there some alternative client with the following features: Support for proxy Offline installer I found smartgit which has an …

Read More