diff options
author | June McEnroe <june@causal.agency> | 2020-07-20 13:47:38 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2020-07-20 13:47:50 -0400 |
commit | a3e655fdd04b879bd821d41a3540cdb7a7862481 (patch) | |
tree | c2670fd5323743135bdfdcc218f88163aefbaafe /home/.config | |
parent | Read from stdin in order (diff) | |
download | src-a3e655fdd04b879bd821d41a3540cdb7a7862481.tar.gz src-a3e655fdd04b879bd821d41a3540cdb7a7862481.zip |
Set pull.rebase true
Diffstat (limited to '')
-rw-r--r-- | home/.config/git/config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 50a6a885..36b96776 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -8,6 +8,9 @@ [merge] conflictStyle = diff3 +[pull] + rebase = true + [rebase] autosquash = true |