Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: builtin/branch.c: mark option for translation
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Fri, 8 Apr 2016 20:02:45 +0000
(20:02 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 8 Apr 2016 22:18:13 +0000
(15:18 -0700)
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/branch.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
71d99b8
)
diff --git
a/builtin/branch.c
b/builtin/branch.c
index 7b45b6bd6b80613de9f894cfbe8e9d2dcae77b09..5ab106bed2ed4e2c322bf789b7d5cca6a8a12809 100644
(file)
--- a/
builtin/branch.c
+++ b/
builtin/branch.c
@@
-620,7
+620,7
@@
int cmd_branch(int argc, const char **argv, const char *prefix)
BRANCH_TRACK_EXPLICIT),
OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
BRANCH_TRACK_OVERRIDE),
BRANCH_TRACK_EXPLICIT),
OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
BRANCH_TRACK_OVERRIDE),
- OPT_STRING('u', "set-upstream-to", &new_upstream,
"upstream", "change the upstream info"
),
+ OPT_STRING('u', "set-upstream-to", &new_upstream,
N_("upstream"), N_("change the upstream info")
),
OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
OPT__COLOR(&branch_use_color, N_("use colored output")),
OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"),
OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
OPT__COLOR(&branch_use_color, N_("use colored output")),
OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"),