Move definition of enum branch_track from cache.h to branch.h

diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
index c51c7828e7b331710006ac9a15f3d7443dcf3816..c214c5e4d6ce21996f16031ec14dd624b75a9939 100644 (file)
--- a/git-rebase--preserve-merges.sh
+++ b/git-rebase--preserve-merges.sh
@@ -891,9 +891,9 @@ $comment_char $(eval_ngettext \
 EOF
        append_todo_help
        gettext "
-       However, if you remove everything, the rebase will be aborted.
+However, if you remove everything, the rebase will be aborted.
 
-       " | git stripspace --comment-lines >>"$todo"
+" | git stripspace --comment-lines >>"$todo"
 
        if test -z "$keep_empty"
        then