Jonathan Nieder <> writes:

> Probably it would make sense to do
>       resolvemsg="
>       $(gettext 'When you have resolved this problem, run "git rebase 
> --continue".
>       If you prefer to skip this patch, run "git rebase --skip" instead.
>       To check out the original branch and stop rebasing, run "git rebase 
> --abort".')
>       "
> anyway, so the translators could have fewer newlines at the edges to
> fuss about.


> Maybe, to allow changing the commands without having to update
> translations:
>       state_dir_base=...
>       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
>               $cmd_live_rebase
>       If that is not the case, please
>               $cmd_clear_stale_rebase
>       and run me again.  I am stopping in case you still have something
>       valuable there.')"

Again, nice.

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to