diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-12-02 11:17:03 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-12-02 11:22:36 -0700 |
| commit | c3f5a35440753f5a2861504cb183eaaea45cb6db (patch) | |
| tree | 976172539b91a53b401bf64fd25513f70f6cd8db /lib-src | |
| parent | 5841996df125cc6b17073ac95255f2d325d476cc (diff) | |
| download | dotfiles-c3f5a35440753f5a2861504cb183eaaea45cb6db.tar.gz | |
have 'git pull' rebase by default
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/mr/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config index 1b3c34a1..054821ed 100644 --- a/lib-src/mr/config +++ b/lib-src/mr/config @@ -687,7 +687,7 @@ skip = ! mine [doc] checkout = git clone demeterp:doc doc -update = git pull --no-edit "$@" +update = git pull --rebase=false --no-edit "$@" skip = ! mine # Set mtimes to last commit, for Howm; doing so only in post_checkout, and not |