Reported-by: Phillip Szelat
Signed-off-by: Ralf Thielow
---
Hi Phillip,
Good catches. Thanks for the review!
Ralf
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index eb213d742..d5113434a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3421,7
Signed-off-by: Ralf Thielow
---
v2 updates the translation up to the latest update of git.pot.
range-diff:
1: f0a6c76bf ! 1: f8313495e l10n: update German translation
@@ -205,13 +205,13 @@
-msgstr ""
+msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen
Signed-off-by: Ralf Thielow
---
builtin/rebase.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 5b3e5baec8..a6acba76b4 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -871,7 +871,7 @@ int cmd_rebase(int argc, const char
Signed-off-by: Ralf Thielow
---
po/de.po | 827 +--
1 file changed, 375 insertions(+), 452 deletions(-)
diff --git a/po/de.po b/po/de.po
index 3cf9405df..256b668a8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -943,17 +943,17 @@ msgid "&q
Signed-off-by: Ralf Thielow
---
git-rebase.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 7973447645..45b6ee9c0e 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -553,15 +553,15 @@ then
# Note: incompatibility with
The error message and the value that caused that error should be
separated by a colon.
Signed-off-by: Ralf Thielow
---
builtin/config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/config.c b/builtin/config.c
index 2c93a289a7..862f870b58 100644
--- a/builtin
Translate 108 new messages came from git.pot update in 9b7388a85 (l10n:
git.pot: v2.18.0 round 1 (108 new, 14 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 373 +--
1 file changed, 194 insertions(+), 179 deletions(-)
diff --git a/po
Noticed-by: Matthias Rüster
Signed-off-by: Ralf Thielow
---
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 793bd2a80..257f527d6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16991,7 +16991,7 @@ msgstr "Löschung im Arbeitsverzeichnis verw
2018-04-02 20:09 GMT+02:00 Matthias Rüster :
> Hi Ralf,
>
> thanks a lot for your translations!
>
> I've only found a small issue:
>
>> #: git-add--interactive.perl:1405
>> -#, fuzzy, perl-format
>> +#, perl-format
>> msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
>> -msgstr "diesen
Thanks for your contributions!
Signed-off-by: Ralf Thielow
---
po/TEAMS | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/po/TEAMS b/po/TEAMS
index 065771cfe..762879550 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -13,12 +13,8 @@ Members: Alex Henrie
Language: de
Translate 132 new message came from git.pot update in abc8de64d (l10n:
git.pot: v2.17.0 round 1 (132 new, 44 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 455 +--
1 file changed, 209 insertions(+), 246 deletions(-)
diff --git a/po
Translate 72 new messages came from git.pot update in 18a907225 (l10n:
git.pot: v2.16.0 round 1 (64 new, 25 removed)) and 005c62fe4 (l10n:
git.pot: v2.16.0 round 2 (8 new, 4 removed)).
Signed-off-by: Ralf Thielow
---
Thanks for the review, Matthias!
po/de.po | 227
Signed-off-by: Ralf Thielow
---
Documentation/git-worktree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index f850e8ffb..41585f535 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git
Translate 72 new messages came from git.pot update in 18a907225 (l10n:
git.pot: v2.16.0 round 1 (64 new, 25 removed)) and 005c62fe4 (l10n:
git.pot: v2.16.0 round 2 (8 new, 4 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 227
Signed-off-by: Ralf Thielow
---
po/de.po | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/po/de.po b/po/de.po
index 400262625..00ffd8c41 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1070,42 +1070,42 @@ msgstr "Branch %s kann nicht sein eigener
Upstream-B
Robert Abel wrote:
> Der-, die- and dasselbe and their declensions are spelt as one word in German.
>
Thanks!
> Signed-off-by: Robert Abel
> ---
> po/de.po | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index a05aca5f3..400262625 100644
>
Today I played around a bit with git submodules and noticed
that the very handy configuration "submodule.recurse" is not
working for the git-clone command.
"git help config" tells me that submodule.recurse affects
all commands that have a --recurse-submodules option.
git-clone seems to be an excep
From: Andre Hinrichs
Signed-off-by: Andre Hinrichs
Signed-off-by: Ralf Thielow
---
po/de.po | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/po/de.po b/po/de.po
index 0619c4988..a05aca5f3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2389,7 +2389,7
Translate 70 new messages came from git.pot update in 25eab542b
(l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)) and 9c07fab78
(l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 253
Change an error message in sequencer.c for the case that
we could not write to a file to match other instances.
Signed-off-by: Ralf Thielow
---
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 75f5356f6..f2a10cc4f 100644
--- a
2017-10-17 8:53 GMT+02:00 Junio C Hamano :
> Jiang Xin writes:
>
>> Git v2.15.0-rc1 released with a typo fix from commit dfab1eac23
>> ("i18n: add a missing space in message", Sun Oct 8 14:18:39 2017 +0200).
>> This time there are 2 updated messages need to be translated since last
>> update. Let
runcate as we do in other calls of ftruncate().
Signed-off-by: Ralf Thielow
---
sequencer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index e258bb646..75f5356f6 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2948,9 +2948,9 @@ int rearrange_s
2017-10-13 23:12 GMT+02:00 René Scharfe :
> Am 13.10.2017 um 19:51 schrieb Ralf Thielow:
>> When ftruncate() in rearrange_squash() fails, we write
>> that we couldn't finish the operation on the todo file.
>> It is more accurate to write that we couldn't truncat
When ftruncate() in rearrange_squash() fails, we write
that we couldn't finish the operation on the todo file.
It is more accurate to write that we couldn't truncate
as we do in other calls of ftruncate().
While at there, remove a full stop in another error message.
Signed-off-by: Ra
From: Hartmut Henkel
Signed-off-by: Hartmut Henkel
Helped-by: Stefan Beller
Signed-off-by: Ralf Thielow
---
po/de.po | 52 +---
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/po/de.po b/po/de.po
index c5b7ed501..362ebb6bb
2017-07-27 20:00 GMT+02:00 Stefan Beller :
> This patch looks good to me, but some unrelated comments
> that I feel would improve the translation even more.
>
> Thanks,
> Stefan
>
>> @@ -1465,7 +1465,7 @@ msgstr "Konnte '%s' nicht aufheben."
>>
>> #: connect.c:50
>> msgid "The remote end hung up
From: Hartmut Henkel
Signed-off-by: Hartmut Henkel
Signed-off-by: Ralf Thielow
---
po/de.po | 50 +-
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/po/de.po b/po/de.po
index c5b7ed501..dc381cb2d 100644
--- a/po/de.po
+++ b/po
Signed-off-by: Ralf Thielow
---
v3 contains updated translations in date.c where %lu
turned into %.
po/de.po | 169 ---
1 file changed, 87 insertions(+), 82 deletions(-)
diff --git a/po/de.po b/po/de.po
index 347166240..283e68627
+#, fuzzy, c-format
+msgid "% second ago"
+msgid_plural "% seconds ago"
+msgstr[0] "vor %lu Sekunde"
+msgstr[1] "vor %lu Sekunden"
...
which seems to be OK. A full diff after updating de.po after this
patch can be found at https://pastebin.com/5yeSnGQj.
Ralf
2017-07
Signed-off-by: Ralf Thielow
---
Hi Matthias,
2017-07-20 20:36 GMT+02:00 Matthias Rüster :
> Hi Ralf,
>
> I think the following should be "hinzugefügt":
>
Sure. Thanks for review!
Ciao,
Ralf
po/de.po | 123 +
Signed-off-by: Ralf Thielow
---
po/de.po | 123 +--
1 file changed, 64 insertions(+), 59 deletions(-)
diff --git a/po/de.po b/po/de.po
index b9e076f93..f4cb9bf2d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -176,26 +176,26 @@ msgid &quo
Reported-by: Andre Hinrichs
Signed-off-by: Ralf Thielow
---
Hi Andre,
thanks for the bugreport!
Ralf
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 679f8f4..42c4508 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8564,7 +8564,7 @@ msgstr
Translate 4 new messages came from git.pot update in 28e1aaa48 (l10n:
git.pot: v2.13.0 round 2 (4 new, 7 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/po/de.po b/po/de.po
index 12c3d36a0..679f8f472 100644
--- a
Translate 96 new messages came from git.pot update in dfc182b (l10n:
git.pot: v2.13.0 round 1 (96 new, 37 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 325 ---
1 file changed, 143 insertions(+), 182 deletions(-)
diff --git a
2017-05-03 21:27 GMT+02:00 Christian Brabandt :
> On Mi, 03 Mai 2017, Ralf Thielow wrote:
>
>> Ref or Reference is translated as "Referenz" while
>> Rev or Revision is translated as "Commit" so I think
>> the translation is correct.
>
> Oh right
2017-05-03 19:29 GMT+02:00 Matthias Rüster :
> Hi Ralf,
>
> thanks again for your work!
>
>
>>
>> #: ref-filter.c:565
>> -#, fuzzy, c-format
>> +#, c-format
>> msgid "format: %%(then) atom used after %%(else)"
>> -msgstr "Format: %%(end) Atom fehlt"
>> +msgstr "format: %%(then) nach %%(else) verw
Translate 96 new messages came from git.pot update in dfc182b (l10n:
git.pot: v2.13.0 round 1 (96 new, 37 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 323 ---
1 file changed, 142 insertions(+), 181 deletions(-)
diff --git a
Am 3. Mai 2017 um 14:38 schrieb Christian Brabandt :
> Hallo Ralf!
>
> Ralf Thielow schrieb am Dienstag, den 02. Mai 2017:
>
>> @@ -1260,6 +1260,8 @@ msgstr "Speicher verbraucht"
>> #: config.c:191
>> msgid "relative config include
Translate 96 new messages came from git.pot update in dfc182b (l10n:
git.pot: v2.13.0 round 1 (96 new, 37 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 323 ---
1 file changed, 142 insertions(+), 181 deletions(-)
diff --git a
2017-05-01 14:19 GMT+02:00 Simon Ruderich :
> On Sun, Apr 30, 2017 at 09:11:49PM +0200, Ralf Thielow wrote:
>> #: config.c:1952
>> #, c-format
>> msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
>> -msgstr &q
Translate 96 new messages came from git.pot update in dfc182b (l10n:
git.pot: v2.13.0 round 1 (96 new, 37 removed)).
Signed-off-by: Ralf Thielow
---
:/ It turned out de.po was not up-to-date with the git.pot update
mentioned. So here we go again.
po/de.po | 323
Translate 96 new messages came from git.pot update in dfc182b (l10n:
git.pot: v2.13.0 round 1 (96 new, 37 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 309 +++
1 file changed, 134 insertions(+), 175 deletions(-)
diff --git a
One message appears twice in the translations and the only
difference is a dot at the end. So add this dot to make
the messages being identical.
Signed-off-by: Ralf Thielow
---
git-add--interactive.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-add
Signed-off-by: Ralf Thielow
---
submodule.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c
index c52d6634c..02033c97e 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1251,7 +1251,7 @@ int bad_to_remove_submodule(const char *path, unsigned
flags
Thanks for both patches to de.po!
2017-03-17 16:04 GMT+01:00 Michael J Gruber :
> Signed-off-by: Michael J Gruber
> ---
> Just a minor thing. I'm wondering about lower/upper case
> at the beginning of the line, though. Do we have a rule for de.po?
>
There is no rule nor is there consistency. :/
e tab character with blanks.
Signed-off-by: Ralf Thielow
---
git-add--interactive.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index cf6fc926a..982593c89 100755
--- a/git-add--interactive.perl
+++ b/git-add--interac
Translate 241 messages came from git.pot update in 673bfad09
(l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)) and a4d94835a
(l10n: git.pot: v2.12.0 round 2 (2 new)).
Signed-off-by: Ralf Thielow
---
po/de.po | 750 ++-
1 file
Hi Phillip,
thanks for review!
Am 17. Februar 2017 um 22:56 schrieb Phillip Sz :
>> #: remote.c:2092
>> #, c-format
>> msgid "Your branch is ahead of '%s' by %d commit.\n"
>> msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
>> -msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n"
>
Translate 241 messages came from git.pot update in 673bfad09
(l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)) and a4d94835a
(l10n: git.pot: v2.12.0 round 2 (2 new)).
Signed-off-by: Ralf Thielow
---
po/de.po | 746 ++-
1 file
2017-01-06 20:43 GMT+01:00 Stefan Beller :
> On Fri, Jan 6, 2017 at 11:31 AM, Ralf Thielow wrote:
>> 2017-01-06 18:55 GMT+01:00 Stefan Beller :
>>> On Fri, Jan 6, 2017 at 9:25 AM, Jake Lambert wrote:
>>>> Hello,
>>>>
>>>> When executing &quo
2017-01-06 18:55 GMT+01:00 Stefan Beller :
> On Fri, Jan 6, 2017 at 9:25 AM, Jake Lambert wrote:
>> Hello,
>>
>> When executing "git branch --edit-description" on a branch with no
>> description set, I get "fatal: could not unset
>> 'branch..description". It would seem that the unsetting piece
2016-11-28 15:21 GMT+01:00 Jiang Xin :
> 2016-11-25 2:25 GMT+08:00 Ralf Thielow :
>> #: sequencer.c:251
>> -#, fuzzy, c-format
>> +#, c-format
>> msgid "could not write eol to '%s"
>
> Unmatched single quote has been fixed in l10n round 3.
>
Translate 210 new messages came from git.pot update in fda7b09
(l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)) and c091ffb
(l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 657
2016-11-15 19:26 GMT+01:00 Ralf Thielow :
Finally I've found the time to actually try this out and there
are some problems with it.
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 7cf68f07b..33d7c154f 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitw
Raphaël Gertz wrote:
> Hi,
>
> There a small bug in gitweb html validation, you need the following patch to
> pass w3c check with searchbox enabled.
>
> The problem lies in the input directly embed inside a form without a wrapper
> which is not valid.
>
I agree this is a small bug. Only block l
One error message in fetch-pack.c uses 'git fetch_pack' at the beginning
which is not a git command. Use 'git fetch-pack' instead.
Signed-off-by: Ralf Thielow
---
fetch-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fetch-pack.c b/fetch-pa
Translate 260 new message came from git.pot updates in 9fa976f (l10n:
git.pot: v2.10.0 round 1 (248 new, 56 removed)) and 5bd166d (l10n:
git.pot: v2.10.0 round 2 (12 new, 44 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 783
Hi Matthias,
thanks for review! Your findings and suggestions are very good and
I will integrate them in a new version.
2016-10-03 0:23 GMT+02:00 Matthias Rüster :
>> #: builtin/merge.c:960
>> #, c-format
>> msgid "Bad value '%s' in environment '%s'"
>> -msgstr ""
>> +msgstr "Fehlerhafter Wer
Translate 260 new message came from git.pot updates in 9fa976f (l10n:
git.pot: v2.10.0 round 1 (248 new, 56 removed)) and 5bd166d (l10n:
git.pot: v2.10.0 round 2 (12 new, 44 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 783
2016-09-07 11:28 GMT+02:00 Dennis Kaarsemaker :
> Hi Ralf,
>
> There are quite a few patch series in flight these days around
> interactive rebase. Have you checked for conflicts with those?
>
Thanks. I did not check against 'pu' when I created this patch but I'm able
to apply without any conflict
2016-09-07 17:19 GMT+02:00 Johannes Schindelin :
>
> So, something like this should help (if you are interested in seeing this
> patch included, please run with it, as I am running short on time):
>
> -- snipsnap --
> diff --git a/wt-status.c b/wt-status.c
> index 6225a2d..8e4d999 100644
> --- a/wt
If we found bad instruction lines in the instruction sheet
of interactive rebase, we give the user advice on how to
fix it. However, we don't tell the user what to do afterwards.
Give the user advice to run 'git rebase --continue' after
the fix.
Signed-off-by: Ralf Thielow
--
2016-09-06 20:08 GMT+02:00 Ralf Thielow :
> - warn "$(gettext "You can fix this with 'git rebase
> --edit-todo'.")"
> + warn "$(gettext "You can fix this with 'git rebase
> --edit-todo' and then run '
If we found bad instruction lines in the instruction sheet
of interactive rebase, we give the user advice on how to
fix it. However, we don't tell the user what to do afterwards.
Give the user advice to run 'git rebase --continue' after
the fix.
Signed-off-by: Ralf Thielow
Hi,
today I accidentally triggered a "fatal" using interactive rebase.
If you edit the instruction sheet after 'rebase -i' and add an unknown
command, Git stops because it doesn't know the command.
That's fine, however, now we are in a state where 'git status' fails with
interactive rebase in pr
2016-08-26 22:20 GMT+02:00 Junio C Hamano :
>
> Because the whole thing is inside a double-quote pair, $() and $name
> are all interpolated even before test_expect_success is called.
> So the above becomes equivalent to
>
>>> test_expect_success "two commits do not have the same ID" '
>>> g
2016-08-26 21:42 GMT+02:00 Junio C Hamano :
> Junio C Hamano writes:
>
>
> Taking all of these together, I'll queue this as a proposed fix-up
> directly on top of yours.
>
Thanks!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.o
2016-08-26 21:06 GMT+02:00 Junio C Hamano :
> Ralf Thielow writes:
>
>> Introduce option --exclude-guides to the help command. With this option
>> being passed, "git help" will open man pages only for actual commands.
>
> Let's hide this option from comman
n handle_builtin
Johannes Schindelin (1):
Revert "display HTML in default browser using Windows' shell API"
Ralf Thielow (2):
help: introduce option --exclude-guides
help: make option --help open man pages only for Git commands
Documentation/git-help.txt | 11
, for performance
reasons.
However, this change ignores the `help.browser` config setting. Together
with browsing help not being a performance-critical operation, let's
just revert that patch.
Signed-off-by: Johannes Schindelin
Signed-off-by: Ralf Thielow
---
builtin/help.c | 7 ---
compat/mi
If option --help is passed to a Git command, we try to open
the man page of that command. However, we do it for both commands
and concepts. Make sure it is an actual command.
This makes "git --help" not working anymore, while
"git help " still works.
Signed-
ned-off-by: Ralf Thielow
---
In the test script we do two things I'd like to point out:
> + test_config help.htmlpath test://html &&
As we pass a URL, Git won't check if the given path looks like
a documentation directory. Another solution would be to create
a directo
2016-08-19 10:32 GMT+02:00 Johannes Schindelin :
> So how about fixing that? I would suggest to do it this way:
>
> - configure help.format = html (for "man", the current code would always
> add $(prefix)/share/man to the MANPATH when testing, not what we want,
> and hacking this code *just* f
2016-08-19 10:39 GMT+02:00 Remi Galan Alfonso
:
> Hi Ralf,
>
> Ralf Thielow writes:
>> [...]
>> +test_expect_success "works for commands and guides by default" "
>> +git help status &&
>> +git help revisions
>> +&q
Sorry for being late in responding. It's been busy days.
2016-08-18 21:51 GMT+02:00 Junio C Hamano :
> Ralf Thielow writes:
>
> The same comment applies to 1/2, too, in that the word "command"
> will be interpreted differently by different people. For example,
> &q
If option --help is passed to a Git command, we try to open
the man page of that command. However, we do it even for commands
we don't know. Make sure it is a Git command.
This breaks "git --help" while "git help " still works.
Signed-off-by: Ralf Thielow
In this version, one patch has been turned into two. The first introduces the
option "command-only" to make 'help' only working for commands and additionally
give some nice help on typos. The second makes option --help only work for
actual
Git commands.
Ralf Thielow (2
Introduce option --command-only to the help command. With this option
being passed, "git help" will open man pages only for commands.
Since we know it is a command, we can use function help_unknown_command
to give the user advice on typos.
Signed-off-by: Ralf Thielow
---
I am not
2016-08-16 19:27 GMT+02:00 Junio C Hamano :
> Ralf Thielow writes:
>> +
>> + if (swapped)
>> + return help_unknown_cmd(cmd);
>
> I am guilty of suggesting "swapped"; even if we are going to mark
> this as OPT_HIDDEN, I think we should be ab
2016-08-16 18:33 GMT+02:00 John Keeping :
> On Tue, Aug 16, 2016 at 06:20:30PM +0200, Ralf Thielow wrote:
>> static struct option builtin_help_options[] = {
>> + OPT_BOOL('s', "swapped", &swapped, "mark as being called by
>> --help")
t;git --help" while "git help " still works.
As " --help" will internally be turned into "help ",
introduce the hidden option "--swapped" in order to know which
version has been called.
Signed-off-by: Ralf Thielow
---
Thanks, all, for the help!
Chan
If option --help is passed to a Git command, we try to open
the man page of that command. However, we do it even for commands
we don't know. Make sure the command is known to Git before try
to open the man page. If we don't know the command, give the
usual advice.
Signed-off-by: Ra
If option --help is passed to a Git command, we try to open
the man page of that command. However, we do it even for commands
we don't know. Make sure the command is known to Git before try
to open the man page. If we don't know the command, give the
usual advice.
Signed-off-by: Ra
Signed-off-by: Ralf Thielow
---
po/de.po | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/po/de.po b/po/de.po
index d50cb1b..fdf4d92 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12408,7 +12408,7 @@ msgstr ""
#: git-rebase.sh:168
msgid "Applied auto
Translate 104 new messages came from git.pot update in f517e50
(l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 413 ---
1 file changed, 212 insertions(+), 201 deletions(-)
diff --git a
Jean-Noël AVILA writes:
> Cherry-picked, fixed and PR to Jiang Xin
>
Thanks
> JN
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe f
CC'ed Jean-Noël who maintains French translation.
Antonin writes:
> "tous le dépôts distants" -> "tous les dépôts distants"
> ---
> po/fr.po | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/po/fr.po b/po/fr.po
> index 88b0b8a7..36c7c99 100644
> --- a/po/fr.po
> +++ b/po/
Using the string-list API in function unsorted_string_list_lookup()
makes the code more readable.
Signed-off-by: Ralf Thielow
---
Changes since v1:
- remove extra curly braces
string-list.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/string-list.c b/string
Johannes Schindelin writes:
>>
>> -for (i = 0; i < list->nr; i++)
>> -if (!cmp(string, list->items[i].string))
>> -return list->items + i;
>> +for_each_string_list_item(item, list) {
>> +if (!cmp(string, item->string))
>> +
Using the string-list API in function unsorted_string_list_lookup()
makes the code more readable. So let's do this.
Signed-off-by: Ralf Thielow
---
string-list.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/string-list.c b/string-list.c
index 2a32a3f..81
The message that is shown when rebase-i stops for editing prints
the full hash of the commit where it stopped which makes the message
overflow to the next line on smaller terminal windows. Print an
abbreviated hash instead.
Signed-off-by: Ralf Thielow
---
git-rebase--interactive.sh | 3 ++-
1
2016-03-24 20:56 GMT+01:00 Junio C Hamano :
> Ralf Thielow writes:
>
>> Signed-off-by: Ralf Thielow
>> ---
>
> Hmph, the reason why this is a good thing to do is because an
> overlong $sha1 would push $rest too far to the right (possibly
> making it overflow to th
Signed-off-by: Ralf Thielow
---
git-rebase--interactive.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4cde685..9ea3075 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -548,7
Signed-off-by: Ralf Thielow
---
contrib/completion/git-completion.bash | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 70f4171..ffe6004 100644
--- a/contrib/completion/git
The bash completion is missing the option '--guides' for 'git-help'
and some params you see there. Add them both.
Ralf Thielow (2):
completion: add option '--guides' to 'git help'
completion: add 'revisions' and 'everyday' to '
Signed-off-by: Ralf Thielow
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index e3918c8..70f4171 100644
--- a/contrib/completion/git-completion.bash
Signed-off-by: Ralf Thielow
---
This hotfix is already part of the pull request I sent
to git-po repository.
po/de.po | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 7093139..0eadf34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -151,12 +151,13
When a translation round starts for a Git release, the
git.pot file will be updated and translators msgmerge
their .po-files accordingly before translating. This results
in a huge change to the .po-file as line numbers and
stuff gets updated.
Since translations are made in one commit, this commit
Translate 22 new messages came from git.pot update in f1522b2
(l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168
(l10n: git.pot: Add one new message for Git 2.8.0).
Signed-off-by: Ralf Thielow
---
po/de.po | 68
1
Signed-off-by: Ralf Thielow
---
po/TEAMS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/TEAMS b/po/TEAMS
index df12b58..56274ad 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -11,7 +11,7 @@ Leader: Alex Henrie
Language: de (German)
Repository:https
1 - 100 of 404 matches
Mail list logo
