diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:24:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-03 15:24:22 -0700 |
| commit | beac07eab9d32a62539ba6f2091e6574b67a638f (patch) | |
| tree | 81411bc0b6c9ef9a529e1183aab36951240ca9c3 | |
| parent | a16ae14e48ab228e7b80ab45f225234361515d84 (diff) | |
| parent | ed3c400c6aba78fac5e5e502c89c4e8304d5ce5f (diff) | |
| download | git-beac07eab9d32a62539ba6f2091e6574b67a638f.tar.gz | |
Merge branch 'rl/maint-stash-i18n-save-error' into maint
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
| -rwxr-xr-x | git-stash.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh index fe4ab28b2e..4e2c7f8331 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -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 ;; *) |