Hi,
when a user made a typo, Git is not good in guessing what
the user could have meant, except for git commands. I think
this is an area with room for improvements.
Let's look into branches. When I "clone --branch" and make
a typo, Git could show me what branch I could have meant. It's
the same w
With 77b9b1d (add_to_alternates_file: don't add duplicate entries,
2015-08-10) the last caller of function "hold_lock_file_for_append"
has been removed, so we can remove the function as well.
Signed-off-by: Ralf Thielow
---
This is the second bullet point in
http://git-blam
Translate 121 new messages came from git.pot update in 47d73eb
(l10n: git.pot: proposed updates for v2.6.0 (+121)).
Signed-off-by: Ralf Thielow
---
po/de.po | 384 ++-
1 file changed, 183 insertions(+), 201 deletions(-)
diff --git a
Am 11. September 2015 um 17:17 schrieb Ralf Thielow :
> Translate 121 new messages came from git.pot update in 47d73eb
> (l10n: git.pot: proposed updates for v2.6.0 (+121)).
>
Hmpf. Please ignore this as the commit this translation is based on is not the
latest. New patch will follow so
Translate 121 new messages came from git.pot update in df0617b
(l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 391 ++-
1 file changed, 186 insertions(+), 205 deletions(-)
diff --git a
Am 11. September 2015 um 17:35 schrieb Ralf Thielow :
> Translate 121 new messages came from git.pot update in df0617b
I forgot to change this part of the message. Should be 123, obviously.
> (l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)).
>
> Signed-off-by: Ralf Thielow
"false|true|preserve" are actual values for option "rebase"
of the "git-pull" command and should therefore not be marked
for translation.
Signed-off-by: Ralf Thielow
---
builtin/pull.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin
The description of option "create-reflog" is "create_reflog", which
is neither a good description, nor a sensible string to translate.
Change it to a more meaningful message.
Signed-off-by: Ralf Thielow
---
builtin/tag.c| 2 +-
builtin/update-ref.c | 2 +-
2 files c
Hi,
thanks for review!
Am 13. September 2015 um 20:35 schrieb Phillip Sz :
>> #: wt-status.c:1105
>> -#, fuzzy
>> msgid "No commands done."
>> -msgstr "Keine Commits geparst."
>> +msgstr "Keine Kommandos ausgeführt."
>>
>
> Are you sure about this? "done" could also mean something like "erledig
Hi,
thanks for review! Good eyes. :-)
2015-09-13 20:37 GMT+02:00 Matthias Rüster :
> Hi Ralf,
>
> thanks for your work!
> I have only a few things to add:
>
>
> one little typo:
>
>> @@ -1228,20 +1227,19 @@ msgstr[1] ""
>> msgid " (use \"git pull\" to merge the remote branch into yours)\n"
>>
Translate 123 new messages came from git.pot update in df0617b
(l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 395 ++-
1 file changed, 188 insertions(+), 207 deletions(-)
diff --git a
Translate 2 messages came from git.pot update in e447091
(l10n: git.pot: v2.6.0 round 2 (3 improvements)).
Signed-off-by: Ralf Thielow
---
po/de.po | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/po/de.po b/po/de.po
index e5b523d..c9b4d16 100644
--- a/po/de.po
+++ b/po
- >% --
From: Phillip Sz
Date: Thu, 17 Sep 2015 17:50:32 +0200
Subject: [PATCH] l10n: de.po: better language for one string
Just one string I think we could translate better.
Signed-off-by: Phillip Sz
Signed-off-by: Ralf Thielow
---
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-
2015-09-29 20:17 GMT+02:00 Junio C Hamano :
> Matthieu Moy writes:
>
>>> Confirmed: Git 2.1.4 accepts this, 2.6 doesn't:
>>>
>>> Warning: the command isn't recognized in the following line:
>>> - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test
>>>
>>> You can fix this with 'git rebase --edit
for experienced users, we should treat
"index" as a Git term and therefore don't translate it.
Signed-off-by: Ralf Thielow
---
http://thread.gmane.org/gmane.comp.version-control.git/269345/focus=269657
po/de.po | 139 ++-
1
Am 1. Juni 2015 um 09:38 schrieb :
> Ralf Thielow venit, vidit, dixit 29.05.2015 20:54:
>> #: sequencer.c:501
>> #, c-format
>> @@ -1294,12 +1294,12 @@ msgstr "leere Menge von Commits übergeben"
>> #: sequencer.c:661
>> #, c-format
>> msgid &
for experienced users, we should treat
"index" as a Git term and therefore don't translate it.
Signed-off-by: Ralf Thielow
---
po/de.po | 136 +++
1 file changed, 66 insertions(+), 70 deletions(-)
diff --git a/po/de.po
Signed-off-by: Ralf Thielow
---
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 7d603c2..945bd13 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5679,11 +5679,11 @@ msgstr "Hauptwurzeln melden"
#: builtin/fsck.c:613
msgid &
Christian Stimming wrote:
> Am Montag, 1. Juni 2015, 09:38:37 schrieb g...@drmicha.warpmail.net:
>> Ralf Thielow venit, vidit, dixit 29.05.2015 20:54:
>> > The term "index" is translated as "Staging-Area" to
>> > not confuse beginners who don
2015-06-05 21:17 GMT+02:00 Phillip Sz :
> Acked-by: Phillip Sz
>
Thanks
--
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
he translation
is good for those kind of messages, it's bad for messages
that mean the Git index as the tree state or the index
file, in which case we should translate as "Index".
Signed-off-by: Ralf Thielow
---
Sorry for being late.
I've changed the commit message to explain why
Translate 65 new messages came from git.pot update
in 64f23b0 (l10n: git.pot: v2.5.0 round 1 (65 new,
15 removed))".
Signed-off-by: Ralf Thielow
---
po/de.po | 186 ---
1 file changed, 95 insertions(+), 91 deletions(-)
diff --git
Am 3. Juli 2015 um 17:50 schrieb Ralf Thielow :
> Translate 65 new messages came from git.pot update
> in 64f23b0 (l10n: git.pot: v2.5.0 round 1 (65 new,
> 15 removed))".
>
> Signed-off-by: Ralf Thielow
> ---
> #: dir.c:1945
> msgid "Untracked cache is d
Hi Phillip,
Thanks for review!
2015-07-05 15:21 GMT+02:00 Phillip Sz :
>> #: help.c:214
>> msgid "git commands available from elsewhere on your $PATH"
>> msgstr "Vorhandene Git-Kommandos irgendwo in Ihrem $PATH"
>>
>
> What do you think about "Git-Kommandos sind anderwo verfügbar in Ihrem
> $P
Translate 65 new messages came from git.pot update in
64f23b0 (l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed))".
Signed-off-by: Ralf Thielow
---
po/de.po | 192 ---
1 file changed, 98 insertions(+), 94 deletions(-)
diff --git
Translate 9 new messages came from git.pot update in a4156d2
(l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 28 ++--
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/po/de.po b/po/de.po
index 64070cd..6ed3509
The usage string of git-branch shows generic options and specific
options. However, the specific options are called "actions".
Call them both options.
Signed-off-by: Ralf Thielow
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c
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
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
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
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
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 | 750 ++-
1 file
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
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
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
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
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-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 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
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
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
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")
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
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
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
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
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
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
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
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
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
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
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 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
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
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
--
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
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
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
Signed-off-by: Ralf Thielow
---
Note:
Some translations in gitk may differ from translations in git-core
since gitk uses another glossary which I tried to follow here.
po/de.po | 79 +++-
1 file changed, 33 insertions(+), 46 deletions
2016-02-12 19:56 GMT+01:00 Stefan Beller :
> 2016-02-12 10:40 GMT-08:00 Ralf Thielow :
>> #: gitk:324
>> msgid "Error parsing revisions:"
>> msgstr "Fehler beim Laden der Versionen:"
>
> "Laden" (loading) is not the most correct translati
Please use imperative form in the commit subject, like "l10n: de.po: fix typo".
2016-03-02 10:13 GMT+01:00 :
> From: Christoph Hoopmann
>
> ---
"Signed-off-by"-line is missing.
Thanks
> po/de.po | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/po/de.po b/po/de.po
> in
2016-03-02 12:46 GMT+01:00 Christoph Hoopmann :
> Signed-off-by: Christoph Hoopmann
> ---
>
> Changes since v1:
> * Imperative in commit subject
> * "Signed-off-by"-line inserted
> ---
> po/de.po | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/po/de.po b/po/de.po
> inde
Signed-off-by: Ralf Thielow
---
po/de.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/de.po b/po/de.po
index 8c5f05d..0c38d36 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9145,7 +9145,7 @@ msgid ""
msgstr ""
"Aktualisierungen wurden zurück
Signed-off-by: Ralf Thielow
---
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 8c5f05d..07b4456 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1950,8 +1950,8 @@ msgstr "Keine Kommandos ausgeführt."
#, c-format
msgid "Last c
Signed-off-by: Ralf Thielow
---
po/de.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/de.po b/po/de.po
index a6b7bf3..9344a53 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9145,7 +9145,7 @@ msgid ""
msgstr ""
"Aktualisierungen wurden zurück
Am 2. März 2016 um 18:46 schrieb Stefan Beller :
> On Wed, Mar 2, 2016 at 9:36 AM, Ralf Thielow wrote:
>> Signed-off-by: Ralf Thielow
>> ---
>> po/de.po | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/po/de.po b/po/de.po
&g
Signed-off-by: Ralf Thielow
---
po/de.po | 80
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/po/de.po b/po/de.po
index 5422ee3..8d1ccbb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -396,7 +396,7 @@ msgstr "Ungül
Translate 48 new messages came from git.pot update in
9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 144 +++
1 file changed, 72 insertions(+), 72 deletions(-)
diff --git a/po
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
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
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
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
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
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 | 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
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
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
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
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
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.
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
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/
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
NULL
> };
There seem to be three more places left missing these angle brances
at the usage string.
Junio, feel free to squash this or treat it as a separate patch
on top, if suitable.
-- >8 --
From: Ralf Thielow
Date: Fri, 16 Oct 2015 19:09:57 +0200
Subject: [PATCH] am, cred
Signed-off-by: Ralf Thielow
---
po/de.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/de.po b/po/de.po
index c682aaf..be30642 100644
--- a/po/de.po
+++ b/po/de.po
@@ -592,7 +592,7 @@ msgstr "Fehler beim Schreiben der Signatur nach '%s': %s"
ns is implied by passing these
options, but not stored. This prevents subsequent calls of
"rebase --continue" to use this setting again later. Remove this
"do_merge" guard to allow a later usage.
Reported-by: Diogo de Campos
Signed-off-by: Fabian Ruch
Helped-by: Michael Ha
gy_args" from "strategy" and "strategy_opts" every time.
Reported-by: Diogo de Campos
Signed-off-by: Fabian Ruch
Helped-by: Michael Haggerty
Signed-off-by: Ralf Thielow
---
2015-12-11 21:07 GMT+01:00 Junio C Hamano :
> On Fri, Dec 11, 2015 at 11:54
Translate 68 new messages came from git.pot update in
f4f2c8f (l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed)) and
2c0ca05 (l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 190 ---
1
Signed-off-by: Ralf Thielow
---
builtin/push.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/push.c b/builtin/push.c
index cc29277..8963dbd 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -547,7 +547,7 @@ int cmd_push(int argc, const char **argv, const char
Am 22. Dezember 2015 um 18:39 schrieb Ralf Thielow :
> #: builtin/tag.c:25
> -#, fuzzy
> msgid ""
> "git tag -l [-n[]] [--contains ] [--points-at ]\n"
> "\t\t[--format=] [--[no-]merged []] [...]"
> msgstr ""
> "git tag
Translate 68 new messages came from git.pot update in
f4f2c8f (l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed)) and
2c0ca05 (l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)).
Signed-off-by: Ralf Thielow
---
2015-12-25 20:13 GMT+01:00 Phillip Sz :
> Hi,
>
> Just some comments, the r
Am 25. Dezember 2015 um 20:38 schrieb Ralf Thielow :
> msgid "format: %%(end) atom used without corresponding atom"
> -msgstr ""
> +msgstr "format: %%(end) Atom ohne zugehöriges Atom verwendet"
>
Oops.
Will change "format" to "F
1 - 100 of 387 matches
Mail list logo
