Skip to content

Commit

Permalink
Merge branch 'rl/maint-stash-i18n-save-error' into maint
Browse files Browse the repository at this point in the history
i18n marking for an error message for "git stash --notavalidoption"
was incorrect.

By Ross Lagerwall
* rl/maint-stash-i18n-save-error:
  stash: use eval_gettextln correctly
  • Loading branch information
Junio C Hamano committed May 3, 2012
2 parents a16ae14 + ed3c400 commit beac07e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ save_stash () {
# $ git stash save --blah-blah 2>&1 | head -n 2
# error: unknown option for 'stash save': --blah-blah
# To provide a message, use git stash save -- '--blah-blah'
eval_gettextln "$("error: unknown option for 'stash save': \$option
To provide a message, use git stash save -- '\$option'")"
eval_gettextln "error: unknown option for 'stash save': \$option
To provide a message, use git stash save -- '\$option'"
usage
;;
*)
Expand Down

0 comments on commit beac07e

Please sign in to comment.