chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
31a068b
)
git-debrebase: Replace `git-debrebase:' with `$us:' in bad usage msg
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 2 Oct 2018 12:48:27 +0000
(13:48 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 2 Oct 2018 12:50:34 +0000
(13:50 +0100)
This is a different pattern as it is in a translated message, so we
change __ to f_.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 2fa8cf479cf147be232acbbc91764b0384d0f575..c1bef12c4dce7d3857882b6cf8f2533c4cb304b8 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-2978,7
+2978,7
@@
getoptions_main
'experimental-merge-resolution!', \$opt_merges,
'-i:s' => sub {
my ($opt,$val) = @_;
- badusage
__ "git-debrebase: no cuddling to -i for git-rebase"
+ badusage
f_ "%s: no cuddling to -i for git-rebase", $us
if length $val;
confess if $opt_defaultcmd_interactive; # should not happen
$opt_defaultcmd_interactive = [ qw(-i) ];