development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  Documentation/gitmodules: Only 'update' and 'url' are required
  l10n: de.po: fix translation of 'prefix'
This commit is contained in:
Junio C Hamano 2014-01-06 10:39:07 -08:00
parent 44484662d8 c90d3dbe7d
commit 932f7e4769
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/gitmodules.txt
View file

@ -35,6 +35,8 @@ submodule.<name>.url::
linkgit:git-clone[1] or (if it begins with ./ or ../) a location linkgit:git-clone[1] or (if it begins with ./ or ../) a location
relative to the superproject's origin repository. relative to the superproject's origin repository.
In addition, there are a number of optional keys:
submodule.<name>.update:: submodule.<name>.update::
Defines what to do when the submodule is updated by the superproject. Defines what to do when the submodule is updated by the superproject.
If 'checkout' (the default), the new commit specified in the If 'checkout' (the default), the new commit specified in the

16
po/de.po
View file

@ -72,7 +72,7 @@ msgstr "Archivformat"
#: archive.c:328 builtin/log.c:1193 #: archive.c:328 builtin/log.c:1193
msgid "prefix" msgid "prefix"
msgstr "Prefix" msgstr "Präfix"
#: archive.c:329 #: archive.c:329
msgid "prepend prefix to each pathname in the archive" msgid "prepend prefix to each pathname in the archive"
@ -3716,7 +3716,7 @@ msgid ""
msgstr "" msgstr ""
"Eingabehilfe:\n" "Eingabehilfe:\n"
"1 - nummeriertes Element auswählen\n" "1 - nummeriertes Element auswählen\n"
"foo - Element anhand eines eindeutigen Prefix auswählen\n" "foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen" " - (leer) nichts auswählen"
#: builtin/clean.c:298 #: builtin/clean.c:298
@ -3734,7 +3734,7 @@ msgstr ""
"1 - einzelnes Element auswählen\n" "1 - einzelnes Element auswählen\n"
"3-5 - Bereich von Elementen auswählen\n" "3-5 - Bereich von Elementen auswählen\n"
"2-3,6-9 - mehrere Bereiche auswählen\n" "2-3,6-9 - mehrere Bereiche auswählen\n"
"foo - Element anhand eines eindeutigen Prefix auswählen\n" "foo - Element anhand eines eindeutigen Präfix auswählen\n"
"-... - angegebenes Element abwählen\n" "-... - angegebenes Element abwählen\n"
"* - alle Elemente auswählen\n" "* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden" " - (leer) Auswahl beenden"
@ -6452,7 +6452,7 @@ msgstr "kennzeichnet die Serie als n-te Fassung"
#: builtin/log.c:1194 #: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]" msgid "Use [<prefix>] instead of [PATCH]"
msgstr "verwendet [<Prefix>] anstatt [PATCH]" msgstr "verwendet [<Präfix>] anstatt [PATCH]"
#: builtin/log.c:1197 #: builtin/log.c:1197
msgid "store resulting files in <dir>" msgid "store resulting files in <dir>"
@ -8182,7 +8182,7 @@ msgid ""
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr "" msgstr ""
"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<Prefix>] " "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<Präfix>] "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> " "index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
"[<Commit-Referenz3>]])" "[<Commit-Referenz3>]])"
@ -9782,15 +9782,15 @@ msgstr "gibt Tag-Inhalte aus"
#: builtin/write-tree.c:13 #: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<Prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
#: builtin/write-tree.c:26 #: builtin/write-tree.c:26
msgid "<prefix>/" msgid "<prefix>/"
msgstr "<Prefix>/" msgstr "<Präfix>/"
#: builtin/write-tree.c:27 #: builtin/write-tree.c:27
msgid "write tree object for a subdirectory <prefix>" msgid "write tree object for a subdirectory <prefix>"
msgstr "schreibt das \"Tree\"-Objekt für ein Unterverzeichnis <Prefix>" msgstr "schreibt das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix>"
#: builtin/write-tree.c:30 #: builtin/write-tree.c:30
msgid "only useful for debugging" msgid "only useful for debugging"