mathieu/config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

git: rebase with updateRefs

Browse Source
This commit is contained in:
Mathieu Maret 2023-01-17 17:53:54 +01:00
parent 5a9d74e7ad
commit c0eb09f1c9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitconfig
View File

@ -68,6 +68,11 @@
ri = "rebase -i --autostash --autosquash" ri = "rebase -i --autostash --autosquash"
up = pull --rebase --autostash up = pull --rebase --autostash
rebaseour = "rebase -Xours" rebaseour = "rebase -Xours"
[rebase]
# when rebasing, update the other common branch too.
# See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/
# Need git 2.38
updateRefs = true
[branch] [branch]
#New branch track remote #New branch track remote
#autosetupmerge = always #autosetupmerge = always