diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-08-07 07:53:23 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-08-07 07:54:16 -0700 |
| commit | c4daf2511cfc9f1653a23a996216d60671656c62 (patch) | |
| tree | 2ea1af1b683b3677b4c3ac1ef9f1e35c4722423a | |
| parent | 06161972093dff08324cc031a4d84a9f5db09611 (diff) | |
| download | dotfiles-c4daf2511cfc9f1653a23a996216d60671656c62.tar.gz | |
git-dotfiles-rebase: rebase host-specific branch after signing
| -rwxr-xr-x | bin/git-dotfiles-rebase | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/git-dotfiles-rebase b/bin/git-dotfiles-rebase index f1daee3c..b7018a1f 100755 --- a/bin/git-dotfiles-rebase +++ b/bin/git-dotfiles-rebase @@ -12,7 +12,10 @@ sign () { 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 } cd $HOME/src/dotfiles |