diff options
| author |  sommerfeld <[email protected]> | 2026-04-17 10:53:36 +0100 |
|---|---|---|
| committer | sommerfeld <[email protected]> | 2026-04-17 10:53:36 +0100 |
| commit | bb1870cf4c48519e736f9e3f4aecb6ac4c68037e (patch) | |
| tree | 2a6725325f09fb811c07cb0d28ed704f3c774235 | |
| parent | dd3f4dddc7c4b0e39c8a784085ddaafe2787ccbd (diff) | |
| download | dotfiles-bb1870cf4c48519e736f9e3f4aecb6ac4c68037e.tar.gz dotfiles-bb1870cf4c48519e736f9e3f4aecb6ac4c68037e.tar.bz2 dotfiles-bb1870cf4c48519e736f9e3f4aecb6ac4c68037e.zip | |
feat: add modern git options
- rebase.updateRefs = true: auto-update dependent branches when
rebasing a stack. Essential for stacked branch workflows.
- rerere.enabled = true: remember conflict resolutions and auto-apply
them when the same conflict is encountered again.
- column.ui = auto: display branches and tags in columns instead of
a long vertical list.
| -rw-r--r-- | home/.config/git/config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 2b91f0d..226e8a0 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -30,9 +30,12 @@ [rebase] autoStash = true autoSquash = true + updateRefs = true [fetch] recurseSubmodules = on-demand prune = true +[rerere] + enabled = true [pull] ff = only [merge] @@ -66,6 +69,8 @@ [advice] detachedHead = false skippedCherryPicks = false +[column] + ui = auto [format] pretty = oneline [delta] |