nemoinho/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply git autoStash not only on merge but also on rebase

Browse Source
This commit is contained in:
Felix Nehrke
2025-01-06 15:21:12 +01:00
parent 0450376210
commit e6f87805c7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.config/git/config
View File

@@ -19,6 +19,9 @@
[mergetool] [mergetool]
# I don't need the backups of a merge # I don't need the backups of a merge
keepBackup = false keepBackup = false
[rebase]
# stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true"
autoStash = true
[merge] [merge]
# stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true" # stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true"
autoStash = true autoStash = true