Tags
#git
Question
Conﬁguring autostash

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 ﬁnished. It does not matter whether the rebase ﬁnishes 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 conﬂict between the autostash and the new commits. In this case, you will have to resolve the conﬂicts before committing. This is no diﬀerent than if you would have manually stashed, and then applied, so there is no downside to doing it automatically.

Tags
#git
Question
Conﬁguring autostash
?

Tags
#git
Question
Conﬁguring autostash

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 ﬁnished. It does not matter whether the rebase ﬁnishes 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 conﬂict between the autostash and the new commits. In this case, you will have to resolve the conﬂicts before committing. This is no diﬀerent 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

status measured difficulty not learned 37% [default] 0

No repetitions