diff options
| -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 |