CODEWITHSUNDEEP
gitsmartgit
OZZIE
OZZIE

Reputation: 7348

Smartgit: Moving local changes from stash to branch

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

Upvotes: 14

Views: 11781

Answers (1)

mstrap
mstrap

Reputation: 17443

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.

Upvotes: 15

Related Questions