summaryrefslogtreecommitdiff
path: root/lib-src/mr/config
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-12-04 12:03:05 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-12-04 12:09:51 -0700
commite697d4e1d9fc93a9d3a9d92780bd7be5a2e7a102 (patch)
treee5b8d91fa2038bbdf90515148c2f66c8fe81d083 /lib-src/mr/config
parent209333313923a9ccafb3ddd3705e14365bf98ca3 (diff)
downloaddotfiles-e697d4e1d9fc93a9d3a9d92780bd7be5a2e7a102.tar.gz
stop setting up 'dgit fetch' post_checkout actions
These actions never or almost never get run because we're writing them to the machine-specific ~/.mrconfig. For them to be run, we'd have to nuke the repos and then clone them again using 'mr co', which I never or almost never do for repos registered in ~/.mrconfig.
Diffstat (limited to 'lib-src/mr/config')
-rw-r--r--lib-src/mr/config9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config
index c01123f6..f49febb6 100644
--- a/lib-src/mr/config
+++ b/lib-src/mr/config
@@ -27,12 +27,6 @@ unstow = hstow unstow "$MR_REPO"
restow = hstow restow "$MR_REPO"
adopt = hstow adopt "$MR_REPO"
-# --- Plugin for dgit repos
-
-# actually shipped with upstream mr, but use an include command that
-# will always work
-include = cat ~/src/dotfiles/lib-src/mr/dgit
-
# --- git-svn
# include = [ -e "/usr/share/mr/git-svn" ] && cat /usr/share/mr/git-svn
@@ -40,8 +34,7 @@ include = cat ~/src/dotfiles/lib-src/mr/dgit
# --- Sensible pulls
# Redefine git_update to avoid an unconditional `git pull`, which can
-# result in unwanted merge commits all over $HOME (this has to come
-# after we include the dgit lib, which also redefines git_update)
+# result in unwanted merge commits all over $HOME
git_update = git pull-safe
# --- joeyh's code for specifying what machine we're on for repo skip