.mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index b10f2cf21b904bbbc3fafc27d183d8ad7917b479..16d18176ece5eecf4a3b0b0a9dea0a5b41ac43d4 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -96,7 +96,6 @@ finish_rb_merge () {
                        "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
                fi
        fi
-       rm -r "$state_dir"
        say All done.
 }
 
@@ -110,7 +109,7 @@ continue)
                continue_merge
        done
        finish_rb_merge
-       exit
+       return
        ;;
 skip)
        read_state
@@ -122,7 +121,7 @@ skip)
                continue_merge
        done
        finish_rb_merge
-       exit
+       return
        ;;
 esac