diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-03-05 15:06:59 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-05 15:06:59 -0800 |
commit | 6ab4ae2b415c375170309c2b7ace0e4daa8d0215 (patch) | |
tree | c2769719beee9adc0526bb1293d523a959e8df56 | |
parent | ee3a81e69cde27add025e206cd9dd2937c80f230 (diff) | |
parent | 16216b6ab1073b7aaa8225c32208758e6ea16629 (diff) | |
download | git-6ab4ae2b415c375170309c2b7ace0e4daa8d0215.tar.gz |
Merge branch 'maint'
* maint:
i18n: proposed command missing leading dash
-rw-r--r-- | po/fr.po | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1075,7 +1075,7 @@ msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" #: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (utilisez \"git branch -unset-upstream\" pour corriger)\n" +msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" #: remote.c:1878 #, c-format @@ -3266,7 +3266,7 @@ msgstr " git branch -d %s\n" #: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" -msgstr " git branch -set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format |