replace git-dotfiles-rebase with 'mr pull' and 'mr push' actions

1 files changed, 4 insertions, 3 deletions

diff --git a/bin/bstraph b/bin/bstraph
index 445cd87e..972662cc 100755
--- a/bin/bstraph
+++ b/bin/bstraph
@@ -42,16 +42,17 @@ if command -v git >/dev/null; then
 
     git config user.signingkey 8DC2487E51ABDD90B5C4753F0F56D0553B6D411B
 
-    # Pushing and pulling are always done explicitly.
     for branch in $(git for-each-ref \
 			--format='%(refname:short)' refs/heads/); do
 	git rev-parse "$branch"@{upstream} >/dev/null 2>&1 \
             && git branch --unset-upstream "$branch"
     done
     git config push.default nothing
-
-    # This is just for `magit-status'.
+    # Ensure 'git push-all' non-force pushes master to origin.
     git config remote.pushDefault origin
+    git config --unset branch.master.pushRemote ||:
+    # Ensure 'git push-all' force pushes localhost's branch to origin.
+    git config branch."$(hostname | sed -e 's#\..*$##')".pushRemote origin
 
     # Don't set up any tracking branches, or fetch it.
     [ -z "$(git remote)" ] \