Jonathan Nieder <jrnie...@gmail.com> writes:
> Probably it would make sense to do
> $(gettext 'When you have resolved this problem, run "git rebase
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase
> anyway, so the translators could have fewer newlines at the edges to
> fuss about.
> Maybe, to allow changing the commands without having to update
> cmd_live_rebase='git rebase (--continue | --abort | --skip)'
> cmd_clear_stale_rebase="rm -fr \"$state_dir\""
> die "
> $(eval_gettext 'It seems that there is already a $state_dir_base
> directory, and
> I wonder if you ware in the middle of another rebase. If that is the
> case, please try
> If that is not the case, please
> and run me again. I am stopping in case you still have something
> valuable there.')"
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html