Do you want BuboFlash to help you learning these things? Or do you want to add or correct something? Click here to log in or create user.



Tags
#git
Question
Configuring autostash
Answer

git config --global rebase.autostash # one time configuration

git rebase @{u} # example rebase on upstream branch

The autostash will be applied whenever the rebase is finished. It does not matter whether the rebase finishes successfully, or if it is aborted. Either way, the autostash will be applied. If the rebase was successful, and the base commit therefore changed, then there may be a conflict between the autostash and the new commits. In this case, you will have to resolve the conflicts before committing. This is no different than if you would have manually stashed, and then applied, so there is no downside to doing it automatically.


Tags
#git
Question
Configuring autostash
Answer
?

Tags
#git
Question
Configuring autostash
Answer

git config --global rebase.autostash # one time configuration

git rebase @{u} # example rebase on upstream branch

The autostash will be applied whenever the rebase is finished. It does not matter whether the rebase finishes successfully, or if it is aborted. Either way, the autostash will be applied. If the rebase was successful, and the base commit therefore changed, then there may be a conflict between the autostash and the new commits. In this case, you will have to resolve the conflicts before committing. This is no different than if you would have manually stashed, and then applied, so there is no downside to doing it automatically.

If you want to change selection, open document below and click on "Move attachment"

pdf

owner: cramer7575 - (no access) - GitNotesForProfessionals.pdf, p73

Summary

statusnot learnedmeasured difficulty37% [default]last interval [days]               
repetition number in this series0memorised on               scheduled repetition               
scheduled repetition interval               last repetition or drill

Details

No repetitions


Discussion

Do you want to join discussion? Click here to log in or create user.