diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-03-25 13:04:24 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-03-29 13:03:55 +0000 |
| commit | be250ee4130940d1a86aea97ec586893f1bbcb12 (patch) | |
| tree | c5c4ed0e79affa288bc161484e63818d2f9c60a7 /modules/shell/git | |
| parent | 8f05b5c59854d69d8f0845d834de4fc4efeb0a3e (diff) | |
| download | nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.tar nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.tar.gz nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.tar.bz2 nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.tar.lz nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.tar.xz nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.tar.zst nixlib-be250ee4130940d1a86aea97ec586893f1bbcb12.zip | |
modules/git: make git pull rebase by default
Diffstat (limited to 'modules/shell/git')
| -rw-r--r-- | modules/shell/git/config.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in index 52161522b1f1..60e472de5a73 100644 --- a/modules/shell/git/config.in +++ b/modules/shell/git/config.in @@ -54,6 +54,8 @@ [merge] conflictstyle = diff3 tool = opendiff +[pull] + rebase = true [push] default = upstream [rebase] |