diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-30 22:19:39 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-30 22:19:53 -0700 |
| commit | a92665089d55ade67a7ec1c4d4eb099270b0c7a5 (patch) | |
| tree | 23ac2c9c467edb74e3a5a2690c65fdb0dfd27a89 /lib-src | |
| parent | 8b5d232b13b3e785ce2339426eb302794b07334a (diff) | |
| download | dotfiles-a92665089d55ade67a7ec1c4d4eb099270b0c7a5.tar.gz | |
rebase host-specific branch onto master after amending master's tip
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/mr/config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config index 1cf3fa82..1e63bd4f 100644 --- a/lib-src/mr/config +++ b/lib-src/mr/config @@ -129,7 +129,10 @@ pre_push = branch="$(git rev-parse --abbrev-ref HEAD)" [ "$branch" = master ] || git checkout master git commit -S --amend --no-edit - [ "$branch" = master ] || git checkout "$branch" + if [ "$branch" != master ]; then + git checkout "$branch" + git rebase master + fi fi # Restowing is expensive, and most dangling symlinks into ~/.STOW do no harm, # so we leave it to be run manually -- bstraph stows but does not restow. |