diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-16 13:38:32 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-16 13:38:32 -0700 |
| commit | fac92fecbe14f01db2d7b5f23ae87ad6c7cb5a09 (patch) | |
| tree | a3ffda348e363de6453c74fcbb9eafd53c09ae80 | |
| parent | c21057bb1b4059a2182ed97c91220dba50d90cf7 (diff) | |
| download | dotfiles-fac92fecbe14f01db2d7b5f23ae87ad6c7cb5a09.tar.gz | |
rename
| -rwxr-xr-x | bin/git-pull-safe (renamed from bin/git-merge-ff-all) | 0 | ||||
| -rw-r--r-- | home-mrconfig | 12 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/git-merge-ff-all b/bin/git-pull-safe index 9cb0b65b..9cb0b65b 100755 --- a/bin/git-merge-ff-all +++ b/bin/git-pull-safe diff --git a/home-mrconfig b/home-mrconfig index 98b3a93f..edfadadd 100644 --- a/home-mrconfig +++ b/home-mrconfig @@ -34,14 +34,14 @@ git_isclean = # --- Experimental plugin for dgit repos -include = [ -e ~/src/dotfiles/lib/mr/dgit ] && cat ~/src/dotfiles/lib/mr/dgit +include = cat ~/src/dotfiles/lib/mr/dgit + +# --- Sensible pulls # Redefine git_update to avoid an unconditional `git pull` which can -# result in unwanted merge commits all over $HOME. This redefinition -# is based on the value of git_update set in the dgit plugin. Note -# that the dgit lib has to have unconditional `git pull` to match -# global myrepos conventions -git_update = git-merge-ff-all +# result in unwanted merge commits all over $HOME (this has to come +# after we include the dgit lib, which also defines git_update) +git_update = git pull-safe # --- Adam Spiers' plugin for managing dotfile symlinks with mr |