diff --git a/ci/install_po4a.sh b/ci/install_po4a.sh index 17ce37532b29ff787cd7a2dd34fcf2ccf4d88a22..78dd3a68e116452416ce6528960fda0e670dc5c0 100644 --- a/ci/install_po4a.sh +++ b/ci/install_po4a.sh @@ -1,4 +1,4 @@ #!/bin/sh git clone https://github.com/mquinson/po4a.git -cd po4a && git checkout v0.56 && cd .. +cd po4a && git checkout v0.62 && cd .. diff --git a/en/config.txt b/en/config.txt index bbd5c9b3ffa1ae95a1343c93a8a2355bf9d8b6db..6ba50b1104aa798cc80c92a521da39a026d82955 100644 --- a/en/config.txt +++ b/en/config.txt @@ -120,8 +120,8 @@ are: The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location -would be the final location where the .git directory is, not where -the .git file is. +would be the final location where the .git directory is, not where the +.git file is. + The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please @@ -240,15 +240,13 @@ boolean:: When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive. -+ -true;; - Boolean true literals are `yes`, `on`, `true`, - and `1`. Also, a variable defined without `= <value>` - is taken as true. - -false;; - Boolean false literals are `no`, `off`, `false`, - `0` and the empty string. + + true;; Boolean true literals are `yes`, `on`, `true`, + and `1`. Also, a variable defined without `= <value>` + is taken as true. + + false;; Boolean false literals are `no`, `off`, `false`, + `0` and the empty string. + When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is "true" or diff --git a/en/git-fast-import.txt b/en/git-fast-import.txt index 39cfa05b28b0126544b5ed8b89e0fd1b697c3e09..34dd0b4f1989ce8ed70dfb44211f6e15c3e73926 100644 --- a/en/git-fast-import.txt +++ b/en/git-fast-import.txt @@ -128,9 +128,9 @@ Submodule Rewriting --rewrite-submodules-from=<name>:<file>:: --rewrite-submodules-to=<name>:<file>:: Rewrite the object IDs for the submodule specified by <name> from the values - used in the from <file> to those used in the to <file>. The from marks should - have been created by `git fast-export`, and the to marks should have been - created by `git fast-import` when importing that same submodule. + used in the from <file> to those used in the to <file>. The from marks should + have been created by `git fast-export`, and the to marks should have been + created by `git fast-import` when importing that same submodule. + <name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. @@ -1317,7 +1317,7 @@ An example crash: Active Branch LRU ----------------- - active_branches = 1 cur, 5 max + active_branches = 1 cur, 5 max pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/en/git-init.txt b/en/git-init.txt index 59ecda6c17d0125716e3ed108fa5935a4327a3fc..b611d80697de479336697b5645a42815208baa5a 100644 --- a/en/git-init.txt +++ b/en/git-init.txt @@ -20,8 +20,9 @@ DESCRIPTION This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, -`refs/tags`, and template files. An initial `HEAD` file that -references the HEAD of the master branch is also created. +`refs/tags`, and template files. An initial branch without any +commits will be created (see the `--initial-branch` option below +for its name). If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository. @@ -73,8 +74,10 @@ If this is reinitialization, the repository will be moved to the specified path. -b <branch-name>:: --initial-branch=<branch-name>:: -Use the specified name for the initial branch in the newly created repository. -If not specified, fall back to the default name: `master`. +Use the specified name for the initial branch in the newly created +repository. If not specified, fall back to the default name (currently +`master`, but this is subject to change in the future; the name can be +customized via the `init.defaultBranch` configuration variable). --shared[=(false|true|umask|group|all|world|everybody|0xxx)]:: diff --git a/en/git-rebase.txt b/en/git-rebase.txt index a0487b5cc58816ac8c4ec700e56a5d116fd61824..e676c5ee0b4a003a1ae6ca40f1a38ec53a8d28fc 100644 --- a/en/git-rebase.txt +++ b/en/git-rebase.txt @@ -663,7 +663,7 @@ In addition, the following pairs of options are incompatible: * --fork-point and --root BEHAVIORAL DIFFERENCES ------------------------ +---------------------- git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to diff --git a/en/git-update-index.txt b/en/git-update-index.txt index 1489cb09a09997a64a102b58a8bf2b890640d6df..cbe354aa8dc05c153b344c9cc41f2674c5858ae5 100644 --- a/en/git-update-index.txt +++ b/en/git-update-index.txt @@ -57,8 +57,8 @@ OPTIONS updates are needed by checking stat() information. -q:: - Quiet. If --refresh finds that the index needs an update, the - default behavior is to error out. This option makes + Quiet. If --refresh finds that the index needs an update, the + default behavior is to error out. This option makes 'git update-index' continue anyway. --ignore-submodules:: @@ -66,9 +66,9 @@ OPTIONS when passed before --refresh. --unmerged:: - If --refresh finds unmerged changes in the index, the default + If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' - continue anyway. + continue anyway. --ignore-missing:: Ignores missing files during a --refresh @@ -81,10 +81,10 @@ OPTIONS encouraged to use a single-parameter form. --index-info:: - Read index information from stdin. + Read index information from stdin. --chmod=(+|-)x:: - Set the execute permissions on the updated files. + Set the execute permissions on the updated files. --[no-]assume-unchanged:: When this flag is specified, the object names recorded @@ -157,7 +157,7 @@ you will need to handle the situation manually. separated by LF (i.e. one path per line) by default. --verbose:: - Report what is being added and removed from index. + Report what is being added and removed from index. --index-version <n>:: Write the resulting index out in the named on-disk format version. diff --git a/po/documentation.pot b/po/documentation.pot index 6743da07f45a23dab10323bd0da9a8fca7dfb81d..e7ace362c5236ee2a8e92012c0d0bf28bcb41c4f 100644 --- a/po/documentation.pot +++ b/po/documentation.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-12-20 22:54+0100\n" +"POT-Creation-Date: 2020-12-21 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,9 +18,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:679 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-b" -msgstr "" +msgstr "-b" #. type: Plain text #: en/blame-options.txt:4 @@ -30,9 +30,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:359 en/git-fsck.txt:38 en/git-rebase.txt:582 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--root" -msgstr "" +msgstr "--root" #. type: Plain text #: en/blame-options.txt:8 @@ -42,9 +42,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:9 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-stats" -msgstr "" +msgstr "--show-stats" #. type: Plain text #: en/blame-options.txt:11 @@ -78,9 +78,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-l" -msgstr "" +msgstr "-l" #. type: Plain text #: en/blame-options.txt:25 @@ -90,9 +90,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:26 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-t" -msgstr "" +msgstr "-t" #. type: Plain text #: en/blame-options.txt:28 @@ -126,9 +126,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--first-parent" -msgstr "" +msgstr "--first-parent" #. type: Plain text #: en/blame-options.txt:45 @@ -138,15 +138,15 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:72 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-p" -msgstr "" +msgstr "-p" #. type: Labeled list #: en/blame-options.txt:47 en/git-commit.txt:115 en/git-push.txt:176 en/git-worktree.txt:217 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--porcelain" -msgstr "" +msgstr "--porcelain" #. type: Plain text #: en/blame-options.txt:49 @@ -156,9 +156,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:50 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--line-porcelain" -msgstr "" +msgstr "--line-porcelain" #. type: Plain text #: en/blame-options.txt:54 @@ -168,9 +168,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:55 en/git-pack-objects.txt:138 en/git-svn.txt:373 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--incremental" -msgstr "" +msgstr "--incremental" #. type: Plain text #: en/blame-options.txt:58 @@ -216,9 +216,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:80 en/git-fsck.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]progress" -msgstr "" +msgstr "--[no-]progress" #. type: Plain text #: en/blame-options.txt:86 @@ -288,9 +288,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:139 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-h" -msgstr "" +msgstr "-h" #. type: Plain text #: en/blame-options.txt:140 @@ -300,9 +300,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:235 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-annotate[1]" -msgstr "" +msgstr "linkgit:git-annotate[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:3 @@ -312,9 +312,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-blame[1]" -msgstr "" +msgstr "linkgit:git-blame[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:6 @@ -324,9 +324,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-bugreport[1]" -msgstr "" +msgstr "linkgit:git-bugreport[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 @@ -336,9 +336,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-count-objects[1]" -msgstr "" +msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:12 @@ -348,9 +348,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-difftool[1]" -msgstr "" +msgstr "linkgit:git-difftool[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:15 @@ -360,9 +360,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fsck[1]" -msgstr "" +msgstr "linkgit:git-fsck[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20 @@ -372,9 +372,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-help[1]" -msgstr "" +msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 @@ -384,9 +384,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-instaweb[1]" -msgstr "" +msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 @@ -396,9 +396,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-tree[1]" -msgstr "" +msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 @@ -408,9 +408,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rerere[1]" -msgstr "" +msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 @@ -420,9 +420,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-branch[1]" -msgstr "" +msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 @@ -432,9 +432,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-verify-commit[1]" -msgstr "" +msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 @@ -444,9 +444,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-verify-tag[1]" -msgstr "" +msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 @@ -456,9 +456,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-whatchanged[1]" -msgstr "" +msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 @@ -468,9 +468,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:gitweb[1]" -msgstr "" +msgstr "linkgit:gitweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:45 @@ -480,9 +480,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-config[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:3 @@ -492,9 +492,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fast-export[1]" -msgstr "" +msgstr "linkgit:git-fast-export[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:6 @@ -504,9 +504,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fast-import[1]" -msgstr "" +msgstr "linkgit:git-fast-import[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:9 @@ -516,9 +516,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-filter-branch[1]" -msgstr "" +msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 @@ -528,9 +528,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mergetool[1]" -msgstr "" +msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:15 @@ -540,9 +540,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-pack-refs[1]" -msgstr "" +msgstr "linkgit:git-pack-refs[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:18 @@ -552,9 +552,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-prune[1]" -msgstr "" +msgstr "linkgit:git-prune[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:21 @@ -564,9 +564,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-reflog[1]" -msgstr "" +msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 @@ -576,9 +576,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-remote[1]" -msgstr "" +msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 @@ -588,9 +588,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-repack[1]" -msgstr "" +msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 @@ -600,9 +600,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-replace[1]" -msgstr "" +msgstr "linkgit:git-replace[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:33 @@ -612,9 +612,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-archimport[1]" -msgstr "" +msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 @@ -624,9 +624,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cvsexportcommit[1]" -msgstr "" +msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 @@ -636,9 +636,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cvsimport[1]" -msgstr "" +msgstr "linkgit:git-cvsimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:9 @@ -648,9 +648,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cvsserver[1]" -msgstr "" +msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 @@ -660,9 +660,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-imap-send[1]" -msgstr "" +msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 @@ -672,9 +672,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-p4[1]" -msgstr "" +msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 @@ -684,9 +684,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-quiltimport[1]" -msgstr "" +msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 @@ -696,9 +696,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-request-pull[1]" -msgstr "" +msgstr "linkgit:git-request-pull[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:24 @@ -708,9 +708,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-send-email[1]" -msgstr "" +msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 @@ -720,9 +720,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-svn[1]" -msgstr "" +msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 @@ -732,9 +732,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "linkgit:git-add[1]" -msgstr "" +msgstr "linkgit:git-add[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:3 @@ -744,9 +744,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-am[1]" -msgstr "" +msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 @@ -756,9 +756,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-archive[1]" -msgstr "" +msgstr "linkgit:git-archive[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:9 @@ -768,9 +768,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-bisect[1]" -msgstr "" +msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 @@ -780,9 +780,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-branch[1]" -msgstr "" +msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 @@ -792,9 +792,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-bundle[1]" -msgstr "" +msgstr "linkgit:git-bundle[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:18 @@ -804,9 +804,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-checkout[1]" -msgstr "" +msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 @@ -816,9 +816,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cherry-pick[1]" -msgstr "" +msgstr "linkgit:git-cherry-pick[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:24 @@ -828,9 +828,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-citool[1]" -msgstr "" +msgstr "linkgit:git-citool[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:27 @@ -840,9 +840,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-clean[1]" -msgstr "" +msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:30 @@ -852,9 +852,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-clone[1]" -msgstr "" +msgstr "linkgit:git-clone[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:33 @@ -864,9 +864,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-commit[1]" -msgstr "" +msgstr "linkgit:git-commit[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:36 @@ -876,9 +876,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-describe[1]" -msgstr "" +msgstr "linkgit:git-describe[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:39 @@ -888,9 +888,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff[1]" -msgstr "" +msgstr "linkgit:git-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:42 @@ -900,9 +900,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fetch[1]" -msgstr "" +msgstr "linkgit:git-fetch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:45 @@ -912,9 +912,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-format-patch[1]" -msgstr "" +msgstr "linkgit:git-format-patch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:48 @@ -924,9 +924,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-gc[1]" -msgstr "" +msgstr "linkgit:git-gc[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:51 @@ -936,9 +936,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-grep[1]" -msgstr "" +msgstr "linkgit:git-grep[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:54 @@ -948,9 +948,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-gui[1]" -msgstr "" +msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 @@ -960,9 +960,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:58 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-init[1]" -msgstr "" +msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 @@ -972,9 +972,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:61 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" -msgstr "" +msgstr "linkgit:git-log[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:63 @@ -984,9 +984,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-maintenance[1]" -msgstr "" +msgstr "linkgit:git-maintenance[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:66 @@ -996,9 +996,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:67 en/git-fmt-merge-msg.txt:75 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge[1]" -msgstr "" +msgstr "linkgit:git-merge[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:69 @@ -1008,9 +1008,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mv[1]" -msgstr "" +msgstr "linkgit:git-mv[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:72 @@ -1020,9 +1020,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:73 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-notes[1]" -msgstr "" +msgstr "linkgit:git-notes[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:75 @@ -1032,9 +1032,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:76 en/git-fetch.txt:300 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "linkgit:git-pull[1]" -msgstr "" +msgstr "linkgit:git-pull[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:78 @@ -1044,9 +1044,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-push[1]" -msgstr "" +msgstr "linkgit:git-push[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:81 @@ -1056,9 +1056,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:82 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-range-diff[1]" -msgstr "" +msgstr "linkgit:git-range-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:84 @@ -1068,9 +1068,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:85 en/git-svn.txt:1172 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rebase[1]" -msgstr "" +msgstr "linkgit:git-rebase[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:87 @@ -1080,9 +1080,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:88 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-reset[1]" -msgstr "" +msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 @@ -1092,9 +1092,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:91 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-restore[1]" -msgstr "" +msgstr "linkgit:git-restore[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:93 @@ -1104,9 +1104,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:243 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-revert[1]" -msgstr "" +msgstr "linkgit:git-revert[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:96 @@ -1116,9 +1116,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:97 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rm[1]" -msgstr "" +msgstr "linkgit:git-rm[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:99 @@ -1128,9 +1128,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-shortlog[1]" -msgstr "" +msgstr "linkgit:git-shortlog[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:102 @@ -1140,9 +1140,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:103 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show[1]" -msgstr "" +msgstr "linkgit:git-show[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:105 @@ -1152,9 +1152,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:106 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-sparse-checkout[1]" -msgstr "" +msgstr "linkgit:git-sparse-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:108 @@ -1164,9 +1164,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:109 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-stash[1]" -msgstr "" +msgstr "linkgit:git-stash[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:111 @@ -1176,9 +1176,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:112 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-status[1]" -msgstr "" +msgstr "linkgit:git-status[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:114 @@ -1188,9 +1188,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:115 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-submodule[1]" -msgstr "" +msgstr "linkgit:git-submodule[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:117 @@ -1200,9 +1200,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:118 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-switch[1]" -msgstr "" +msgstr "linkgit:git-switch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:120 @@ -1212,9 +1212,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:121 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-tag[1]" -msgstr "" +msgstr "linkgit:git-tag[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:123 @@ -1224,9 +1224,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:124 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-worktree[1]" -msgstr "" +msgstr "linkgit:git-worktree[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:126 @@ -1236,9 +1236,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:127 en/git-gui.txt:104 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:gitk[1]" -msgstr "" +msgstr "linkgit:gitk[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:129 @@ -1248,9 +1248,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cat-file[1]" -msgstr "" +msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 @@ -1260,9 +1260,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cherry[1]" -msgstr "" +msgstr "linkgit:git-cherry[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:6 @@ -1272,9 +1272,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff-files[1]" -msgstr "" +msgstr "linkgit:git-diff-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:9 @@ -1284,9 +1284,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff-index[1]" -msgstr "" +msgstr "linkgit:git-diff-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:12 @@ -1296,9 +1296,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff-tree[1]" -msgstr "" +msgstr "linkgit:git-diff-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:15 @@ -1308,9 +1308,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-for-each-ref[1]" -msgstr "" +msgstr "linkgit:git-for-each-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:18 @@ -1320,9 +1320,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-get-tar-commit-id[1]" -msgstr "" +msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:21 @@ -1332,9 +1332,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-ls-files[1]" -msgstr "" +msgstr "linkgit:git-ls-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 @@ -1344,9 +1344,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-ls-remote[1]" -msgstr "" +msgstr "linkgit:git-ls-remote[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:27 @@ -1356,9 +1356,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-ls-tree[1]" -msgstr "" +msgstr "linkgit:git-ls-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:30 @@ -1368,9 +1368,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-base[1]" -msgstr "" +msgstr "linkgit:git-merge-base[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:33 @@ -1380,9 +1380,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-name-rev[1]" -msgstr "" +msgstr "linkgit:git-name-rev[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 @@ -1392,9 +1392,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-pack-redundant[1]" -msgstr "" +msgstr "linkgit:git-pack-redundant[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 @@ -1404,9 +1404,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rev-list[1]" -msgstr "" +msgstr "linkgit:git-rev-list[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:42 @@ -1416,9 +1416,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rev-parse[1]" -msgstr "" +msgstr "linkgit:git-rev-parse[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:45 @@ -1428,9 +1428,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-index[1]" -msgstr "" +msgstr "linkgit:git-show-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:48 @@ -1440,9 +1440,9 @@ msgstr "" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:417 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-ref[1]" -msgstr "" +msgstr "linkgit:git-show-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:51 @@ -1452,9 +1452,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-unpack-file[1]" -msgstr "" +msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:54 @@ -1464,9 +1464,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-var[1]" -msgstr "" +msgstr "linkgit:git-var[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:57 @@ -1476,9 +1476,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:58 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-verify-pack[1]" -msgstr "" +msgstr "linkgit:git-verify-pack[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:60 @@ -1488,9 +1488,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-apply[1]" -msgstr "" +msgstr "linkgit:git-apply[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:3 @@ -1500,9 +1500,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-checkout-index[1]" -msgstr "" +msgstr "linkgit:git-checkout-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:6 @@ -1512,9 +1512,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-commit-graph[1]" -msgstr "" +msgstr "linkgit:git-commit-graph[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 @@ -1524,9 +1524,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-commit-tree[1]" -msgstr "" +msgstr "linkgit:git-commit-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:12 @@ -1536,9 +1536,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-hash-object[1]" -msgstr "" +msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 @@ -1548,9 +1548,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-index-pack[1]" -msgstr "" +msgstr "linkgit:git-index-pack[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:18 @@ -1560,9 +1560,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-file[1]" -msgstr "" +msgstr "linkgit:git-merge-file[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:21 @@ -1572,9 +1572,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-index[1]" -msgstr "" +msgstr "linkgit:git-merge-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:24 @@ -1584,9 +1584,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mktag[1]" -msgstr "" +msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 @@ -1596,9 +1596,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mktree[1]" -msgstr "" +msgstr "linkgit:git-mktree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:30 @@ -1608,9 +1608,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-multi-pack-index[1]" -msgstr "" +msgstr "linkgit:git-multi-pack-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:33 @@ -1620,9 +1620,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-pack-objects[1]" -msgstr "" +msgstr "linkgit:git-pack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:36 @@ -1632,9 +1632,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-prune-packed[1]" -msgstr "" +msgstr "linkgit:git-prune-packed[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:39 @@ -1644,9 +1644,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-read-tree[1]" -msgstr "" +msgstr "linkgit:git-read-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:42 @@ -1656,9 +1656,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-symbolic-ref[1]" -msgstr "" +msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:45 @@ -1668,9 +1668,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-unpack-objects[1]" -msgstr "" +msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:48 @@ -1680,9 +1680,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-index[1]" -msgstr "" +msgstr "linkgit:git-update-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:51 @@ -1692,9 +1692,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-ref[1]" -msgstr "" +msgstr "linkgit:git-update-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:54 @@ -1704,9 +1704,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-write-tree[1]" -msgstr "" +msgstr "linkgit:git-write-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:57 @@ -1716,9 +1716,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-attr[1]" -msgstr "" +msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 @@ -1728,9 +1728,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-ignore[1]" -msgstr "" +msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 @@ -1740,9 +1740,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-mailmap[1]" -msgstr "" +msgstr "linkgit:git-check-mailmap[1]" #. type: Plain text #: en/cmds-purehelpers.txt:9 @@ -1752,9 +1752,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-ref-format[1]" -msgstr "" +msgstr "linkgit:git-check-ref-format[1]" #. type: Plain text #: en/cmds-purehelpers.txt:12 @@ -1764,9 +1764,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-column[1]" -msgstr "" +msgstr "linkgit:git-column[1]" #. type: Plain text #: en/cmds-purehelpers.txt:15 @@ -1776,9 +1776,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-credential[1]" -msgstr "" +msgstr "linkgit:git-credential[1]" #. type: Plain text #: en/cmds-purehelpers.txt:18 @@ -1788,9 +1788,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-credential-cache[1]" -msgstr "" +msgstr "linkgit:git-credential-cache[1]" #. type: Plain text #: en/cmds-purehelpers.txt:21 @@ -1800,9 +1800,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-credential-store[1]" -msgstr "" +msgstr "linkgit:git-credential-store[1]" #. type: Plain text #: en/cmds-purehelpers.txt:24 @@ -1812,9 +1812,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fmt-merge-msg[1]" -msgstr "" +msgstr "linkgit:git-fmt-merge-msg[1]" #. type: Plain text #: en/cmds-purehelpers.txt:27 @@ -1824,9 +1824,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-interpret-trailers[1]" -msgstr "" +msgstr "linkgit:git-interpret-trailers[1]" #. type: Plain text #: en/cmds-purehelpers.txt:30 @@ -1836,9 +1836,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mailinfo[1]" -msgstr "" +msgstr "linkgit:git-mailinfo[1]" #. type: Plain text #: en/cmds-purehelpers.txt:33 @@ -1848,9 +1848,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mailsplit[1]" -msgstr "" +msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 @@ -1860,9 +1860,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-one-file[1]" -msgstr "" +msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 @@ -1872,9 +1872,9 @@ msgstr "" #. type: Plain text #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-patch-id[1]" -msgstr "" +msgstr "linkgit:git-patch-id[1]" #. type: Plain text #: en/cmds-purehelpers.txt:42 @@ -1884,9 +1884,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-sh-i18n[1]" -msgstr "" +msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 @@ -1896,9 +1896,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-sh-setup[1]" -msgstr "" +msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 @@ -1908,9 +1908,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-stripspace[1]" -msgstr "" +msgstr "linkgit:git-stripspace[1]" #. type: Plain text #: en/cmds-purehelpers.txt:51 @@ -1920,9 +1920,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-http-fetch[1]" -msgstr "" +msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 @@ -1932,9 +1932,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-http-push[1]" -msgstr "" +msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 @@ -1944,9 +1944,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-parse-remote[1]" -msgstr "" +msgstr "linkgit:git-parse-remote[1]" #. type: Plain text #: en/cmds-synchelpers.txt:9 @@ -1956,9 +1956,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-receive-pack[1]" -msgstr "" +msgstr "linkgit:git-receive-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 @@ -1968,9 +1968,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-shell[1]" -msgstr "" +msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 @@ -1980,9 +1980,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-upload-archive[1]" -msgstr "" +msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 @@ -1992,9 +1992,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-upload-pack[1]" -msgstr "" +msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:21 @@ -2004,9 +2004,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-daemon[1]" -msgstr "" +msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 @@ -2016,9 +2016,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fetch-pack[1]" -msgstr "" +msgstr "linkgit:git-fetch-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:6 @@ -2028,9 +2028,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-http-backend[1]" -msgstr "" +msgstr "linkgit:git-http-backend[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:9 @@ -2040,9 +2040,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-send-pack[1]" -msgstr "" +msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 @@ -2052,9 +2052,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-server-info[1]" -msgstr "" +msgstr "linkgit:git-update-server-info[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:15 @@ -2190,9 +2190,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:114 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`gitdir`" -msgstr "" +msgstr "`gitdir`" #. type: Plain text #: en/config.txt:119 @@ -2201,9 +2201,15 @@ msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If msgstr "" #. type: Plain text -#: en/config.txt:125 +#: en/config.txt:124 #, priority:100 -msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the .git file is." +msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the" +msgstr "" + +#. type: Block title +#: en/config.txt:124 +#, no-wrap, priority:100 +msgid "git file is." msgstr "" #. type: Plain text @@ -2250,9 +2256,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:148 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`onbranch`" -msgstr "" +msgstr "`onbranch`" #. type: Plain text #: en/config.txt:155 @@ -2430,118 +2436,118 @@ msgid "true" msgstr "" #. type: Plain text -#: en/config.txt:248 +#: en/config.txt:247 #, priority:100 msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true." msgstr "" #. type: Labeled list -#: en/config.txt:249 +#: en/config.txt:248 #, no-wrap, priority:100 msgid "false" msgstr "" #. type: Plain text -#: en/config.txt:252 +#: en/config.txt:250 #, priority:100 msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string." msgstr "" #. type: Plain text -#: en/config.txt:256 +#: en/config.txt:254 #, priority:100 msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)." msgstr "" #. type: Labeled list -#: en/config.txt:257 +#: en/config.txt:255 #, no-wrap, priority:100 msgid "integer" msgstr "" #. type: Plain text -#: en/config.txt:261 -#, priority:100 +#: en/config.txt:259 +#, ignore-ellipsis, priority:100 msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc." msgstr "" #. type: Labeled list -#: en/config.txt:262 en/diff-options.txt:361 en/git-for-each-ref.txt:175 -#, no-wrap, priority:280 +#: en/config.txt:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175 +#, ignore-same, no-wrap, priority:280 msgid "color" -msgstr "" +msgstr "color" #. type: Plain text -#: en/config.txt:266 +#: en/config.txt:264 #, priority:100 msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces." msgstr "" #. type: Plain text -#: en/config.txt:272 +#: en/config.txt:270 #, priority:100 msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`." msgstr "" #. type: Plain text -#: en/config.txt:277 +#: en/config.txt:275 #, priority:100 msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`." msgstr "" #. type: Plain text -#: en/config.txt:284 +#: en/config.txt:282 #, priority:100 msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." msgstr "" #. type: Plain text -#: en/config.txt:287 +#: en/config.txt:285 #, priority:100 msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely." msgstr "" #. type: Plain text -#: en/config.txt:296 +#: en/config.txt:294 #, priority:100 msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there." msgstr "" #. type: Labeled list -#: en/config.txt:297 +#: en/config.txt:295 #, no-wrap, priority:100 msgid "pathname" msgstr "" #. type: Plain text -#: en/config.txt:303 +#: en/config.txt:301 #, priority:100 msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory." msgstr "" #. type: Title ~ -#: en/config.txt:306 +#: en/config.txt:304 #, no-wrap, priority:100 msgid "Variables" msgstr "" #. type: Plain text -#: en/config.txt:311 +#: en/config.txt:309 #, priority:100 msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page." msgstr "" #. type: Plain text -#: en/config.txt:316 +#: en/config.txt:314 #, priority:100 msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation." msgstr "" #. type: Labeled list #: en/config/merge.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.conflictStyle" -msgstr "" +msgstr "merge.conflictStyle" #. type: Plain text #: en/config/merge.txt:8 @@ -2551,9 +2557,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:9 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.defaultToUpstream" -msgstr "" +msgstr "merge.defaultToUpstream" #. type: Plain text #: en/config/merge.txt:18 @@ -2563,9 +2569,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:19 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.ff" -msgstr "" +msgstr "merge.ff" #. type: Plain text #: en/config/merge.txt:28 @@ -2575,9 +2581,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:29 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.verifySignatures" -msgstr "" +msgstr "merge.verifySignatures" #. type: Plain text #: en/config/merge.txt:32 @@ -2587,9 +2593,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:35 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.renameLimit" -msgstr "" +msgstr "merge.renameLimit" #. type: Plain text #: en/config/merge.txt:40 @@ -2599,9 +2605,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:41 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.renames" -msgstr "" +msgstr "merge.renames" #. type: Plain text #: en/config/merge.txt:45 @@ -2611,9 +2617,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:46 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.directoryRenames" -msgstr "" +msgstr "merge.directoryRenames" #. type: Plain text #: en/config/merge.txt:58 @@ -2623,9 +2629,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:59 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.renormalize" -msgstr "" +msgstr "merge.renormalize" #. type: Plain text #: en/config/merge.txt:68 @@ -2635,9 +2641,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:69 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.stat" -msgstr "" +msgstr "merge.stat" #. type: Plain text #: en/config/merge.txt:72 @@ -2647,9 +2653,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:73 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.autoStash" -msgstr "" +msgstr "merge.autoStash" #. type: Plain text #: en/config/merge.txt:82 @@ -2659,9 +2665,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:83 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.tool" -msgstr "" +msgstr "merge.tool" #. type: Plain text #: en/config/merge.txt:88 @@ -2671,9 +2677,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:89 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.guitool" -msgstr "" +msgstr "merge.guitool" #. type: Plain text #: en/config/merge.txt:94 @@ -2683,9 +2689,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:97 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.verbosity" -msgstr "" +msgstr "merge.verbosity" #. type: Plain text #: en/config/merge.txt:104 @@ -2731,9 +2737,9 @@ msgstr "" #. type: Labeled list #: en/config/fmt-merge-msg.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.branchdesc" -msgstr "" +msgstr "merge.branchdesc" #. type: Plain text #: en/config/fmt-merge-msg.txt:5 @@ -2743,9 +2749,9 @@ msgstr "" #. type: Labeled list #: en/config/fmt-merge-msg.txt:6 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.log" -msgstr "" +msgstr "merge.log" #. type: Plain text #: en/config/fmt-merge-msg.txt:11 @@ -2755,9 +2761,9 @@ msgstr "" #. type: Labeled list #: en/config/fmt-merge-msg.txt:12 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.suppressDest" -msgstr "" +msgstr "merge.suppressDest" #. type: Plain text #: en/config/fmt-merge-msg.txt:18 @@ -2881,7 +2887,7 @@ msgstr "" #. type: Labeled list #: en/diff-format.txt:16 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]" msgstr "" @@ -2893,7 +2899,7 @@ msgstr "" #. type: Labeled list #: en/diff-format.txt:19 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "git-diff-files [<pattern>...]" msgstr "" @@ -3573,7 +3579,7 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:184 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it." msgstr "" @@ -3597,9 +3603,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:84 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-stat" -msgstr "" +msgstr "--no-stat" #. type: Plain text #: en/diff-options.txt:19 @@ -3609,15 +3615,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-u" -msgstr "" +msgstr "-u" #. type: Labeled list #: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:73 en/git-restore.txt:49 en/git-stash.txt:184 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--patch" -msgstr "" +msgstr "--patch" #. type: Plain text #: en/diff-options.txt:26 @@ -3633,15 +3639,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67 en/git-diff-tree.txt:77 en/git-format-patch.txt:121 en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-s" -msgstr "" +msgstr "-s" #. type: Labeled list #: en/diff-options.txt:31 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-patch" -msgstr "" +msgstr "--no-patch" #. type: Plain text #: en/diff-options.txt:34 @@ -3711,9 +3717,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--raw" -msgstr "" +msgstr "--raw" #. type: Plain text #: en/diff-options.txt:58 @@ -3734,9 +3740,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:72 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--patch-with-raw" -msgstr "" +msgstr "--patch-with-raw" #. type: Plain text #: en/diff-options.txt:74 @@ -3752,9 +3758,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:81 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--indent-heuristic" -msgstr "" +msgstr "--indent-heuristic" #. type: Plain text #: en/diff-options.txt:84 @@ -3764,9 +3770,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:85 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-indent-heuristic" -msgstr "" +msgstr "--no-indent-heuristic" #. type: Plain text #: en/diff-options.txt:87 @@ -3776,9 +3782,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:88 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--minimal" -msgstr "" +msgstr "--minimal" #. type: Plain text #: en/diff-options.txt:91 en/diff-options.txt:117 @@ -3788,9 +3794,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:92 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--patience" -msgstr "" +msgstr "--patience" #. type: Plain text #: en/diff-options.txt:94 @@ -3800,9 +3806,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:95 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--histogram" -msgstr "" +msgstr "--histogram" #. type: Plain text #: en/diff-options.txt:97 @@ -3848,9 +3854,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:112 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`default`, `myers`" -msgstr "" +msgstr "`default`, `myers`" #. type: Plain text #: en/diff-options.txt:114 @@ -3860,15 +3866,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:114 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`minimal`" -msgstr "" +msgstr "`minimal`" #. type: Labeled list #: en/diff-options.txt:117 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`patience`" -msgstr "" +msgstr "`patience`" #. type: Plain text #: en/diff-options.txt:119 @@ -3878,9 +3884,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:119 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`histogram`" -msgstr "" +msgstr "`histogram`" #. type: Plain text #: en/diff-options.txt:122 @@ -3902,7 +3908,7 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:142 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more." msgstr "" @@ -3914,9 +3920,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:146 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--compact-summary" -msgstr "" +msgstr "--compact-summary" #. type: Plain text #: en/diff-options.txt:153 @@ -3926,9 +3932,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:154 en/git-apply.txt:45 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--numstat" -msgstr "" +msgstr "--numstat" #. type: Plain text #: en/diff-options.txt:160 @@ -3938,9 +3944,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:161 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--shortstat" -msgstr "" +msgstr "--shortstat" #. type: Plain text #: en/diff-options.txt:165 @@ -3950,13 +3956,13 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:166 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "-X[<param1,param2,...>]" msgstr "" #. type: Labeled list #: en/diff-options.txt:167 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "--dirstat[=<param1,param2,...>]" msgstr "" @@ -3968,9 +3974,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:176 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`changes`" -msgstr "" +msgstr "`changes`" #. type: Plain text #: en/diff-options.txt:182 @@ -3980,9 +3986,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:182 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`lines`" -msgstr "" +msgstr "`lines`" #. type: Plain text #: en/diff-options.txt:190 @@ -3992,9 +3998,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:190 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`files`" -msgstr "" +msgstr "`files`" #. type: Plain text #: en/diff-options.txt:195 @@ -4004,9 +4010,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:195 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`cumulative`" -msgstr "" +msgstr "`cumulative`" #. type: Plain text #: en/diff-options.txt:200 @@ -4034,9 +4040,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:211 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--cumulative" -msgstr "" +msgstr "--cumulative" #. type: Plain text #: en/diff-options.txt:213 @@ -4046,21 +4052,21 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:214 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "--dirstat-by-file[=<param1,param2>...]" msgstr "" #. type: Plain text #: en/diff-options.txt:216 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "Synonym for --dirstat=files,param1,param2..." msgstr "" #. type: Labeled list #: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:131 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--summary" -msgstr "" +msgstr "--summary" #. type: Plain text #: en/diff-options.txt:220 @@ -4070,9 +4076,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:222 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--patch-with-stat" -msgstr "" +msgstr "--patch-with-stat" #. type: Plain text #: en/diff-options.txt:224 @@ -4082,9 +4088,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:124 en/git-config.txt:215 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-z" -msgstr "" +msgstr "-z" #. type: Plain text #: en/diff-options.txt:231 @@ -4114,9 +4120,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:244 en/git-config.txt:224 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--name-only" -msgstr "" +msgstr "--name-only" #. type: Plain text #: en/diff-options.txt:246 @@ -4126,9 +4132,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:247 en/git-ls-tree.txt:60 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--name-status" -msgstr "" +msgstr "--name-status" #. type: Plain text #: en/diff-options.txt:250 @@ -4170,9 +4176,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-color" -msgstr "" +msgstr "--no-color" #. type: Plain text #: en/diff-options.txt:274 @@ -4221,9 +4227,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:289 en/diff-options.txt:331 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "no" -msgstr "" +msgstr "no" #. type: Plain text #: en/diff-options.txt:291 @@ -4233,9 +4239,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:291 en/git-commit.txt:206 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "default" -msgstr "" +msgstr "default" #. type: Plain text #: en/diff-options.txt:294 @@ -4245,9 +4251,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:294 en/diff-options.txt:363 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "plain" -msgstr "" +msgstr "plain" #. type: Plain text #: en/diff-options.txt:301 @@ -4257,9 +4263,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:301 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "blocks" -msgstr "" +msgstr "blocks" #. type: Plain text #: en/diff-options.txt:306 @@ -4269,9 +4275,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:306 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "zebra" -msgstr "" +msgstr "zebra" #. type: Plain text #: en/diff-options.txt:311 @@ -4281,9 +4287,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:311 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "dimmed-zebra" -msgstr "" +msgstr "dimmed-zebra" #. type: Plain text #: en/diff-options.txt:316 @@ -4293,9 +4299,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:318 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-color-moved" -msgstr "" +msgstr "--no-color-moved" #. type: Plain text #: en/diff-options.txt:321 @@ -4335,9 +4341,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:333 en/merge-strategies.txt:61 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "ignore-space-at-eol" -msgstr "" +msgstr "ignore-space-at-eol" #. type: Plain text #: en/diff-options.txt:335 en/diff-options.txt:678 @@ -4347,9 +4353,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:335 en/merge-strategies.txt:59 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "ignore-space-change" -msgstr "" +msgstr "ignore-space-change" #. type: Plain text #: en/diff-options.txt:339 en/diff-options.txt:684 @@ -4359,9 +4365,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:339 en/merge-strategies.txt:60 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "ignore-all-space" -msgstr "" +msgstr "ignore-all-space" #. type: Plain text #: en/diff-options.txt:342 @@ -4371,9 +4377,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:342 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "allow-indentation-change" -msgstr "" +msgstr "allow-indentation-change" #. type: Plain text #: en/diff-options.txt:347 @@ -4383,9 +4389,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:349 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-color-moved-ws" -msgstr "" +msgstr "--no-color-moved-ws" #. type: Plain text #: en/diff-options.txt:353 @@ -4419,9 +4425,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:367 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "porcelain" -msgstr "" +msgstr "porcelain" #. type: Plain text #: en/diff-options.txt:374 @@ -4431,9 +4437,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:374 en/git-daemon.txt:131 en/git-submodule.txt:172 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "none" -msgstr "" +msgstr "none" #. type: Plain text #: en/diff-options.txt:376 @@ -4491,9 +4497,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:407 en/git-status.txt:143 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-renames" -msgstr "" +msgstr "--no-renames" #. type: Plain text #: en/diff-options.txt:410 @@ -4503,9 +4509,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:411 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--[no-]rename-empty" -msgstr "" +msgstr "--[no-]rename-empty" #. type: Plain text #: en/diff-options.txt:413 @@ -4515,9 +4521,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:415 en/git-apply.txt:58 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--check" -msgstr "" +msgstr "--check" #. type: Plain text #: en/diff-options.txt:424 @@ -4539,9 +4545,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:437 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--full-index" -msgstr "" +msgstr "--full-index" #. type: Plain text #: en/diff-options.txt:441 @@ -4551,9 +4557,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:442 en/git-apply.txt:160 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--binary" -msgstr "" +msgstr "--binary" #. type: Plain text #: en/diff-options.txt:445 @@ -4665,9 +4671,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:507 en/git-svn.txt:626 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--find-copies-harder" -msgstr "" +msgstr "--find-copies-harder" #. type: Plain text #: en/diff-options.txt:515 @@ -4683,9 +4689,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:517 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--irreversible-delete" -msgstr "" +msgstr "--irreversible-delete" #. type: Plain text #: en/diff-options.txt:525 @@ -4713,13 +4719,13 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:537 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" #. type: Plain text #: en/diff-options.txt:548 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected." msgstr "" @@ -4779,7 +4785,7 @@ msgstr "" #. type: delimited block - #: en/diff-options.txt:583 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "+ return frotz(nitfol, two->ptr, 1, 0);\n" "...\n" @@ -4824,9 +4830,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:604 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--pickaxe-all" -msgstr "" +msgstr "--pickaxe-all" #. type: Plain text #: en/diff-options.txt:608 @@ -4836,9 +4842,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:609 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--pickaxe-regex" -msgstr "" +msgstr "--pickaxe-regex" #. type: Plain text #: en/diff-options.txt:612 @@ -4914,9 +4920,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:659 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-relative" -msgstr "" +msgstr "--no-relative" #. type: Plain text #: en/diff-options.txt:668 @@ -4926,15 +4932,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:669 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:66 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-a" -msgstr "" +msgstr "-a" #. type: Labeled list #: en/diff-options.txt:670 en/git-grep.txt:103 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--text" -msgstr "" +msgstr "--text" #. type: Plain text #: en/diff-options.txt:672 @@ -4944,9 +4950,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:673 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-cr-at-eol" -msgstr "" +msgstr "--ignore-cr-at-eol" #. type: Plain text #: en/diff-options.txt:675 @@ -4956,27 +4962,27 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:676 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-space-at-eol" -msgstr "" +msgstr "--ignore-space-at-eol" #. type: Labeled list #: en/diff-options.txt:680 en/git-am.txt:107 en/git-apply.txt:182 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-space-change" -msgstr "" +msgstr "--ignore-space-change" #. type: Labeled list #: en/diff-options.txt:685 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-w" -msgstr "" +msgstr "-w" #. type: Labeled list #: en/diff-options.txt:686 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-all-space" -msgstr "" +msgstr "--ignore-all-space" #. type: Plain text #: en/diff-options.txt:690 @@ -4986,9 +4992,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:691 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-blank-lines" -msgstr "" +msgstr "--ignore-blank-lines" #. type: Plain text #: en/diff-options.txt:693 @@ -5034,9 +5040,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:706 en/git-grep.txt:265 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--function-context" -msgstr "" +msgstr "--function-context" #. type: Plain text #: en/diff-options.txt:711 @@ -5046,9 +5052,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:714 en/git-ls-remote.txt:48 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--exit-code" -msgstr "" +msgstr "--exit-code" #. type: Plain text #: en/diff-options.txt:718 @@ -5057,10 +5063,10 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w msgstr "" #. type: Labeled list -#: en/diff-options.txt:719 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:324 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:339 en/git-gc.txt:68 en/git-grep.txt:318 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:223 en/merge-options.txt:138 en/rev-list-options.txt:219 -#, no-wrap, priority:300 +#: en/diff-options.txt:719 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:324 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:339 en/git-gc.txt:68 en/git-grep.txt:318 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:223 en/merge-options.txt:138 en/rev-list-options.txt:219 +#, ignore-same, no-wrap, priority:300 msgid "--quiet" -msgstr "" +msgstr "--quiet" #. type: Plain text #: en/diff-options.txt:721 @@ -5070,9 +5076,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:724 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ext-diff" -msgstr "" +msgstr "--ext-diff" #. type: Plain text #: en/diff-options.txt:728 @@ -5082,9 +5088,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:729 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-ext-diff" -msgstr "" +msgstr "--no-ext-diff" #. type: Plain text #: en/diff-options.txt:731 @@ -5094,15 +5100,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:732 en/git-cat-file.txt:60 en/git-grep.txt:106 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--textconv" -msgstr "" +msgstr "--textconv" #. type: Labeled list #: en/diff-options.txt:733 en/git-grep.txt:109 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-textconv" -msgstr "" +msgstr "--no-textconv" #. type: Plain text #: en/diff-options.txt:742 @@ -5148,9 +5154,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:762 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-prefix" -msgstr "" +msgstr "--no-prefix" #. type: Plain text #: en/diff-options.txt:764 @@ -5172,9 +5178,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:768 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ita-invisible-in-index" -msgstr "" +msgstr "--ita-invisible-in-index" #. type: Plain text #: en/diff-options.txt:775 @@ -5190,9 +5196,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:67 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--all" -msgstr "" +msgstr "--all" #. type: Plain text #: en/fetch-options.txt:3 @@ -5202,9 +5208,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:5 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--append" -msgstr "" +msgstr "--append" #. type: Plain text #: en/fetch-options.txt:9 @@ -5262,9 +5268,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:31 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--unshallow" -msgstr "" +msgstr "--unshallow" #. type: Plain text #: en/fetch-options.txt:35 @@ -5280,9 +5286,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:39 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--update-shallow" -msgstr "" +msgstr "--update-shallow" #. type: Plain text #: en/fetch-options.txt:44 @@ -5322,9 +5328,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:327 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:213 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--dry-run" -msgstr "" +msgstr "--dry-run" #. type: Plain text #: en/fetch-options.txt:66 @@ -5334,9 +5340,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:68 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]write-fetch-head" -msgstr "" +msgstr "--[no-]write-fetch-head" #. type: Plain text #: en/fetch-options.txt:74 @@ -5346,15 +5352,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:76 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:154 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-f" -msgstr "" +msgstr "-f" #. type: Labeled list #: en/fetch-options.txt:77 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:333 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:155 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--force" -msgstr "" +msgstr "--force" #. type: Plain text #: en/fetch-options.txt:80 @@ -5384,15 +5390,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:116 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-k" -msgstr "" +msgstr "-k" #. type: Labeled list #: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--keep" -msgstr "" +msgstr "--keep" #. type: Plain text #: en/fetch-options.txt:92 @@ -5402,9 +5408,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:94 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--multiple" -msgstr "" +msgstr "--multiple" #. type: Plain text #: en/fetch-options.txt:97 @@ -5414,15 +5420,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:98 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]auto-maintenance" -msgstr "" +msgstr "--[no-]auto-maintenance" #. type: Labeled list #: en/fetch-options.txt:99 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]auto-gc" -msgstr "" +msgstr "--[no-]auto-gc" #. type: Plain text #: en/fetch-options.txt:103 @@ -5432,9 +5438,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:104 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]write-commit-graph" -msgstr "" +msgstr "--[no-]write-commit-graph" #. type: Plain text #: en/fetch-options.txt:107 @@ -5444,9 +5450,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:110 en/git-push.txt:153 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--prune" -msgstr "" +msgstr "--prune" #. type: Plain text #: en/fetch-options.txt:120 @@ -5468,9 +5474,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:125 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--prune-tags" -msgstr "" +msgstr "--prune-tags" #. type: Plain text #: en/fetch-options.txt:132 @@ -5480,15 +5486,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:138 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:169 en/git-format-patch.txt:101 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:212 en/merge-options.txt:83 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-n" -msgstr "" +msgstr "-n" #. type: Labeled list #: en/fetch-options.txt:140 en/git-clone.txt:251 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-tags" -msgstr "" +msgstr "--no-tags" #. type: Plain text #: en/fetch-options.txt:146 @@ -5510,9 +5516,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:159 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--tags" -msgstr "" +msgstr "--tags" #. type: Plain text #: en/fetch-options.txt:166 @@ -5534,9 +5540,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:181 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "-j" -msgstr "" +msgstr "-j" #. type: Labeled list #: en/fetch-options.txt:182 @@ -5564,9 +5570,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:194 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-recurse-submodules" -msgstr "" +msgstr "--no-recurse-submodules" #. type: Plain text #: en/fetch-options.txt:197 @@ -5576,9 +5582,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:199 en/git-branch.txt:227 en/git-push.txt:373 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--set-upstream" -msgstr "" +msgstr "--set-upstream" #. type: Plain text #: en/fetch-options.txt:205 @@ -5612,9 +5618,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:221 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--update-head-ok" -msgstr "" +msgstr "--update-head-ok" #. type: Plain text #: en/fetch-options.txt:228 @@ -5635,10 +5641,10 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac msgstr "" #. type: Labeled list -#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:323 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:338 en/git-grep.txt:317 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:222 en/merge-options.txt:137 -#, no-wrap, priority:300 +#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:323 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:338 en/git-grep.txt:317 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:222 en/merge-options.txt:137 +#, ignore-same, no-wrap, priority:300 msgid "-q" -msgstr "" +msgstr "-q" #. type: Plain text #: en/fetch-options.txt:242 @@ -5648,15 +5654,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:308 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:391 en/git-read-tree.txt:63 en/git-rebase.txt:401 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:226 en/merge-options.txt:141 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-v" -msgstr "" +msgstr "-v" #. type: Labeled list #: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:309 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:392 en/git-rebase.txt:402 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:227 en/merge-options.txt:142 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--verbose" -msgstr "" +msgstr "--verbose" #. type: Plain text #: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144 @@ -5666,9 +5672,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:366 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--progress" -msgstr "" +msgstr "--progress" #. type: Plain text #: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:400 @@ -5696,9 +5702,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:263 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--show-forced-updates" -msgstr "" +msgstr "--show-forced-updates" #. type: Plain text #: en/fetch-options.txt:268 @@ -5708,9 +5714,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:269 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--no-show-forced-updates" -msgstr "" +msgstr "--no-show-forced-updates" #. type: Plain text #: en/fetch-options.txt:275 @@ -5720,15 +5726,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:276 en/git-push.txt:422 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "-4" -msgstr "" +msgstr "-4" #. type: Labeled list #: en/fetch-options.txt:277 en/git-push.txt:423 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--ipv4" -msgstr "" +msgstr "--ipv4" #. type: Plain text #: en/fetch-options.txt:279 en/git-push.txt:425 @@ -5738,15 +5744,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:280 en/git-push.txt:426 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "-6" -msgstr "" +msgstr "-6" #. type: Labeled list #: en/fetch-options.txt:281 en/git-push.txt:427 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--ipv6" -msgstr "" +msgstr "--ipv6" #. type: Plain text #: en/fetch-options.txt:282 en/git-push.txt:429 @@ -5756,12 +5762,12 @@ msgstr "" #. type: Title = #: en/git-add.txt:2 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "git-add(1)" -msgstr "" +msgstr "git-add(1)" #. type: Title - -#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 +#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5773,14 +5779,14 @@ msgid "git-add - Add file contents to the index" msgstr "" #. type: Title - -#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 +#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" #. type: Plain text #: en/git-add.txt:16 -#, no-wrap, priority:300 +#, ignore-ellipsis, no-wrap, priority:300 msgid "" "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n" "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n" @@ -5790,7 +5796,7 @@ msgid "" msgstr "" #. type: Title - -#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13 +#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -5832,14 +5838,14 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "" #. type: Title - -#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:65 en/git-config.txt:75 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:116 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:89 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:152 en/git-write-tree.txt:29 +#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:65 en/git-config.txt:75 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:116 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:89 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:152 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" #. type: Labeled list #: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:355 en/git-grep.txt:330 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152 -#, no-wrap, priority:300 +#, ignore-ellipsis, no-wrap, priority:300 msgid "<pathspec>..." msgstr "" @@ -5869,15 +5875,15 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:255 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-i" -msgstr "" +msgstr "-i" #. type: Labeled list #: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--interactive" -msgstr "" +msgstr "--interactive" #. type: Plain text #: en/git-add.txt:88 @@ -5899,15 +5905,15 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:214 en/git-config.txt:261 en/git-grep.txt:297 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-e" -msgstr "" +msgstr "-e" #. type: Labeled list #: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:215 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--edit" -msgstr "" +msgstr "--edit" #. type: Plain text #: en/git-add.txt:105 @@ -5923,9 +5929,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:113 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--update" -msgstr "" +msgstr "--update" #. type: Plain text #: en/git-add.txt:117 @@ -5947,9 +5953,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:125 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-ignore-removal" -msgstr "" +msgstr "--no-ignore-removal" #. type: Plain text #: en/git-add.txt:130 @@ -5965,15 +5971,15 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:136 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-all" -msgstr "" +msgstr "--no-all" #. type: Labeled list #: en/git-add.txt:137 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--ignore-removal" -msgstr "" +msgstr "--ignore-removal" #. type: Plain text #: en/git-add.txt:142 @@ -5983,7 +5989,7 @@ msgstr "" #. type: Plain text #: en/git-add.txt:146 -#, priority:300 +#, ignore-ellipsis, priority:300 msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files." msgstr "" @@ -5995,9 +6001,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:148 en/git-apply.txt:77 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--intent-to-add" -msgstr "" +msgstr "--intent-to-add" #. type: Plain text #: en/git-add.txt:154 @@ -6007,9 +6013,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:155 en/git-update-index.txt:55 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--refresh" -msgstr "" +msgstr "--refresh" #. type: Plain text #: en/git-add.txt:158 @@ -6019,9 +6025,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:159 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--ignore-errors" -msgstr "" +msgstr "--ignore-errors" #. type: Plain text #: en/git-add.txt:165 @@ -6031,9 +6037,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:200 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--ignore-missing" -msgstr "" +msgstr "--ignore-missing" #. type: Plain text #: en/git-add.txt:171 @@ -6043,9 +6049,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:172 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-warn-embedded-repo" -msgstr "" +msgstr "--no-warn-embedded-repo" #. type: Plain text #: en/git-add.txt:178 @@ -6055,9 +6061,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:179 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--renormalize" -msgstr "" +msgstr "--renormalize" #. type: Plain text #: en/git-add.txt:185 @@ -6091,9 +6097,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:284 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:86 en/git-stash.txt:208 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--pathspec-file-nul" -msgstr "" +msgstr "--pathspec-file-nul" #. type: Plain text #: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:288 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:90 en/git-stash.txt:214 @@ -6114,7 +6120,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "" #. type: Title - -#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:316 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:352 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:677 en/git-grep.txt:338 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:156 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:594 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-parse.txt:442 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:394 +#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:316 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:352 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:677 en/git-grep.txt:338 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:256 en/git-log.txt:156 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:594 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-parse.txt:442 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:394 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6224,9 +6230,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:281 en/git-update-ref.txt:102 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "update" -msgstr "" +msgstr "update" #. type: Plain text #: en/git-add.txt:290 @@ -6337,9 +6343,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:350 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "diff" -msgstr "" +msgstr "diff" #. type: Plain text #: en/git-add.txt:354 @@ -6475,27 +6481,27 @@ msgstr "" #. type: Plain text #: en/git-add.txt:435 -#, priority:300 +#, ignore-same, priority:300 msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" -msgstr "" +msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" #. type: Title - -#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:354 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:508 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:148 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:726 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:275 en/git-ls-files.txt:250 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:467 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:420 en/git-write-tree.txt:41 en/gitglossary.txt:26 +#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:354 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:508 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:148 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:726 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:275 en/git-ls-files.txt:250 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:467 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:420 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "" #. type: Plain text -#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:355 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:509 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:149 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:727 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:276 en/git-ls-files.txt:251 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:468 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:421 en/git-write-tree.txt:42 en/gitglossary.txt:27 +#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:355 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:509 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:149 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:727 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:276 en/git-ls-files.txt:251 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:468 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:421 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" #. type: Title = #: en/git-am.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-am(1)" -msgstr "" +msgstr "git-am(1)" #. type: Plain text #: en/git-am.txt:7 @@ -6505,7 +6511,7 @@ msgstr "" #. type: Plain text #: en/git-am.txt:20 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n" "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" @@ -6525,7 +6531,7 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:29 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "(<mbox>|<Maildir>)..." msgstr "" @@ -6537,9 +6543,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--signoff" -msgstr "" +msgstr "--signoff" #. type: Plain text #: en/git-am.txt:39 en/git-format-patch.txt:126 @@ -6555,9 +6561,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:44 en/git-quiltimport.txt:59 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-non-patch" -msgstr "" +msgstr "--keep-non-patch" #. type: Plain text #: en/git-am.txt:46 en/git-quiltimport.txt:61 @@ -6567,9 +6573,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:47 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]keep-cr" -msgstr "" +msgstr "--[no-]keep-cr" #. type: Plain text #: en/git-am.txt:52 @@ -6579,15 +6585,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:117 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "-c" -msgstr "" +msgstr "-c" #. type: Labeled list #: en/git-am.txt:54 en/git-mailinfo.txt:74 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--scissors" -msgstr "" +msgstr "--scissors" #. type: Plain text #: en/git-am.txt:58 @@ -6597,9 +6603,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:59 en/git-mailinfo.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-scissors" -msgstr "" +msgstr "--no-scissors" #. type: Plain text #: en/git-am.txt:61 @@ -6609,15 +6615,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:137 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "-m" -msgstr "" +msgstr "-m" #. type: Labeled list #: en/git-am.txt:63 en/git-mailinfo.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--message-id" -msgstr "" +msgstr "--message-id" #. type: Plain text #: en/git-am.txt:68 @@ -6627,9 +6633,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:69 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-message-id" -msgstr "" +msgstr "--no-message-id" #. type: Plain text #: en/git-am.txt:72 @@ -6645,9 +6651,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:78 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--utf8" -msgstr "" +msgstr "--utf8" #. type: Plain text #: en/git-am.txt:84 @@ -6665,9 +6671,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:88 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-utf8" -msgstr "" +msgstr "--no-utf8" #. type: Plain text #: en/git-am.txt:91 @@ -6677,21 +6683,21 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:92 en/git-apply.txt:85 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-3" -msgstr "" +msgstr "-3" #. type: Labeled list #: en/git-am.txt:93 en/git-apply.txt:86 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--3way" -msgstr "" +msgstr "--3way" #. type: Labeled list #: en/git-am.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-3way" -msgstr "" +msgstr "--no-3way" #. type: Plain text #: en/git-am.txt:101 @@ -6701,15 +6707,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:383 en/git-revert.txt:115 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--rerere-autoupdate" -msgstr "" +msgstr "--rerere-autoupdate" #. type: Labeled list #: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:384 en/git-revert.txt:116 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-rerere-autoupdate" -msgstr "" +msgstr "--no-rerere-autoupdate" #. type: Plain text #: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:387 en/git-revert.txt:119 @@ -6719,9 +6725,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:462 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-whitespace" -msgstr "" +msgstr "--ignore-whitespace" #. type: Labeled list #: en/git-am.txt:109 en/git-rebase.txt:478 @@ -6761,9 +6767,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:115 en/git-apply.txt:108 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reject" -msgstr "" +msgstr "--reject" #. type: Plain text #: en/git-am.txt:119 @@ -6773,9 +6779,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:120 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--patch-format" -msgstr "" +msgstr "--patch-format" #. type: Plain text #: en/git-am.txt:126 @@ -6791,9 +6797,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:131 en/git-rebase.txt:485 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--committer-date-is-author-date" -msgstr "" +msgstr "--committer-date-is-author-date" #. type: Plain text #: en/git-am.txt:137 @@ -6803,9 +6809,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:138 en/git-rebase.txt:490 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-date" -msgstr "" +msgstr "--ignore-date" #. type: Plain text #: en/git-am.txt:144 @@ -6815,9 +6821,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:145 en/git-rebase.txt:336 en/sequencer.txt:6 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--skip" -msgstr "" +msgstr "--skip" #. type: Plain text #: en/git-am.txt:148 @@ -6839,9 +6845,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:345 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-gpg-sign" -msgstr "" +msgstr "--no-gpg-sign" #. type: Plain text #: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:351 en/git-rebase.txt:396 en/git-revert.txt:99 @@ -6851,21 +6857,21 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247 en/sequencer.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--continue" -msgstr "" +msgstr "--continue" #. type: Labeled list #: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-r" -msgstr "" +msgstr "-r" #. type: Labeled list #: en/git-am.txt:160 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--resolved" -msgstr "" +msgstr "--resolved" #. type: Plain text #: en/git-am.txt:167 @@ -6887,9 +6893,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--abort" -msgstr "" +msgstr "--abort" #. type: Plain text #: en/git-am.txt:177 @@ -6899,9 +6905,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257 en/sequencer.txt:10 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--quit" -msgstr "" +msgstr "--quit" #. type: Plain text #: en/git-am.txt:181 @@ -7019,15 +7025,15 @@ msgstr "" #. type: Plain text #: en/git-am.txt:247 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-apply[1]." -msgstr "" +msgstr "linkgit:git-apply[1]." #. type: Title = #: en/git-annotate.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-annotate(1)" -msgstr "" +msgstr "git-annotate(1)" #. type: Plain text #: en/git-annotate.txt:7 @@ -7055,9 +7061,9 @@ msgstr "" #. type: Title = #: en/git-apply.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-apply(1)" -msgstr "" +msgstr "git-apply(1)" #. type: Plain text #: en/git-apply.txt:7 @@ -7067,7 +7073,7 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:20 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n" "\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n" @@ -7093,7 +7099,7 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:37 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<patch>..." msgstr "" @@ -7105,9 +7111,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:82 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--stat" -msgstr "" +msgstr "--stat" #. type: Plain text #: en/git-apply.txt:44 @@ -7135,9 +7141,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--index" -msgstr "" +msgstr "--index" #. type: Plain text #: en/git-apply.txt:71 @@ -7147,9 +7153,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--cached" -msgstr "" +msgstr "--cached" #. type: Plain text #: en/git-apply.txt:76 @@ -7189,9 +7195,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:105 en/rev-list-options.txt:814 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--reverse" -msgstr "" +msgstr "--reverse" #. type: Plain text #: en/git-apply.txt:107 @@ -7225,9 +7231,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:135 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unidiff-zero" -msgstr "" +msgstr "--unidiff-zero" #. type: Plain text #: en/git-apply.txt:141 @@ -7243,9 +7249,9 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:145 en/git-rebase.txt:263 en/git-rebase.txt:632 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--apply" -msgstr "" +msgstr "--apply" #. type: Plain text #: en/git-apply.txt:151 @@ -7255,9 +7261,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:152 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-add" -msgstr "" +msgstr "--no-add" #. type: Plain text #: en/git-apply.txt:158 @@ -7267,9 +7273,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:159 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--allow-binary-replacement" -msgstr "" +msgstr "--allow-binary-replacement" #. type: Plain text #: en/git-apply.txt:165 @@ -7369,9 +7375,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:217 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--inaccurate-eof" -msgstr "" +msgstr "--inaccurate-eof" #. type: Plain text #: en/git-apply.txt:223 @@ -7387,9 +7393,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:230 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--recount" -msgstr "" +msgstr "--recount" #. type: Plain text #: en/git-apply.txt:234 @@ -7417,9 +7423,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:243 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unsafe-paths" -msgstr "" +msgstr "--unsafe-paths" #. type: Plain text #: en/git-apply.txt:248 @@ -7441,9 +7447,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:256 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "apply.ignoreWhitespace" -msgstr "" +msgstr "apply.ignoreWhitespace" #. type: Plain text #: en/git-apply.txt:260 @@ -7453,9 +7459,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:260 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "apply.whitespace" -msgstr "" +msgstr "apply.whitespace" #. type: Plain text #: en/git-apply.txt:263 @@ -7489,15 +7495,15 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:282 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-am[1]." -msgstr "" +msgstr "linkgit:git-am[1]." #. type: Title = #: en/git-archimport.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-archimport(1)" -msgstr "" +msgstr "git-archimport(1)" #. type: Plain text #: en/git-archimport.txt:7 @@ -7507,7 +7513,7 @@ msgstr "" #. type: Plain text #: en/git-archimport.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n" " <archive/branch>[:<git-branch>] ...\n" @@ -7605,9 +7611,9 @@ msgstr "" #. type: Labeled list #: en/git-archimport.txt:86 en/git-commit.txt:262 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-o" -msgstr "" +msgstr "-o" #. type: Plain text #: en/git-archimport.txt:93 @@ -7659,9 +7665,9 @@ msgstr "" #. type: Title = #: en/git-archive.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-archive(1)" -msgstr "" +msgstr "git-archive(1)" #. type: Plain text #: en/git-archive.txt:7 @@ -7671,7 +7677,7 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:16 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n" "\t [-o <file> | --output=<file>] [--worktree-attributes]\n" @@ -7705,9 +7711,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--list" -msgstr "" +msgstr "--list" #. type: Plain text #: en/git-archive.txt:46 @@ -7759,9 +7765,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--worktree-attributes" -msgstr "" +msgstr "--worktree-attributes" #. type: Plain text #: en/git-archive.txt:67 @@ -7795,9 +7801,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--exec=<git-upload-archive>" -msgstr "" +msgstr "--exec=<git-upload-archive>" #. type: Plain text #: en/git-archive.txt:82 @@ -7843,9 +7849,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-0" -msgstr "" +msgstr "-0" #. type: Plain text #: en/git-archive.txt:98 @@ -7855,9 +7861,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:98 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-9" -msgstr "" +msgstr "-9" #. type: Plain text #: en/git-archive.txt:101 @@ -8041,15 +8047,15 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:200 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitattributes[5]" -msgstr "" +msgstr "linkgit:gitattributes[5]" #. type: Title = #: en/git-bisect.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-bisect(1)" -msgstr "" +msgstr "git-bisect(1)" #. type: Plain text #: en/git-bisect.txt:7 @@ -8071,7 +8077,7 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:31 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n" "\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n" @@ -8266,7 +8272,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:158 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "git bisect new [<rev>...]\n" msgstr "" @@ -8296,7 +8302,7 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:175 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using" msgstr "" @@ -8576,9 +8582,9 @@ msgstr "" #. type: Labeled list #: en/git-bisect.txt:357 en/git-clone.txt:145 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-checkout" -msgstr "" +msgstr "--no-checkout" #. type: Plain text #: en/git-bisect.txt:362 @@ -8754,7 +8760,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:474 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n" "$ git bisect run sh -c '\n" @@ -8828,9 +8834,9 @@ msgstr "" #. type: Title = #: en/git-blame.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-blame(1)" -msgstr "" +msgstr "git-blame(1)" #. type: Plain text #: en/git-blame.txt:7 @@ -8896,9 +8902,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:56 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--score-debug" -msgstr "" +msgstr "--score-debug" #. type: Plain text #: en/git-blame.txt:64 @@ -8908,9 +8914,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-name" -msgstr "" +msgstr "--show-name" #. type: Plain text #: en/git-blame.txt:70 @@ -8920,9 +8926,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:72 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-number" -msgstr "" +msgstr "--show-number" #. type: Plain text #: en/git-blame.txt:74 @@ -8938,9 +8944,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-email" -msgstr "" +msgstr "--show-email" #. type: Plain text #: en/git-blame.txt:83 @@ -9210,9 +9216,9 @@ msgstr "" #. type: Title = #: en/git-branch.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-branch(1)" -msgstr "" +msgstr "git-branch(1)" #. type: Plain text #: en/git-branch.txt:7 @@ -9222,7 +9228,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:26 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" "\t[-v [--abbrev=<n> | --no-abbrev]]\n" @@ -9267,7 +9273,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:61 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -9309,15 +9315,15 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:97 en/git-checkout.txt:204 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:180 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "-d" -msgstr "" +msgstr "-d" #. type: Labeled list #: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--delete" -msgstr "" +msgstr "--delete" #. type: Plain text #: en/git-branch.txt:102 @@ -9333,9 +9339,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:106 en/git-tag.txt:190 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--create-reflog" -msgstr "" +msgstr "--create-reflog" #. type: Plain text #: en/git-branch.txt:115 @@ -9351,9 +9357,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:126 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--move" -msgstr "" +msgstr "--move" #. type: Plain text #: en/git-branch.txt:128 @@ -9375,9 +9381,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:133 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--copy" -msgstr "" +msgstr "--copy" #. type: Plain text #: en/git-branch.txt:135 @@ -9411,9 +9417,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ignore-case" -msgstr "" +msgstr "--ignore-case" #. type: Plain text #: en/git-branch.txt:152 @@ -9429,9 +9435,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-column" -msgstr "" +msgstr "--no-column" #. type: Plain text #: en/git-branch.txt:158 @@ -9447,9 +9453,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:162 en/git-show-branch.txt:44 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--remotes" -msgstr "" +msgstr "--remotes" #. type: Plain text #: en/git-branch.txt:165 @@ -9465,15 +9471,15 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:176 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)." msgstr "" #. type: Labeled list #: en/git-branch.txt:177 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--show-current" -msgstr "" +msgstr "--show-current" #. type: Plain text #: en/git-branch.txt:180 @@ -9483,9 +9489,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:182 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "-vv" -msgstr "" +msgstr "-vv" #. type: Plain text #: en/git-branch.txt:191 @@ -9507,9 +9513,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:204 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-abbrev" -msgstr "" +msgstr "--no-abbrev" #. type: Plain text #: en/git-branch.txt:206 @@ -9519,9 +9525,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--track" -msgstr "" +msgstr "--track" #. type: Plain text #: en/git-branch.txt:216 @@ -9537,9 +9543,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-track" -msgstr "" +msgstr "--no-track" #. type: Plain text #: en/git-branch.txt:226 @@ -9573,9 +9579,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:237 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--unset-upstream" -msgstr "" +msgstr "--unset-upstream" #. type: Plain text #: en/git-branch.txt:240 @@ -9585,9 +9591,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:241 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--edit-description" -msgstr "" +msgstr "--edit-description" #. type: Plain text #: en/git-branch.txt:246 @@ -9699,7 +9705,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:291 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]." msgstr "" @@ -9741,7 +9747,7 @@ msgstr "" #. type: delimited block - #: en/git-branch.txt:317 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n" "$ cd my2.6\n" @@ -9763,7 +9769,7 @@ msgstr "" #. type: delimited block - #: en/git-branch.txt:329 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git clone git://git.kernel.org/.../git.git my.git\n" "$ cd my.git\n" @@ -9865,9 +9871,9 @@ msgstr "" #. type: Title = #: en/git-bugreport.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-bugreport(1)" -msgstr "" +msgstr "git-bugreport(1)" #. type: Plain text #: en/git-bugreport.txt:7 @@ -9991,9 +9997,9 @@ msgstr "" #. type: Title = #: en/git-bundle.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-bundle(1)" -msgstr "" +msgstr "git-bundle(1)" #. type: Plain text #: en/git-bundle.txt:7 @@ -10003,7 +10009,7 @@ msgstr "" #. type: Plain text #: en/git-bundle.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]\n" "\t\t [--version=<version>] <file> <git-rev-list-args>\n" @@ -10092,7 +10098,7 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:77 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "[<refname>...]" msgstr "" @@ -10104,9 +10110,9 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:90 en/git-pack-objects.txt:157 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--all-progress" -msgstr "" +msgstr "--all-progress" #. type: Plain text #: en/git-bundle.txt:100 en/git-pack-objects.txt:167 @@ -10116,9 +10122,9 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:101 en/git-pack-objects.txt:168 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--all-progress-implied" -msgstr "" +msgstr "--all-progress-implied" #. type: Plain text #: en/git-bundle.txt:105 en/git-pack-objects.txt:172 @@ -10337,9 +10343,9 @@ msgstr "" #. type: Title = #: en/git-cat-file.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cat-file(1)" -msgstr "" +msgstr "git-cat-file(1)" #. type: Plain text #: en/git-cat-file.txt:7 @@ -10423,9 +10429,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--filters" -msgstr "" +msgstr "--filters" #. type: Plain text #: en/git-cat-file.txt:71 @@ -10447,9 +10453,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:77 en/git-mktree.txt:32 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--batch" -msgstr "" +msgstr "--batch" #. type: Labeled list #: en/git-cat-file.txt:78 @@ -10465,9 +10471,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:85 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--batch-check" -msgstr "" +msgstr "--batch-check" #. type: Labeled list #: en/git-cat-file.txt:86 @@ -10483,9 +10489,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:93 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--batch-all-objects" -msgstr "" +msgstr "--batch-all-objects" #. type: Plain text #: en/git-cat-file.txt:99 @@ -10495,9 +10501,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--buffer" -msgstr "" +msgstr "--buffer" #. type: Plain text #: en/git-cat-file.txt:106 @@ -10507,9 +10513,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:107 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unordered" -msgstr "" +msgstr "--unordered" #. type: Plain text #: en/git-cat-file.txt:116 @@ -10519,9 +10525,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:117 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--allow-unknown-type" -msgstr "" +msgstr "--allow-unknown-type" #. type: Plain text #: en/git-cat-file.txt:119 @@ -10531,9 +10537,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:120 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--follow-symlinks" -msgstr "" +msgstr "--follow-symlinks" #. type: Plain text #: en/git-cat-file.txt:129 @@ -10678,9 +10684,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:202 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`objectname`" -msgstr "" +msgstr "`objectname`" #. type: Plain text #: en/git-cat-file.txt:204 @@ -10690,9 +10696,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:205 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`objecttype`" -msgstr "" +msgstr "`objecttype`" #. type: Plain text #: en/git-cat-file.txt:207 @@ -10702,9 +10708,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:208 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`objectsize`" -msgstr "" +msgstr "`objectsize`" #. type: Plain text #: en/git-cat-file.txt:211 @@ -10726,9 +10732,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:216 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`deltabase`" -msgstr "" +msgstr "`deltabase`" #. type: Plain text #: en/git-cat-file.txt:220 @@ -10738,9 +10744,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:221 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`rest`" -msgstr "" +msgstr "`rest`" #. type: Plain text #: en/git-cat-file.txt:227 @@ -10904,9 +10910,9 @@ msgstr "" #. type: Title = #: en/git-check-attr.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-attr(1)" -msgstr "" +msgstr "git-check-attr(1)" #. type: Plain text #: en/git-check-attr.txt:7 @@ -10916,7 +10922,7 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n" "'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n" @@ -10948,9 +10954,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:51 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--stdin" -msgstr "" +msgstr "--stdin" #. type: Plain text #: en/git-check-attr.txt:33 en/git-check-ignore.txt:46 @@ -10996,9 +11002,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:60 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'unspecified'" -msgstr "" +msgstr "'unspecified'" #. type: Plain text #: en/git-check-attr.txt:61 @@ -11008,9 +11014,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:61 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'unset'" -msgstr "" +msgstr "'unset'" #. type: Plain text #: en/git-check-attr.txt:62 @@ -11020,9 +11026,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:62 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'set'" -msgstr "" +msgstr "'set'" #. type: Plain text #: en/git-check-attr.txt:63 @@ -11139,15 +11145,15 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:117 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitattributes[5]." -msgstr "" +msgstr "linkgit:gitattributes[5]." #. type: Title = #: en/git-check-ignore.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-ignore(1)" -msgstr "" +msgstr "git-check-ignore(1)" #. type: Plain text #: en/git-check-ignore.txt:7 @@ -11157,7 +11163,7 @@ msgstr "" #. type: Plain text #: en/git-check-ignore.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git check-ignore' [<options>] <pathname>...\n" "'git check-ignore' [<options>] --stdin\n" @@ -11225,9 +11231,9 @@ msgstr "" #. type: Labeled list #: en/git-check-ignore.txt:58 en/git-grep.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-index" -msgstr "" +msgstr "--no-index" #. type: Plain text #: en/git-check-ignore.txt:64 @@ -11321,15 +11327,15 @@ msgstr "" #. type: Plain text #: en/git-check-ignore.txt:123 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]" -msgstr "" +msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]" #. type: Title = #: en/git-check-mailmap.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-mailmap(1)" -msgstr "" +msgstr "git-check-mailmap(1)" #. type: Plain text #: en/git-check-mailmap.txt:7 @@ -11339,7 +11345,7 @@ msgstr "" #. type: Plain text #: en/git-check-mailmap.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git check-mailmap' [<options>] <contact>...\n" msgstr "" @@ -11363,9 +11369,9 @@ msgstr "" #. type: Title = #: en/git-checkout-index.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-checkout-index(1)" -msgstr "" +msgstr "git-checkout-index(1)" #. type: Plain text #: en/git-checkout-index.txt:7 @@ -11375,7 +11381,7 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\n" "\t\t [--stage=<number>|all]\n" @@ -11416,9 +11422,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout-index.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-create" -msgstr "" +msgstr "--no-create" #. type: Plain text #: en/git-checkout-index.txt:47 @@ -11452,9 +11458,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout-index.txt:57 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--temp" -msgstr "" +msgstr "--temp" #. type: Plain text #: en/git-checkout-index.txt:61 @@ -11638,9 +11644,9 @@ msgstr "" #. type: Title = #: en/git-checkout.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-checkout(1)" -msgstr "" +msgstr "git-checkout(1)" #. type: Plain text #: en/git-checkout.txt:7 @@ -11650,7 +11656,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:18 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git checkout' [-q] [-f] [-m] [<branch>]\n" "'git checkout' [-q] [-f] [-m] --detach [<branch>]\n" @@ -11761,7 +11767,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:82 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..." msgstr "" @@ -11785,7 +11791,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:99 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]" msgstr "" @@ -11803,9 +11809,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-progress" -msgstr "" +msgstr "--no-progress" #. type: Plain text #: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153 @@ -11827,15 +11833,15 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ours" -msgstr "" +msgstr "--ours" #. type: Labeled list #: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--theirs" -msgstr "" +msgstr "--theirs" #. type: Plain text #: en/git-checkout.txt:131 @@ -11899,15 +11905,15 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:176 en/git-switch.txt:87 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--guess" -msgstr "" +msgstr "--guess" #. type: Labeled list #: en/git-checkout.txt:177 en/git-switch.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-guess" -msgstr "" +msgstr "--no-guess" #. type: Plain text #: en/git-checkout.txt:181 en/git-switch.txt:92 @@ -11941,9 +11947,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:205 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:181 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--detach" -msgstr "" +msgstr "--detach" #. type: Plain text #: en/git-checkout.txt:211 @@ -11983,9 +11989,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:237 en/git-restore.txt:104 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ignore-skip-worktree-bits" -msgstr "" +msgstr "--ignore-skip-worktree-bits" #. type: Plain text #: en/git-checkout.txt:242 @@ -11995,9 +12001,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:244 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:87 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:122 en/rev-list-options.txt:298 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--merge" -msgstr "" +msgstr "--merge" #. type: Plain text #: en/git-checkout.txt:253 @@ -12055,9 +12061,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:285 en/git-switch.txt:178 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ignore-other-worktrees" -msgstr "" +msgstr "--ignore-other-worktrees" #. type: Plain text #: en/git-checkout.txt:290 @@ -12067,15 +12073,15 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:291 en/git-merge.txt:90 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--overwrite-ignore" -msgstr "" +msgstr "--overwrite-ignore" #. type: Labeled list #: en/git-checkout.txt:292 en/git-merge.txt:91 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-overwrite-ignore" -msgstr "" +msgstr "--no-overwrite-ignore" #. type: Plain text #: en/git-checkout.txt:296 @@ -12085,9 +12091,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:111 en/git-switch.txt:184 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--recurse-submodules" -msgstr "" +msgstr "--recurse-submodules" #. type: Plain text #: en/git-checkout.txt:306 @@ -12097,15 +12103,15 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:307 en/git-restore.txt:122 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--overlay" -msgstr "" +msgstr "--overlay" #. type: Labeled list #: en/git-checkout.txt:308 en/git-restore.txt:123 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-overlay" -msgstr "" +msgstr "--no-overlay" #. type: Plain text #: en/git-checkout.txt:314 @@ -12133,7 +12139,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:342 en/git-switch.txt:58 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -12163,7 +12169,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -12530,15 +12536,15 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:607 -#, priority:240 +#, ignore-same, priority:240 msgid "linkgit:git-switch[1], linkgit:git-restore[1]" -msgstr "" +msgstr "linkgit:git-switch[1], linkgit:git-restore[1]" #. type: Title = #: en/git-check-ref-format.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-ref-format(1)" -msgstr "" +msgstr "git-check-ref-format(1)" #. type: Plain text #: en/git-check-ref-format.txt:7 @@ -12672,9 +12678,9 @@ msgstr "" #. type: Labeled list #: en/git-check-ref-format.txt:101 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]allow-onelevel" -msgstr "" +msgstr "--[no-]allow-onelevel" #. type: Plain text #: en/git-check-ref-format.txt:105 @@ -12684,9 +12690,9 @@ msgstr "" #. type: Labeled list #: en/git-check-ref-format.txt:106 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--refspec-pattern" -msgstr "" +msgstr "--refspec-pattern" #. type: Plain text #: en/git-check-ref-format.txt:112 @@ -12696,9 +12702,9 @@ msgstr "" #. type: Labeled list #: en/git-check-ref-format.txt:113 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--normalize" -msgstr "" +msgstr "--normalize" #. type: Plain text #: en/git-check-ref-format.txt:120 @@ -12734,9 +12740,9 @@ msgstr "" #. type: Title = #: en/git-cherry-pick.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cherry-pick(1)" -msgstr "" +msgstr "git-cherry-pick(1)" #. type: Plain text #: en/git-cherry-pick.txt:7 @@ -12746,7 +12752,7 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n" "\t\t [-S[<keyid>]] <commit>...\n" @@ -12803,13 +12809,13 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:43 en/git-merge.txt:121 en/git-revert.txt:36 en/git-verify-commit.txt:27 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "<commit>..." msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:52 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')." msgstr "" @@ -12833,13 +12839,13 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:65 en/git-clean.txt:63 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-x" -msgstr "" +msgstr "-x" #. type: Plain text #: en/git-cherry-pick.txt:78 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful." msgstr "" @@ -12869,9 +12875,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-commit" -msgstr "" +msgstr "--no-commit" #. type: Plain text #: en/git-cherry-pick.txt:101 @@ -12893,9 +12899,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:119 en/merge-options.txt:42 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ff" -msgstr "" +msgstr "--ff" #. type: Plain text #: en/git-cherry-pick.txt:123 @@ -12905,9 +12911,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:124 en/git-commit.txt:174 en/git-notes.txt:158 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--allow-empty" -msgstr "" +msgstr "--allow-empty" #. type: Plain text #: en/git-cherry-pick.txt:136 @@ -12917,9 +12923,9 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:137 en/git-commit.txt:180 en/git-rebase.txt:328 en/git-rebase.txt:641 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--allow-empty-message" -msgstr "" +msgstr "--allow-empty-message" #. type: Plain text #: en/git-cherry-pick.txt:141 @@ -12929,9 +12935,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-redundant-commits" -msgstr "" +msgstr "--keep-redundant-commits" #. type: Plain text #: en/git-cherry-pick.txt:148 @@ -13113,9 +13119,9 @@ msgstr "" #. type: Title = #: en/git-cherry.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cherry(1)" -msgstr "" +msgstr "git-cherry(1)" #. type: Plain text #: en/git-cherry.txt:7 @@ -13197,7 +13203,7 @@ msgstr "" #. type: delimited block - #: en/git-cherry.txt:58 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git checkout -b topic origin/master\n" "# work and create some commits\n" @@ -13233,7 +13239,7 @@ msgstr "" #. type: delimited block - #: en/git-cherry.txt:86 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git log --graph --oneline --decorate --boundary origin/master...topic\n" "* 7654321 (origin/master) upstream tip commit\n" @@ -13256,7 +13262,7 @@ msgstr "" #. type: delimited block - #: en/git-cherry.txt:96 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git cherry origin/master topic\n" "- cccc000... commit C\n" @@ -13284,7 +13290,7 @@ msgstr "" #. type: delimited block - #: en/git-cherry.txt:126 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git log --graph --oneline --decorate --boundary origin/master...topic\n" "* 7654321 (origin/master) upstream tip commit\n" @@ -13310,7 +13316,7 @@ msgstr "" #. type: delimited block - #: en/git-cherry.txt:136 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git cherry origin/master topic base\n" "- cccc000... commit C\n" @@ -13320,9 +13326,9 @@ msgstr "" #. type: Title = #: en/git-citool.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-citool(1)" -msgstr "" +msgstr "git-citool(1)" #. type: Plain text #: en/git-citool.txt:7 @@ -13350,9 +13356,9 @@ msgstr "" #. type: Title = #: en/git-clean.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-clean(1)" -msgstr "" +msgstr "git-clean(1)" #. type: Plain text #: en/git-clean.txt:7 @@ -13362,7 +13368,7 @@ msgstr "" #. type: Plain text #: en/git-clean.txt:12 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n" msgstr "" @@ -13380,7 +13386,7 @@ msgstr "" #. type: Plain text #: en/git-clean.txt:25 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "If any optional `<path>...` arguments are given, only those paths are affected." msgstr "" @@ -13558,15 +13564,15 @@ msgstr "" #. type: Plain text #: en/git-clean.txt:139 en/git-status.txt:440 -#, priority:280 +#, ignore-same, priority:280 msgid "linkgit:gitignore[5]" -msgstr "" +msgstr "linkgit:gitignore[5]" #. type: Title = #: en/git-clone.txt:2 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "git-clone(1)" -msgstr "" +msgstr "git-clone(1)" #. type: Plain text #: en/git-clone.txt:7 @@ -13609,9 +13615,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--local" -msgstr "" +msgstr "--local" #. type: Plain text #: en/git-clone.txt:53 @@ -13627,9 +13633,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:61 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-hardlinks" -msgstr "" +msgstr "--no-hardlinks" #. type: Plain text #: en/git-clone.txt:66 @@ -13639,9 +13645,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:68 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--shared" -msgstr "" +msgstr "--shared" #. type: Plain text #: en/git-clone.txt:74 @@ -13698,9 +13704,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:109 en/git-submodule.txt:403 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--dissociate" -msgstr "" +msgstr "--dissociate" #. type: Plain text #: en/git-clone.txt:119 @@ -13733,10 +13739,10 @@ msgid "No checkout of HEAD is performed after the clone is complete." msgstr "" #. type: Labeled list -#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149 -#, no-wrap, priority:300 +#: en/git-clone.txt:148 en/git-init.txt:48 en/git-p4.txt:305 en/git.txt:149 +#, ignore-same, no-wrap, priority:300 msgid "--bare" -msgstr "" +msgstr "--bare" #. type: Plain text #: en/git-clone.txt:159 @@ -13746,9 +13752,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--sparse" -msgstr "" +msgstr "--sparse" #. type: Plain text #: en/git-clone.txt:165 @@ -13770,9 +13776,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:176 en/git-push.txt:161 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--mirror" -msgstr "" +msgstr "--mirror" #. type: Plain text #: en/git-clone.txt:183 @@ -13829,7 +13835,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp msgstr "" #. type: Labeled list -#: en/git-clone.txt:205 en/git-init.txt:59 en/git-svn.txt:578 +#: en/git-clone.txt:205 en/git-init.txt:60 en/git-svn.txt:578 #, no-wrap, priority:300 msgid "--template=<template_directory>" msgstr "" @@ -13890,9 +13896,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:241 en/git-submodule.txt:433 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--[no-]single-branch" -msgstr "" +msgstr "--[no-]single-branch" #. type: Plain text #: en/git-clone.txt:250 @@ -13932,9 +13938,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:279 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--[no-]shallow-submodules" -msgstr "" +msgstr "--[no-]shallow-submodules" #. type: Plain text #: en/git-clone.txt:281 @@ -13944,9 +13950,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:282 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--[no-]remote-submodules" -msgstr "" +msgstr "--[no-]remote-submodules" #. type: Plain text #: en/git-clone.txt:287 @@ -13955,7 +13961,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re msgstr "" #. type: Labeled list -#: en/git-clone.txt:288 en/git-init.txt:64 +#: en/git-clone.txt:288 en/git-init.txt:65 #, no-wrap, priority:300 msgid "--separate-git-dir=<git dir>" msgstr "" @@ -14016,7 +14022,7 @@ msgstr "" #. type: delimited block - #: en/git-clone.txt:324 -#, no-wrap, priority:300 +#, ignore-ellipsis, no-wrap, priority:300 msgid "" "$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n" "$ cd my-linux\n" @@ -14046,7 +14052,7 @@ msgstr "" #. type: delimited block - #: en/git-clone.txt:343 -#, no-wrap, priority:300 +#, ignore-ellipsis, no-wrap, priority:300 msgid "" "$ git clone --reference /git/linux.git \\\n" "\tgit://git.kernel.org/pub/scm/.../linux.git \\\n" @@ -14068,9 +14074,9 @@ msgstr "" #. type: Title = #: en/git-column.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-column(1)" -msgstr "" +msgstr "git-column(1)" #. type: Plain text #: en/git-column.txt:7 @@ -14227,9 +14233,9 @@ msgstr "" #. type: Title = #: en/git-commit-tree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-commit-tree(1)" -msgstr "" +msgstr "git-commit-tree(1)" #. type: Plain text #: en/git-commit-tree.txt:7 @@ -14239,7 +14245,7 @@ msgstr "" #. type: Plain text #: en/git-commit-tree.txt:15 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git commit-tree' <tree> [(-p <parent>)...]\n" "'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" @@ -14392,15 +14398,15 @@ msgstr "" #. type: Plain text #: en/git-commit-tree.txt:98 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-write-tree[1] linkgit:git-commit[1]" -msgstr "" +msgstr "linkgit:git-write-tree[1] linkgit:git-commit[1]" #. type: Title = #: en/git-commit.txt:2 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "git-commit(1)" -msgstr "" +msgstr "git-commit(1)" #. type: Plain text #: en/git-commit.txt:7 @@ -14410,7 +14416,7 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:18 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" "\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n" @@ -14549,9 +14555,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:102 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--reset-author" -msgstr "" +msgstr "--reset-author" #. type: Plain text #: en/git-commit.txt:107 @@ -14561,9 +14567,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:108 en/git-status.txt:28 en/git-symbolic-ref.txt:45 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--short" -msgstr "" +msgstr "--short" #. type: Plain text #: en/git-commit.txt:111 @@ -14573,9 +14579,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:112 en/git-status.txt:32 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--branch" -msgstr "" +msgstr "--branch" #. type: Plain text #: en/git-commit.txt:114 en/git-status.txt:34 @@ -14591,9 +14597,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:120 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--long" -msgstr "" +msgstr "--long" #. type: Plain text #: en/git-commit.txt:123 @@ -14603,9 +14609,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:125 en/git-config.txt:216 en/git-grep.txt:208 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--null" -msgstr "" +msgstr "--null" #. type: Plain text #: en/git-commit.txt:132 @@ -14693,9 +14699,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:170 en/git-rebase.txt:413 en/merge-options.txt:106 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-verify" -msgstr "" +msgstr "--no-verify" #. type: Plain text #: en/git-commit.txt:173 @@ -14795,9 +14801,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:221 en/git-revert.txt:66 en/merge-options.txt:17 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-edit" -msgstr "" +msgstr "--no-edit" #. type: Plain text #: en/git-commit.txt:225 @@ -14807,9 +14813,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:226 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--amend" -msgstr "" +msgstr "--amend" #. type: Plain text #: en/git-commit.txt:236 @@ -14825,7 +14831,7 @@ msgstr "" #. type: delimited block - #: en/git-commit.txt:243 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "\t$ git reset --soft HEAD^\n" "\t$ ... do something else to come up with the right tree ...\n" @@ -14846,9 +14852,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:252 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-post-rewrite" -msgstr "" +msgstr "--no-post-rewrite" #. type: Plain text #: en/git-commit.txt:254 @@ -14858,9 +14864,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:256 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--include" -msgstr "" +msgstr "--include" #. type: Plain text #: en/git-commit.txt:261 @@ -14870,9 +14876,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:263 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--only" -msgstr "" +msgstr "--only" #. type: Plain text #: en/git-commit.txt:275 @@ -14960,9 +14966,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:332 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--status" -msgstr "" +msgstr "--status" #. type: Plain text #: en/git-commit.txt:337 @@ -14972,9 +14978,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:338 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-status" -msgstr "" +msgstr "--no-status" #. type: Plain text #: en/git-commit.txt:342 @@ -15179,15 +15185,15 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:537 -#, priority:280 +#, ignore-same, priority:280 msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" -msgstr "" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" #. type: Title = #: en/git-config.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-config(1)" -msgstr "" +msgstr "git-config(1)" #. type: Plain text #: en/git-config.txt:7 @@ -15302,9 +15308,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:77 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--replace-all" -msgstr "" +msgstr "--replace-all" #. type: Plain text #: en/git-config.txt:80 @@ -15314,9 +15320,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:81 en/git-update-index.txt:45 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--add" -msgstr "" +msgstr "--add" #. type: Plain text #: en/git-config.txt:85 @@ -15326,9 +15332,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:86 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--get" -msgstr "" +msgstr "--get" #. type: Plain text #: en/git-config.txt:90 @@ -15338,9 +15344,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:91 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--get-all" -msgstr "" +msgstr "--get-all" #. type: Plain text #: en/git-config.txt:93 @@ -15350,9 +15356,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--get-regexp" -msgstr "" +msgstr "--get-regexp" #. type: Plain text #: en/git-config.txt:100 @@ -15374,9 +15380,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:109 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--global" -msgstr "" +msgstr "--global" #. type: Plain text #: en/git-config.txt:114 @@ -15398,9 +15404,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:120 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--system" -msgstr "" +msgstr "--system" #. type: Plain text #: en/git-config.txt:124 @@ -15428,9 +15434,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:139 en/git-restore.txt:59 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--worktree" -msgstr "" +msgstr "--worktree" #. type: Plain text #: en/git-config.txt:143 @@ -15470,9 +15476,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:155 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--remove-section" -msgstr "" +msgstr "--remove-section" #. type: Plain text #: en/git-config.txt:157 @@ -15482,9 +15488,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:158 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--rename-section" -msgstr "" +msgstr "--rename-section" #. type: Plain text #: en/git-config.txt:160 @@ -15494,9 +15500,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:161 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unset" -msgstr "" +msgstr "--unset" #. type: Plain text #: en/git-config.txt:163 @@ -15506,9 +15512,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:164 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unset-all" -msgstr "" +msgstr "--unset-all" #. type: Plain text #: en/git-config.txt:166 @@ -15524,9 +15530,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:171 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--fixed-value" -msgstr "" +msgstr "--fixed-value" #. type: Plain text #: en/git-config.txt:176 @@ -15590,33 +15596,33 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:202 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--bool" -msgstr "" +msgstr "--bool" #. type: Labeled list #: en/git-config.txt:203 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--int" -msgstr "" +msgstr "--int" #. type: Labeled list #: en/git-config.txt:204 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--bool-or-int" -msgstr "" +msgstr "--bool-or-int" #. type: Labeled list #: en/git-config.txt:205 en/git-hash-object.txt:39 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--path" -msgstr "" +msgstr "--path" #. type: Labeled list #: en/git-config.txt:206 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--expiry-date" -msgstr "" +msgstr "--expiry-date" #. type: Plain text #: en/git-config.txt:209 @@ -15626,9 +15632,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:210 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-type" -msgstr "" +msgstr "--no-type" #. type: Plain text #: en/git-config.txt:214 @@ -15650,9 +15656,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:228 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-origin" -msgstr "" +msgstr "--show-origin" #. type: Plain text #: en/git-config.txt:233 @@ -15662,9 +15668,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:234 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-scope" -msgstr "" +msgstr "--show-scope" #. type: Plain text #: en/git-config.txt:238 @@ -15710,9 +15716,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:266 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]includes" -msgstr "" +msgstr "--[no-]includes" #. type: Plain text #: en/git-config.txt:271 @@ -15842,9 +15848,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:338 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_CONFIG" -msgstr "" +msgstr "GIT_CONFIG" #. type: Plain text #: en/git-config.txt:342 @@ -15854,9 +15860,9 @@ msgstr "" #. type: Labeled list #: en/git-config.txt:343 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_CONFIG_NOSYSTEM" -msgstr "" +msgstr "GIT_CONFIG_NOSYSTEM" #. type: Plain text #: en/git-config.txt:346 @@ -16033,7 +16039,7 @@ msgstr "" #. type: Plain text #: en/git-config.txt:444 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:" msgstr "" @@ -16139,9 +16145,9 @@ msgstr "" #. type: Title = #: en/git-count-objects.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-count-objects(1)" -msgstr "" +msgstr "git-count-objects(1)" #. type: Plain text #: en/git-count-objects.txt:7 @@ -16223,9 +16229,9 @@ msgstr "" #. type: Labeled list #: en/git-count-objects.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--human-readable" -msgstr "" +msgstr "--human-readable" #. type: Plain text #: en/git-count-objects.txt:51 @@ -16235,9 +16241,9 @@ msgstr "" #. type: Title = #: en/git-credential-cache--daemon.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-credential-cache--daemon(1)" -msgstr "" +msgstr "git-credential-cache--daemon(1)" #. type: Plain text #: en/git-credential-cache--daemon.txt:7 @@ -16271,9 +16277,9 @@ msgstr "" #. type: Title = #: en/git-credential-cache.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-credential-cache(1)" -msgstr "" +msgstr "git-credential-cache(1)" #. type: Plain text #: en/git-credential-cache.txt:7 @@ -16380,9 +16386,9 @@ msgstr "" #. type: Title = #: en/git-credential-store.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-credential-store(1)" -msgstr "" +msgstr "git-credential-store(1)" #. type: Plain text #: en/git-credential-store.txt:7 @@ -16525,9 +16531,9 @@ msgstr "" #. type: Title = #: en/git-credential.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-credential(1)" -msgstr "" +msgstr "git-credential(1)" #. type: Plain text #: en/git-credential.txt:7 @@ -16688,9 +16694,9 @@ msgstr "" #. type: Labeled list #: en/git-credential.txt:122 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`protocol`" -msgstr "" +msgstr "`protocol`" #. type: Plain text #: en/git-credential.txt:126 @@ -16700,9 +16706,9 @@ msgstr "" #. type: Labeled list #: en/git-credential.txt:127 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`host`" -msgstr "" +msgstr "`host`" #. type: Plain text #: en/git-credential.txt:131 @@ -16712,9 +16718,9 @@ msgstr "" #. type: Labeled list #: en/git-credential.txt:132 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`path`" -msgstr "" +msgstr "`path`" #. type: Plain text #: en/git-credential.txt:137 @@ -16724,9 +16730,9 @@ msgstr "" #. type: Labeled list #: en/git-credential.txt:138 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`username`" -msgstr "" +msgstr "`username`" #. type: Plain text #: en/git-credential.txt:142 @@ -16736,9 +16742,9 @@ msgstr "" #. type: Labeled list #: en/git-credential.txt:143 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`password`" -msgstr "" +msgstr "`password`" #. type: Plain text #: en/git-credential.txt:146 @@ -16748,9 +16754,9 @@ msgstr "" #. type: Labeled list #: en/git-credential.txt:147 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`url`" -msgstr "" +msgstr "`url`" #. type: Plain text #: en/git-credential.txt:154 @@ -16772,9 +16778,9 @@ msgstr "" #. type: Title = #: en/git-cvsexportcommit.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cvsexportcommit(1)" -msgstr "" +msgstr "git-cvsexportcommit(1)" #. type: Plain text #: en/git-cvsexportcommit.txt:7 @@ -16949,9 +16955,9 @@ msgstr "" #. type: Title = #: en/git-cvsimport.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cvsimport(1)" -msgstr "" +msgstr "git-cvsimport(1)" #. type: Plain text #: en/git-cvsimport.txt:7 @@ -17377,9 +17383,9 @@ msgstr "" #. type: Title = #: en/git-cvsserver.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cvsserver(1)" -msgstr "" +msgstr "git-cvsserver(1)" #. type: Plain text #: en/git-cvsserver.txt:7 @@ -17421,7 +17427,7 @@ msgstr "" #. type: Plain text #: en/git-cvsserver.txt:26 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n" msgstr "" @@ -17445,9 +17451,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:37 en/git-daemon.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--strict-paths" -msgstr "" +msgstr "--strict-paths" #. type: Plain text #: en/git-cvsserver.txt:39 @@ -17457,9 +17463,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:40 en/git-daemon.txt:78 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--export-all" -msgstr "" +msgstr "--export-all" #. type: Plain text #: en/git-cvsserver.txt:43 @@ -17475,9 +17481,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:45 en/git.txt:42 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--version" -msgstr "" +msgstr "--version" #. type: Plain text #: en/git-cvsserver.txt:47 @@ -17487,9 +17493,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:50 en/git.txt:45 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--help" -msgstr "" +msgstr "--help" #. type: Plain text #: en/git-cvsserver.txt:52 @@ -17867,9 +17873,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:293 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "%G" -msgstr "" +msgstr "%G" #. type: Plain text #: en/git-cvsserver.txt:295 @@ -17879,9 +17885,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:295 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "%g" -msgstr "" +msgstr "%g" #. type: Plain text #: en/git-cvsserver.txt:300 @@ -17891,9 +17897,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:300 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "%m" -msgstr "" +msgstr "%m" #. type: Plain text #: en/git-cvsserver.txt:302 @@ -17903,9 +17909,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:302 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "%a" -msgstr "" +msgstr "%a" #. type: Plain text #: en/git-cvsserver.txt:304 @@ -17915,9 +17921,9 @@ msgstr "" #. type: Labeled list #: en/git-cvsserver.txt:304 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "%u" -msgstr "" +msgstr "%u" #. type: Plain text #: en/git-cvsserver.txt:308 @@ -18107,9 +18113,9 @@ msgstr "" #. type: Title = #: en/git-daemon.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-daemon(1)" -msgstr "" +msgstr "git-daemon(1)" #. type: Plain text #: en/git-daemon.txt:7 @@ -18119,7 +18125,7 @@ msgstr "" #. type: Plain text #: en/git-daemon.txt:25 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git daemon' [--verbose] [--syslog] [--export-all]\n" "\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n" @@ -18187,9 +18193,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:62 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--base-path-relaxed" -msgstr "" +msgstr "--base-path-relaxed" #. type: Plain text #: en/git-daemon.txt:67 @@ -18217,9 +18223,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:83 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--inetd" -msgstr "" +msgstr "--inetd" #. type: Plain text #: en/git-daemon.txt:88 @@ -18289,9 +18295,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:114 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--syslog" -msgstr "" +msgstr "--syslog" #. type: Plain text #: en/git-daemon.txt:116 @@ -18349,9 +18355,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:138 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--user-path" -msgstr "" +msgstr "--user-path" #. type: Labeled list #: en/git-daemon.txt:139 @@ -18373,9 +18379,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:151 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reuseaddr" -msgstr "" +msgstr "--reuseaddr" #. type: Plain text #: en/git-daemon.txt:155 @@ -18469,9 +18475,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:196 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]informative-errors" -msgstr "" +msgstr "--[no-]informative-errors" #. type: Plain text #: en/git-daemon.txt:204 @@ -18673,9 +18679,9 @@ msgstr "" #. type: Title = #: en/git-describe.txt:2 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "git-describe(1)" -msgstr "" +msgstr "git-describe(1)" #. type: Plain text #: en/git-describe.txt:7 @@ -18685,7 +18691,7 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:14 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n" "'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n" @@ -18712,7 +18718,7 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:37 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "<commit-ish>..." msgstr "" @@ -18754,9 +18760,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:60 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--contains" -msgstr "" +msgstr "--contains" #. type: Plain text #: en/git-describe.txt:64 @@ -18784,9 +18790,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:78 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--exact-match" -msgstr "" +msgstr "--exact-match" #. type: Plain text #: en/git-describe.txt:81 @@ -18796,9 +18802,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:82 en/git-ls-files.txt:160 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--debug" -msgstr "" +msgstr "--debug" #. type: Plain text #: en/git-describe.txt:86 @@ -18808,7 +18814,7 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:95 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)." msgstr "" @@ -18838,9 +18844,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--always" -msgstr "" +msgstr "--always" #. type: Plain text #: en/git-describe.txt:120 en/git-name-rev.txt:63 @@ -18968,9 +18974,9 @@ msgstr "" #. type: Title = #: en/git-diff-files.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-diff-files(1)" -msgstr "" +msgstr "git-diff-files(1)" #. type: Plain text #: en/git-diff-files.txt:7 @@ -18980,7 +18986,7 @@ msgstr "" #. type: Plain text #: en/git-diff-files.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n" msgstr "" @@ -19022,9 +19028,9 @@ msgstr "" #. type: Labeled list #: en/git-diff-files.txt:38 en/git-diff-tree.txt:103 en/git-log.txt:124 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--cc" -msgstr "" +msgstr "--cc" #. type: Plain text #: en/git-diff-files.txt:43 @@ -19040,9 +19046,9 @@ msgstr "" #. type: Title = #: en/git-diff-index.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-diff-index(1)" -msgstr "" +msgstr "git-diff-index(1)" #. type: Plain text #: en/git-diff-index.txt:7 @@ -19052,7 +19058,7 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]\n" msgstr "" @@ -19076,9 +19082,9 @@ msgstr "" #. type: Labeled list #: en/git-diff-index.txt:32 en/git-diff-tree.txt:46 en/git-show-branch.txt:83 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--merge-base" -msgstr "" +msgstr "--merge-base" #. type: Plain text #: en/git-diff-index.txt:36 @@ -19203,7 +19209,7 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:107 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n" " :100644 100664 7476bb... 000000... kernel/sched.c\n" @@ -19229,9 +19235,9 @@ msgstr "" #. type: Title = #: en/git-difftool.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-difftool(1)" -msgstr "" +msgstr "git-difftool(1)" #. type: Plain text #: en/git-difftool.txt:7 @@ -19241,7 +19247,7 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:12 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n" msgstr "" @@ -19253,9 +19259,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:23 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--dir-diff" -msgstr "" +msgstr "--dir-diff" #. type: Plain text #: en/git-difftool.txt:27 @@ -19265,15 +19271,15 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:28 en/git-mergetool.txt:70 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "-y" -msgstr "" +msgstr "-y" #. type: Labeled list #: en/git-difftool.txt:29 en/git-mergetool.txt:71 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-prompt" -msgstr "" +msgstr "--no-prompt" #. type: Plain text #: en/git-difftool.txt:31 @@ -19283,9 +19289,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:32 en/git-mergetool.txt:78 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--prompt" -msgstr "" +msgstr "--prompt" #. type: Plain text #: en/git-difftool.txt:36 @@ -19337,9 +19343,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:69 en/git-mergetool.txt:67 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--tool-help" -msgstr "" +msgstr "--tool-help" #. type: Plain text #: en/git-difftool.txt:71 @@ -19349,9 +19355,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:72 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]symlinks" -msgstr "" +msgstr "--[no-]symlinks" #. type: Plain text #: en/git-difftool.txt:77 @@ -19385,15 +19391,15 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:263 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "-g" -msgstr "" +msgstr "-g" #. type: Labeled list #: en/git-difftool.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]gui" -msgstr "" +msgstr "--[no-]gui" #. type: Plain text #: en/git-difftool.txt:96 @@ -19403,9 +19409,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:97 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]trust-exit-code" -msgstr "" +msgstr "--[no-]trust-exit-code" #. type: Plain text #: en/git-difftool.txt:102 @@ -19439,9 +19445,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:113 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "diff.tool" -msgstr "" +msgstr "diff.tool" #. type: Plain text #: en/git-difftool.txt:115 @@ -19451,9 +19457,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:116 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "diff.guitool" -msgstr "" +msgstr "diff.guitool" #. type: Plain text #: en/git-difftool.txt:118 @@ -19493,9 +19499,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:128 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "difftool.prompt" -msgstr "" +msgstr "difftool.prompt" #. type: Plain text #: en/git-difftool.txt:130 @@ -19505,9 +19511,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:131 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "difftool.trustExitCode" -msgstr "" +msgstr "difftool.trustExitCode" #. type: Plain text #: en/git-difftool.txt:133 @@ -19541,9 +19547,9 @@ msgstr "" #. type: Title = #: en/git-diff-tree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-diff-tree(1)" -msgstr "" +msgstr "git-diff-tree(1)" #. type: Plain text #: en/git-diff-tree.txt:7 @@ -19553,7 +19559,7 @@ msgstr "" #. type: Plain text #: en/git-diff-tree.txt:15 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n" "\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n" @@ -19586,7 +19592,7 @@ msgstr "" #. type: Labeled list #: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "<path>..." msgstr "" @@ -19664,9 +19670,9 @@ msgstr "" #. type: Labeled list #: en/git-diff-tree.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-commit-id" -msgstr "" +msgstr "--no-commit-id" #. type: Plain text #: en/git-diff-tree.txt:92 @@ -19688,9 +19694,9 @@ msgstr "" #. type: Labeled list #: en/git-diff-tree.txt:113 en/git-log.txt:130 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--combined-all-paths" -msgstr "" +msgstr "--combined-all-paths" #. type: Plain text #: en/git-diff-tree.txt:119 en/git-log.txt:136 @@ -19706,9 +19712,9 @@ msgstr "" #. type: Title = #: en/git-diff.txt:2 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "git-diff(1)" -msgstr "" +msgstr "git-diff(1)" #. type: Plain text #: en/git-diff.txt:7 @@ -19718,7 +19724,7 @@ msgstr "" #. type: Plain text #: en/git-diff.txt:18 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git diff' [<options>] [<commit>] [--] [<path>...]\n" "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n" @@ -19736,7 +19742,7 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:26 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] [--] [<path>...]" msgstr "" @@ -19760,7 +19766,7 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:43 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]" msgstr "" @@ -19778,7 +19784,7 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:57 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit> [--] [<path>...]" msgstr "" @@ -19790,7 +19796,7 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:65 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]" msgstr "" @@ -19808,7 +19814,7 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:74 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]" msgstr "" @@ -19820,7 +19826,7 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:83 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" msgstr "" @@ -19832,13 +19838,13 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:90 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" msgstr "" #. type: Plain text #: en/git-diff.txt:97 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. `git diff A...B` is equivalent to `git diff $(git merge-base A B) B`. You can omit any one of <commit>, which has the same effect as using HEAD instead." msgstr "" @@ -19850,7 +19856,7 @@ msgstr "" #. type: Plain text #: en/git-diff.txt:109 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (`<commit>..<commit>` and `<commit>...<commit>`) do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]." msgstr "" @@ -19958,7 +19964,7 @@ msgstr "" #. type: delimited block - #: en/git-diff.txt:180 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git diff topic master <1>\n" "$ git diff topic..master <2>\n" @@ -20050,9 +20056,9 @@ msgstr "" #. type: Title = #: en/git-fast-export.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-fast-export(1)" -msgstr "" +msgstr "git-fast-export(1)" #. type: Plain text #: en/git-fast-export.txt:7 @@ -20164,9 +20170,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--mark-tags" -msgstr "" +msgstr "--mark-tags" #. type: Plain text #: en/git-fast-export.txt:87 @@ -20182,9 +20188,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:93 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--fake-missing-tagger" -msgstr "" +msgstr "--fake-missing-tagger" #. type: Plain text #: en/git-fast-export.txt:98 @@ -20194,9 +20200,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:99 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--use-done-feature" -msgstr "" +msgstr "--use-done-feature" #. type: Plain text #: en/git-fast-export.txt:102 @@ -20206,9 +20212,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:103 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-data" -msgstr "" +msgstr "--no-data" #. type: Plain text #: en/git-fast-export.txt:110 @@ -20218,9 +20224,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:111 en/git-ls-tree.txt:73 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--full-tree" -msgstr "" +msgstr "--full-tree" #. type: Plain text #: en/git-fast-export.txt:116 @@ -20230,9 +20236,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:117 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--anonymize" -msgstr "" +msgstr "--anonymize" #. type: Plain text #: en/git-fast-export.txt:121 @@ -20254,9 +20260,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:127 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reference-excluded-parents" -msgstr "" +msgstr "--reference-excluded-parents" #. type: Plain text #: en/git-fast-export.txt:138 @@ -20266,9 +20272,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:139 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-original-ids" -msgstr "" +msgstr "--show-original-ids" #. type: Plain text #: en/git-fast-export.txt:145 @@ -20290,9 +20296,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:153 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--refspec" -msgstr "" +msgstr "--refspec" #. type: Plain text #: en/git-fast-export.txt:156 @@ -20302,7 +20308,7 @@ msgstr "" #. type: Labeled list #: en/git-fast-export.txt:157 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "[<git-rev-list-args>...]" msgstr "" @@ -20383,7 +20389,7 @@ msgstr "" #. type: delimited block - #: en/git-fast-export.txt:229 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git init anon-repo\n" "$ cd anon-repo\n" @@ -20451,9 +20457,9 @@ msgstr "" #. type: Title = #: en/git-fast-import.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-fast-import(1)" -msgstr "" +msgstr "git-fast-import(1)" #. type: Plain text #: en/git-fast-import.txt:7 @@ -20499,9 +20505,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stats" -msgstr "" +msgstr "--stats" #. type: Plain text #: en/git-fast-import.txt:53 @@ -20511,9 +20517,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:54 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--allow-unsafe-features" -msgstr "" +msgstr "--allow-unsafe-features" #. type: Plain text #: en/git-fast-import.txt:63 @@ -20559,9 +20565,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:84 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--done" -msgstr "" +msgstr "--done" #. type: Plain text #: en/git-fast-import.txt:89 @@ -20601,9 +20607,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:114 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]relative-marks" -msgstr "" +msgstr "--[no-]relative-marks" #. type: Plain text #: en/git-fast-import.txt:121 @@ -20721,9 +20727,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:175 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "fastimport.unpackLimit" -msgstr "" +msgstr "fastimport.unpackLimit" #. type: Plain text #: en/git-fast-import.txt:177 @@ -20847,9 +20853,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:274 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`raw`" -msgstr "" +msgstr "`raw`" #. type: Plain text #: en/git-fast-import.txt:278 @@ -20883,9 +20889,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:299 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`raw-permissive`" -msgstr "" +msgstr "`raw-permissive`" #. type: Plain text #: en/git-fast-import.txt:304 @@ -20937,9 +20943,9 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:334 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`now`" -msgstr "" +msgstr "`now`" #. type: Plain text #: en/git-fast-import.txt:337 @@ -20979,9 +20985,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:361 en/git-fast-import.txt:430 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`commit`" -msgstr "" +msgstr "`commit`" #. type: Plain text #: en/git-fast-import.txt:365 @@ -20991,9 +20997,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:366 en/git-fast-import.txt:820 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`tag`" -msgstr "" +msgstr "`tag`" #. type: Plain text #: en/git-fast-import.txt:371 @@ -21003,9 +21009,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:372 en/git-fast-import.txt:865 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`reset`" -msgstr "" +msgstr "`reset`" #. type: Plain text #: en/git-fast-import.txt:376 @@ -21015,9 +21021,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:377 en/git-fast-import.txt:894 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`blob`" -msgstr "" +msgstr "`blob`" #. type: Plain text #: en/git-fast-import.txt:381 @@ -21027,9 +21033,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:382 en/git-fast-import.txt:967 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`alias`" -msgstr "" +msgstr "`alias`" #. type: Plain text #: en/git-fast-import.txt:388 @@ -21039,9 +21045,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:389 en/git-fast-import.txt:982 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`checkpoint`" -msgstr "" +msgstr "`checkpoint`" #. type: Plain text #: en/git-fast-import.txt:394 @@ -21051,9 +21057,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:395 en/git-fast-import.txt:1010 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`progress`" -msgstr "" +msgstr "`progress`" #. type: Plain text #: en/git-fast-import.txt:399 @@ -21063,9 +21069,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:400 en/git-fast-import.txt:1217 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`done`" -msgstr "" +msgstr "`done`" #. type: Plain text #: en/git-fast-import.txt:404 @@ -21075,9 +21081,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:405 en/git-fast-import.txt:1035 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`get-mark`" -msgstr "" +msgstr "`get-mark`" #. type: Plain text #: en/git-fast-import.txt:409 @@ -21087,9 +21093,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:410 en/git-fast-import.txt:1050 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`cat-blob`" -msgstr "" +msgstr "`cat-blob`" #. type: Plain text #: en/git-fast-import.txt:414 @@ -21099,9 +21105,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:415 en/git-fast-import.txt:1081 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`ls`" -msgstr "" +msgstr "`ls`" #. type: Plain text #: en/git-fast-import.txt:419 @@ -21111,9 +21117,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:420 en/git-fast-import.txt:1134 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`feature`" -msgstr "" +msgstr "`feature`" #. type: Plain text #: en/git-fast-import.txt:423 @@ -21123,9 +21129,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:424 en/git-fast-import.txt:1189 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`option`" -msgstr "" +msgstr "`option`" #. type: Plain text #: en/git-fast-import.txt:428 @@ -21188,9 +21194,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:483 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`author`" -msgstr "" +msgstr "`author`" #. type: Plain text #: en/git-fast-import.txt:489 @@ -21200,9 +21206,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:491 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`committer`" -msgstr "" +msgstr "`committer`" #. type: Plain text #: en/git-fast-import.txt:494 @@ -21224,9 +21230,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:509 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`encoding`" -msgstr "" +msgstr "`encoding`" #. type: Plain text #: en/git-fast-import.txt:513 @@ -21236,9 +21242,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:515 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`from`" -msgstr "" +msgstr "`from`" #. type: Plain text #: en/git-fast-import.txt:521 @@ -21326,9 +21332,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:572 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`merge`" -msgstr "" +msgstr "`merge`" #. type: Plain text #: en/git-fast-import.txt:580 @@ -21344,9 +21350,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:585 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`filemodify`" -msgstr "" +msgstr "`filemodify`" #. type: Plain text #: en/git-fast-import.txt:589 @@ -21502,9 +21508,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:657 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`filedelete`" -msgstr "" +msgstr "`filedelete`" #. type: Plain text #: en/git-fast-import.txt:663 @@ -21526,9 +21532,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:673 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`filecopy`" -msgstr "" +msgstr "`filecopy`" #. type: Plain text #: en/git-fast-import.txt:678 @@ -21556,9 +21562,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:694 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`filerename`" -msgstr "" +msgstr "`filerename`" #. type: Plain text #: en/git-fast-import.txt:698 @@ -21586,9 +21592,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:723 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`filedeleteall`" -msgstr "" +msgstr "`filedeleteall`" #. type: Plain text #: en/git-fast-import.txt:728 @@ -21616,9 +21622,9 @@ msgstr "" #. type: Title ^ #: en/git-fast-import.txt:747 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`notemodify`" -msgstr "" +msgstr "`notemodify`" #. type: Plain text #: en/git-fast-import.txt:756 @@ -21666,9 +21672,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:786 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`mark`" -msgstr "" +msgstr "`mark`" #. type: Plain text #: en/git-fast-import.txt:792 @@ -21696,9 +21702,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:807 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`original-oid`" -msgstr "" +msgstr "`original-oid`" #. type: Plain text #: en/git-fast-import.txt:812 @@ -21849,9 +21855,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:913 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`data`" -msgstr "" +msgstr "`data`" #. type: Plain text #: en/git-fast-import.txt:920 @@ -22467,7 +22473,7 @@ msgstr "" msgid "" "Active Branch LRU\n" "-----------------\n" -"active_branches = 1 cur, 5 max\n" +"active_branches = 1 cur, 5 max\n" msgstr "" #. type: delimited block = @@ -22805,9 +22811,9 @@ msgstr "" #. type: Title = #: en/git-fetch-pack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-fetch-pack(1)" -msgstr "" +msgstr "git-fetch-pack(1)" #. type: Plain text #: en/git-fetch-pack.txt:7 @@ -22817,7 +22823,7 @@ msgstr "" #. type: Plain text #: en/git-fetch-pack.txt:16 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]\n" "\t[--upload-pack=<git-upload-pack>]\n" @@ -22875,9 +22881,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:210 en/git-send-pack.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--thin" -msgstr "" +msgstr "--thin" #. type: Plain text #: en/git-fetch-pack.txt:63 @@ -22887,9 +22893,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:83 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--include-tag" -msgstr "" +msgstr "--include-tag" #. type: Plain text #: en/git-fetch-pack.txt:69 @@ -22929,9 +22935,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:99 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--deepen-relative" -msgstr "" +msgstr "--deepen-relative" #. type: Plain text #: en/git-fetch-pack.txt:103 @@ -22947,9 +22953,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--check-self-contained-and-connected" -msgstr "" +msgstr "--check-self-contained-and-connected" #. type: Plain text #: en/git-fetch-pack.txt:110 @@ -22971,7 +22977,7 @@ msgstr "" #. type: Labeled list #: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:88 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<refs>..." msgstr "" @@ -22989,9 +22995,9 @@ msgstr "" #. type: Title = #: en/git-fetch.txt:2 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "git-fetch(1)" -msgstr "" +msgstr "git-fetch(1)" #. type: Plain text #: en/git-fetch.txt:7 @@ -23001,7 +23007,7 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:16 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "" "'git fetch' [<options>] [<repository> [<refspec>...]]\n" "'git fetch' [<options>] <group>\n" @@ -23282,9 +23288,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch.txt:219 en/git-push.txt:459 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "`-`" -msgstr "" +msgstr "`-`" #. type: Plain text #: en/git-fetch.txt:220 @@ -23294,9 +23300,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch.txt:220 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "`t`" -msgstr "" +msgstr "`t`" #. type: Plain text #: en/git-fetch.txt:221 @@ -23348,7 +23354,7 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:230 -#, priority:220 +#, ignore-ellipsis, priority:220 msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)." msgstr "" @@ -23458,9 +23464,9 @@ msgstr "" #. type: Title = #: en/git-filter-branch.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-filter-branch(1)" -msgstr "" +msgstr "git-filter-branch(1)" #. type: Plain text #: en/git-filter-branch.txt:7 @@ -23470,7 +23476,7 @@ msgstr "" #. type: Plain text #: en/git-filter-branch.txt:18 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n" "\t[--env-filter <command>] [--tree-filter <command>]\n" @@ -23621,7 +23627,7 @@ msgstr "" #. type: Plain text #: en/git-filter-branch.txt:130 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]." msgstr "" @@ -23633,7 +23639,7 @@ msgstr "" #. type: Plain text #: en/git-filter-branch.txt:138 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit." msgstr "" @@ -23657,7 +23663,7 @@ msgstr "" #. type: Plain text #: en/git-filter-branch.txt:151 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout." msgstr "" @@ -23705,9 +23711,9 @@ msgstr "" #. type: Labeled list #: en/git-filter-branch.txt:188 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--prune-empty" -msgstr "" +msgstr "--prune-empty" #. type: Plain text #: en/git-filter-branch.txt:195 @@ -23759,7 +23765,7 @@ msgstr "" #. type: Labeled list #: en/git-filter-branch.txt:220 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<rev-list options>..." msgstr "" @@ -24020,7 +24026,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:401 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "git filter-branch ... C..H\n" msgstr "" @@ -24032,7 +24038,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:408 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "git filter-branch ... C..H --not D\n" "git filter-branch ... D..H --not C\n" @@ -24297,7 +24303,7 @@ msgstr "" #. type: Plain text #: en/git-filter-branch.txt:662 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "If --prune-empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)" msgstr "" @@ -24333,9 +24339,9 @@ msgstr "" #. type: Title = #: en/git-fmt-merge-msg.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-fmt-merge-msg(1)" -msgstr "" +msgstr "git-fmt-merge-msg(1)" #. type: Plain text #: en/git-fmt-merge-msg.txt:7 @@ -24377,9 +24383,9 @@ msgstr "" #. type: Labeled list #: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:72 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-log" -msgstr "" +msgstr "--no-log" #. type: Plain text #: en/git-fmt-merge-msg.txt:37 @@ -24389,9 +24395,9 @@ msgstr "" #. type: Labeled list #: en/git-fmt-merge-msg.txt:38 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]summary" -msgstr "" +msgstr "--[no-]summary" #. type: Plain text #: en/git-fmt-merge-msg.txt:41 @@ -24425,9 +24431,9 @@ msgstr "" #. type: Labeled list #: en/git-fmt-merge-msg.txt:56 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "merge.summary" -msgstr "" +msgstr "merge.summary" #. type: Plain text #: en/git-fmt-merge-msg.txt:59 @@ -24451,9 +24457,9 @@ msgstr "" #. type: Title = #: en/git-for-each-ref.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-for-each-ref(1)" -msgstr "" +msgstr "git-for-each-ref(1)" #. type: Plain text #: en/git-for-each-ref.txt:7 @@ -24463,7 +24469,7 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:16 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n" "\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n" @@ -24480,7 +24486,7 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<pattern>..." msgstr "" @@ -24528,27 +24534,27 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:65 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--shell" -msgstr "" +msgstr "--shell" #. type: Labeled list #: en/git-for-each-ref.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--perl" -msgstr "" +msgstr "--perl" #. type: Labeled list #: en/git-for-each-ref.txt:67 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--python" -msgstr "" +msgstr "--python" #. type: Labeled list #: en/git-for-each-ref.txt:68 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--tcl" -msgstr "" +msgstr "--tcl" #. type: Plain text #: en/git-for-each-ref.txt:73 @@ -24768,7 +24774,7 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:195 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting." msgstr "" @@ -24780,7 +24786,7 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:208 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string." msgstr "" @@ -25066,7 +25072,7 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:382 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star." msgstr "" @@ -25078,7 +25084,7 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:390 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present." msgstr "" @@ -25090,9 +25096,9 @@ msgstr "" #. type: Title = #: en/git-format-patch.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-format-patch(1)" -msgstr "" +msgstr "git-format-patch(1)" #. type: Plain text #: en/git-format-patch.txt:7 @@ -25221,9 +25227,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:102 en/git-shortlog.txt:30 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--numbered" -msgstr "" +msgstr "--numbered" #. type: Plain text #: en/git-format-patch.txt:104 @@ -25233,9 +25239,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:106 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-numbered" -msgstr "" +msgstr "--no-numbered" #. type: Plain text #: en/git-format-patch.txt:108 @@ -25257,9 +25263,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:112 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--numbered-files" -msgstr "" +msgstr "--numbered-files" #. type: Plain text #: en/git-format-patch.txt:115 @@ -25269,9 +25275,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:117 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-subject" -msgstr "" +msgstr "--keep-subject" #. type: Plain text #: en/git-format-patch.txt:120 @@ -25281,9 +25287,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:127 en/git-pack-objects.txt:59 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stdout" -msgstr "" +msgstr "--stdout" #. type: Plain text #: en/git-format-patch.txt:130 @@ -25305,9 +25311,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:136 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-attach" -msgstr "" +msgstr "--no-attach" #. type: Plain text #: en/git-format-patch.txt:139 @@ -25335,9 +25341,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:146 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-thread" -msgstr "" +msgstr "--no-thread" #. type: Plain text #: en/git-format-patch.txt:151 @@ -25377,9 +25383,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:171 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-if-in-upstream" -msgstr "" +msgstr "--ignore-if-in-upstream" #. type: Plain text #: en/git-format-patch.txt:177 @@ -25449,9 +25455,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:211 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--rfc" -msgstr "" +msgstr "--rfc" #. type: Plain text #: en/git-format-patch.txt:215 @@ -25503,9 +25509,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:237 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--from" -msgstr "" +msgstr "--from" #. type: Labeled list #: en/git-format-patch.txt:238 @@ -25539,9 +25545,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:260 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]cover-letter" -msgstr "" +msgstr "--[no-]cover-letter" #. type: Plain text #: en/git-format-patch.txt:264 @@ -25551,15 +25557,15 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:265 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--encode-email-headers" -msgstr "" +msgstr "--encode-email-headers" #. type: Labeled list #: en/git-format-patch.txt:266 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-encode-email-headers" -msgstr "" +msgstr "--no-encode-email-headers" #. type: Plain text #: en/git-format-patch.txt:271 @@ -25617,9 +25623,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:305 en/pretty-options.txt:81 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-notes" -msgstr "" +msgstr "--no-notes" #. type: Plain text #: en/git-format-patch.txt:308 @@ -25689,9 +25695,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:342 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-binary" -msgstr "" +msgstr "--no-binary" #. type: Plain text #: en/git-format-patch.txt:347 @@ -25701,9 +25707,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:348 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--zero-commit" -msgstr "" +msgstr "--zero-commit" #. type: Plain text #: en/git-format-patch.txt:351 @@ -25789,7 +25795,7 @@ msgstr "" #. type: delimited block - #: en/git-format-patch.txt:415 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "Do the same for ia64 so we can have sleek & trim looking\n" "...\n" @@ -25797,7 +25803,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:423 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]." msgstr "" @@ -25809,7 +25815,7 @@ msgstr "" #. type: delimited block - #: en/git-format-patch.txt:433 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "...\n" "> So we should do such-and-such.\n" @@ -25831,7 +25837,7 @@ msgstr "" #. type: delimited block - #: en/git-format-patch.txt:441 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "arch/arm config files were slimmed down using a python script\n" "...\n" @@ -26005,7 +26011,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:542 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"." msgstr "" @@ -26142,7 +26148,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:616 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Use Message -> Insert file... and insert the patch." msgstr "" @@ -26299,15 +26305,15 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:724 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-am[1], linkgit:git-send-email[1]" -msgstr "" +msgstr "linkgit:git-am[1], linkgit:git-send-email[1]" #. type: Title = #: en/git-fsck-objects.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-fsck-objects(1)" -msgstr "" +msgstr "git-fsck-objects(1)" #. type: Plain text #: en/git-fsck-objects.txt:7 @@ -26317,7 +26323,7 @@ msgstr "" #. type: Plain text #: en/git-fsck-objects.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git fsck-objects' ...\n" msgstr "" @@ -26329,9 +26335,9 @@ msgstr "" #. type: Title = #: en/git-fsck.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-fsck(1)" -msgstr "" +msgstr "git-fsck(1)" #. type: Plain text #: en/git-fsck.txt:7 @@ -26363,9 +26369,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:30 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unreachable" -msgstr "" +msgstr "--unreachable" #. type: Plain text #: en/git-fsck.txt:33 @@ -26375,9 +26381,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]dangling" -msgstr "" +msgstr "--[no-]dangling" #. type: Plain text #: en/git-fsck.txt:37 @@ -26399,9 +26405,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--cache" -msgstr "" +msgstr "--cache" #. type: Plain text #: en/git-fsck.txt:47 @@ -26411,9 +26417,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-reflogs" -msgstr "" +msgstr "--no-reflogs" #. type: Plain text #: en/git-fsck.txt:53 @@ -26423,9 +26429,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:54 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--full" -msgstr "" +msgstr "--full" #. type: Plain text #: en/git-fsck.txt:63 @@ -26435,9 +26441,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--connectivity-only" -msgstr "" +msgstr "--connectivity-only" #. type: Plain text #: en/git-fsck.txt:72 @@ -26453,9 +26459,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--strict" -msgstr "" +msgstr "--strict" #. type: Plain text #: en/git-fsck.txt:84 @@ -26471,9 +26477,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:88 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--lost-found" -msgstr "" +msgstr "--lost-found" #. type: Plain text #: en/git-fsck.txt:93 @@ -26483,9 +26489,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--name-objects" -msgstr "" +msgstr "--name-objects" #. type: Plain text #: en/git-fsck.txt:99 @@ -26603,9 +26609,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:164 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_OBJECT_DIRECTORY" -msgstr "" +msgstr "GIT_OBJECT_DIRECTORY" #. type: Plain text #: en/git-fsck.txt:166 @@ -26615,9 +26621,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:167 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_INDEX_FILE" -msgstr "" +msgstr "GIT_INDEX_FILE" #. type: Plain text #: en/git-fsck.txt:169 @@ -26627,9 +26633,9 @@ msgstr "" #. type: Labeled list #: en/git-fsck.txt:170 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES" -msgstr "" +msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES" #. type: Plain text #: en/git-fsck.txt:172 @@ -26639,9 +26645,9 @@ msgstr "" #. type: Title = #: en/git-gc.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-gc(1)" -msgstr "" +msgstr "git-gc(1)" #. type: Plain text #: en/git-gc.txt:7 @@ -26675,9 +26681,9 @@ msgstr "" #. type: Labeled list #: en/git-gc.txt:37 en/git-read-tree.txt:72 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--aggressive" -msgstr "" +msgstr "--aggressive" #. type: Plain text #: en/git-gc.txt:43 @@ -26687,9 +26693,9 @@ msgstr "" #. type: Labeled list #: en/git-gc.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--auto" -msgstr "" +msgstr "--auto" #. type: Plain text #: en/git-gc.txt:47 @@ -26705,7 +26711,7 @@ msgstr "" #. type: Plain text #: en/git-gc.txt:55 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well." msgstr "" @@ -26723,9 +26729,9 @@ msgstr "" #. type: Labeled list #: en/git-gc.txt:65 en/git-pack-refs.txt:57 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-prune" -msgstr "" +msgstr "--no-prune" #. type: Plain text #: en/git-gc.txt:67 @@ -26747,9 +26753,9 @@ msgstr "" #. type: Labeled list #: en/git-gc.txt:75 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-largest-pack" -msgstr "" +msgstr "--keep-largest-pack" #. type: Plain text #: en/git-gc.txt:79 @@ -26831,15 +26837,15 @@ msgstr "" #. type: Plain text #: en/git-gc.txt:158 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]" -msgstr "" +msgstr "linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-rerere[1]" #. type: Title = #: en/git-get-tar-commit-id.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-get-tar-commit-id(1)" -msgstr "" +msgstr "git-get-tar-commit-id(1)" #. type: Plain text #: en/git-get-tar-commit-id.txt:7 @@ -26867,9 +26873,9 @@ msgstr "" #. type: Title = #: en/git-grep.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-grep(1)" -msgstr "" +msgstr "git-grep(1)" #. type: Plain text #: en/git-grep.txt:7 @@ -26879,7 +26885,7 @@ msgstr "" #. type: Plain text #: en/git-grep.txt:32 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n" "\t [-v | --invert-match] [-h|-H] [--full-name]\n" @@ -27007,9 +27013,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:82 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--untracked" -msgstr "" +msgstr "--untracked" #. type: Plain text #: en/git-grep.txt:85 @@ -27019,9 +27025,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:86 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-exclude-standard" -msgstr "" +msgstr "--no-exclude-standard" #. type: Plain text #: en/git-grep.txt:89 @@ -27031,9 +27037,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:90 en/git-ls-files.txt:98 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--exclude-standard" -msgstr "" +msgstr "--exclude-standard" #. type: Plain text #: en/git-grep.txt:94 @@ -27097,9 +27103,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:129 en/git-submodule.txt:410 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--recursive" -msgstr "" +msgstr "--recursive" #. type: Plain text #: en/git-grep.txt:131 @@ -27109,9 +27115,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:132 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-recursive" -msgstr "" +msgstr "--no-recursive" #. type: Plain text #: en/git-grep.txt:134 @@ -27121,9 +27127,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:136 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--word-regexp" -msgstr "" +msgstr "--word-regexp" #. type: Plain text #: en/git-grep.txt:140 @@ -27133,9 +27139,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--invert-match" -msgstr "" +msgstr "--invert-match" #. type: Plain text #: en/git-grep.txt:144 @@ -27151,9 +27157,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:69 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--full-name" -msgstr "" +msgstr "--full-name" #. type: Plain text #: en/git-grep.txt:158 en/git-ls-files.txt:149 @@ -27169,9 +27175,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:160 en/rev-list-options.txt:83 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--extended-regexp" -msgstr "" +msgstr "--extended-regexp" #. type: Labeled list #: en/git-grep.txt:161 @@ -27181,9 +27187,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:162 en/rev-list-options.txt:78 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--basic-regexp" -msgstr "" +msgstr "--basic-regexp" #. type: Plain text #: en/git-grep.txt:165 @@ -27193,9 +27199,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:167 en/rev-list-options.txt:93 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--perl-regexp" -msgstr "" +msgstr "--perl-regexp" #. type: Plain text #: en/git-grep.txt:169 @@ -27217,9 +27223,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:175 en/rev-list-options.txt:88 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--fixed-strings" -msgstr "" +msgstr "--fixed-strings" #. type: Plain text #: en/git-grep.txt:178 @@ -27229,9 +27235,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:180 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--line-number" -msgstr "" +msgstr "--line-number" #. type: Plain text #: en/git-grep.txt:182 @@ -27241,9 +27247,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:183 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--column" -msgstr "" +msgstr "--column" #. type: Plain text #: en/git-grep.txt:186 @@ -27253,9 +27259,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:188 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--files-with-matches" -msgstr "" +msgstr "--files-with-matches" #. type: Labeled list #: en/git-grep.txt:190 @@ -27265,9 +27271,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:191 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--files-without-match" -msgstr "" +msgstr "--files-without-match" #. type: Plain text #: en/git-grep.txt:196 @@ -27301,9 +27307,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:215 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--only-matching" -msgstr "" +msgstr "--only-matching" #. type: Plain text #: en/git-grep.txt:218 @@ -27313,9 +27319,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:220 en/rev-list-options.txt:1109 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--count" -msgstr "" +msgstr "--count" #. type: Plain text #: en/git-grep.txt:223 @@ -27337,9 +27343,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:233 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--break" -msgstr "" +msgstr "--break" #. type: Plain text #: en/git-grep.txt:235 @@ -27349,9 +27355,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:236 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--heading" -msgstr "" +msgstr "--heading" #. type: Plain text #: en/git-grep.txt:239 @@ -27361,9 +27367,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:241 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-function" -msgstr "" +msgstr "--show-function" #. type: Plain text #: en/git-grep.txt:247 @@ -27493,25 +27499,25 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:303 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--and" -msgstr "" +msgstr "--and" #. type: Labeled list #: en/git-grep.txt:304 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--or" -msgstr "" +msgstr "--or" #. type: Labeled list #: en/git-grep.txt:305 en/git-rev-parse.txt:139 en/rev-list-options.txt:133 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--not" -msgstr "" +msgstr "--not" #. type: Labeled list #: en/git-grep.txt:306 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "( ... )" msgstr "" @@ -27523,9 +27529,9 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:312 en/rev-list-options.txt:65 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--all-match" -msgstr "" +msgstr "--all-match" #. type: Plain text #: en/git-grep.txt:316 @@ -27541,7 +27547,7 @@ msgstr "" #. type: Labeled list #: en/git-grep.txt:322 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<tree>..." msgstr "" @@ -27631,9 +27637,9 @@ msgstr "" #. type: Title = #: en/git-gui.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-gui(1)" -msgstr "" +msgstr "git-gui(1)" #. type: Plain text #: en/git-gui.txt:7 @@ -27853,9 +27859,9 @@ msgstr "" #. type: Title = #: en/git-hash-object.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-hash-object(1)" -msgstr "" +msgstr "git-hash-object(1)" #. type: Plain text #: en/git-hash-object.txt:7 @@ -27865,7 +27871,7 @@ msgstr "" #. type: Plain text #: en/git-hash-object.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n" "'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n" @@ -27903,9 +27909,9 @@ msgstr "" #. type: Labeled list #: en/git-hash-object.txt:35 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stdin-paths" -msgstr "" +msgstr "--stdin-paths" #. type: Plain text #: en/git-hash-object.txt:38 @@ -27921,9 +27927,9 @@ msgstr "" #. type: Labeled list #: en/git-hash-object.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-filters" -msgstr "" +msgstr "--no-filters" #. type: Plain text #: en/git-hash-object.txt:54 @@ -27933,9 +27939,9 @@ msgstr "" #. type: Labeled list #: en/git-hash-object.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--literally" -msgstr "" +msgstr "--literally" #. type: Plain text #: en/git-hash-object.txt:60 @@ -27945,9 +27951,9 @@ msgstr "" #. type: Title = #: en/git-help.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-help(1)" -msgstr "" +msgstr "git-help(1)" #. type: Plain text #: en/git-help.txt:7 @@ -27995,7 +28001,7 @@ msgstr "" #. type: Plain text #: en/git-help.txt:38 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter." msgstr "" @@ -28025,9 +28031,9 @@ msgstr "" #. type: Labeled list #: en/git-help.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--config" -msgstr "" +msgstr "--config" #. type: Plain text #: en/git-help.txt:58 @@ -28037,9 +28043,9 @@ msgstr "" #. type: Labeled list #: en/git-help.txt:60 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--guides" -msgstr "" +msgstr "--guides" #. type: Plain text #: en/git-help.txt:63 @@ -28049,9 +28055,9 @@ msgstr "" #. type: Labeled list #: en/git-help.txt:65 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--info" -msgstr "" +msgstr "--info" #. type: Plain text #: en/git-help.txt:68 @@ -28061,9 +28067,9 @@ msgstr "" #. type: Labeled list #: en/git-help.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--man" -msgstr "" +msgstr "--man" #. type: Plain text #: en/git-help.txt:74 @@ -28079,9 +28085,9 @@ msgstr "" #. type: Labeled list #: en/git-help.txt:80 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--web" -msgstr "" +msgstr "--web" #. type: Plain text #: en/git-help.txt:83 @@ -28103,9 +28109,9 @@ msgstr "" #. type: Title ~ #: en/git-help.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "help.format" -msgstr "" +msgstr "help.format" #. type: Plain text #: en/git-help.txt:100 @@ -28304,9 +28310,9 @@ msgstr "" #. type: Title = #: en/git-http-backend.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-http-backend(1)" -msgstr "" +msgstr "git-http-backend(1)" #. type: Plain text #: en/git-http-backend.txt:7 @@ -28445,7 +28451,7 @@ msgstr "" #. type: delimited block - #: en/git-http-backend.txt:102 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "\tAuthType Basic\n" "\tAuthName \"Git Access\"\n" @@ -28463,7 +28469,7 @@ msgstr "" #. type: delimited block - #: en/git-http-backend.txt:115 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "<LocationMatch \"^/git/.*/git-receive-pack$\">\n" "\tAuthType Basic\n" @@ -28487,7 +28493,7 @@ msgstr "" #. type: delimited block - #: en/git-http-backend.txt:136 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "<Location /git/private>\n" "\tAuthType Basic\n" @@ -28637,7 +28643,7 @@ msgstr "" #. type: delimited block - #: en/git-http-backend.txt:231 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "auth.require = (\n" "\t\"/\" => (\n" @@ -28732,9 +28738,9 @@ msgstr "" #. type: Title = #: en/git-http-fetch.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-http-fetch(1)" -msgstr "" +msgstr "git-http-fetch(1)" #. type: Plain text #: en/git-http-fetch.txt:7 @@ -28828,9 +28834,9 @@ msgstr "" #. type: Labeled list #: en/git-http-fetch.txt:50 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--recover" -msgstr "" +msgstr "--recover" #. type: Plain text #: en/git-http-fetch.txt:53 @@ -28840,9 +28846,9 @@ msgstr "" #. type: Title = #: en/git-http-push.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-http-push(1)" -msgstr "" +msgstr "git-http-push(1)" #. type: Plain text #: en/git-http-push.txt:7 @@ -28852,7 +28858,7 @@ msgstr "" #. type: Plain text #: en/git-http-push.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n" msgstr "" @@ -28921,7 +28927,7 @@ msgstr "" #. type: Labeled list #: en/git-http-push.txt:54 en/git-send-pack.txt:98 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<ref>..." msgstr "" @@ -28993,9 +28999,9 @@ msgstr "" #. type: Title = #: en/git-imap-send.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-imap-send(1)" -msgstr "" +msgstr "git-imap-send(1)" #. type: Plain text #: en/git-imap-send.txt:7 @@ -29035,9 +29041,9 @@ msgstr "" #. type: Labeled list #: en/git-imap-send.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--curl" -msgstr "" +msgstr "--curl" #. type: Plain text #: en/git-imap-send.txt:44 @@ -29047,9 +29053,9 @@ msgstr "" #. type: Labeled list #: en/git-imap-send.txt:45 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-curl" -msgstr "" +msgstr "--no-curl" #. type: Plain text #: en/git-imap-send.txt:49 @@ -29196,9 +29202,9 @@ msgstr "" #. type: Title = #: en/git-index-pack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-index-pack(1)" -msgstr "" +msgstr "git-index-pack(1)" #. type: Plain text #: en/git-index-pack.txt:7 @@ -29247,9 +29253,9 @@ msgstr "" #. type: Labeled list #: en/git-index-pack.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--fix-thin" -msgstr "" +msgstr "--fix-thin" #. type: Plain text #: en/git-index-pack.txt:53 @@ -29301,9 +29307,9 @@ msgstr "" #. type: Labeled list #: en/git-index-pack.txt:80 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--fsck-objects" -msgstr "" +msgstr "--fsck-objects" #. type: Plain text #: en/git-index-pack.txt:82 @@ -29373,9 +29379,9 @@ msgstr "" #. type: Title = #: en/git-init-db.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-init-db(1)" -msgstr "" +msgstr "git-init-db(1)" #. type: Plain text #: en/git-init-db.txt:7 @@ -29397,9 +29403,9 @@ msgstr "" #. type: Title = #: en/git-init.txt:2 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "git-init(1)" -msgstr "" +msgstr "git-init(1)" #. type: Plain text #: en/git-init.txt:7 @@ -29418,235 +29424,235 @@ msgid "" msgstr "" #. type: Plain text -#: en/git-init.txt:25 +#: en/git-init.txt:26 #, priority:300 -msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created." +msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial branch without any commits will be created (see the `--initial-branch` option below for its name)." msgstr "" #. type: Plain text -#: en/git-init.txt:28 +#: en/git-init.txt:29 #, priority:300 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository." msgstr "" #. type: Plain text -#: en/git-init.txt:33 +#: en/git-init.txt:34 #, priority:300 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used." msgstr "" #. type: Plain text -#: en/git-init.txt:38 +#: en/git-init.txt:39 #, priority:300 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)." msgstr "" #. type: Plain text -#: en/git-init.txt:46 +#: en/git-init.txt:47 #, priority:300 msgid "Only print error and warning messages; all other output will be suppressed." msgstr "" #. type: Plain text -#: en/git-init.txt:51 +#: en/git-init.txt:52 #, priority:300 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory." msgstr "" #. type: Labeled list -#: en/git-init.txt:52 +#: en/git-init.txt:53 #, no-wrap, priority:300 msgid "--object-format=<format>" msgstr "" #. type: Plain text -#: en/git-init.txt:56 +#: en/git-init.txt:57 #, priority:300 msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default." msgstr "" #. type: Plain text -#: en/git-init.txt:63 +#: en/git-init.txt:64 #, priority:300 msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)" msgstr "" #. type: Plain text -#: en/git-init.txt:70 +#: en/git-init.txt:71 #, priority:300 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository." msgstr "" #. type: Plain text -#: en/git-init.txt:72 +#: en/git-init.txt:73 #, priority:300 msgid "If this is reinitialization, the repository will be moved to the specified path." msgstr "" #. type: Labeled list -#: en/git-init.txt:73 +#: en/git-init.txt:74 #, no-wrap, priority:300 msgid "-b <branch-name>" msgstr "" #. type: Labeled list -#: en/git-init.txt:74 +#: en/git-init.txt:75 #, no-wrap, priority:300 msgid "--initial-branch=<branch-name>" msgstr "" #. type: Plain text -#: en/git-init.txt:78 +#: en/git-init.txt:81 #, priority:300 -msgid "Use the specified name for the initial branch in the newly created repository. If not specified, fall back to the default name: `master`." +msgid "Use the specified name for the initial branch in the newly created repository. If not specified, fall back to the default name (currently `master`, but this is subject to change in the future; the name can be customized via the `init.defaultBranch` configuration variable)." msgstr "" #. type: Labeled list -#: en/git-init.txt:79 +#: en/git-init.txt:82 #, no-wrap, priority:300 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]" msgstr "" #. type: Plain text -#: en/git-init.txt:87 +#: en/git-init.txt:90 #, priority:300 msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)." msgstr "" #. type: Plain text -#: en/git-init.txt:90 +#: en/git-init.txt:93 #, priority:300 msgid "The option can have the following values, defaulting to 'group' if no value is given:" msgstr "" #. type: Labeled list -#: en/git-init.txt:92 +#: en/git-init.txt:95 #, no-wrap, priority:300 msgid "'umask' (or 'false')" msgstr "" #. type: Plain text -#: en/git-init.txt:96 +#: en/git-init.txt:99 #, priority:300 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified." msgstr "" #. type: Labeled list -#: en/git-init.txt:97 +#: en/git-init.txt:100 #, no-wrap, priority:300 msgid "'group' (or 'true')" msgstr "" #. type: Plain text -#: en/git-init.txt:105 +#: en/git-init.txt:108 #, priority:300 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions." msgstr "" #. type: Labeled list -#: en/git-init.txt:106 +#: en/git-init.txt:109 #, no-wrap, priority:300 msgid "'all' (or 'world' or 'everybody')" msgstr "" #. type: Plain text -#: en/git-init.txt:109 +#: en/git-init.txt:112 #, priority:300 msgid "Same as 'group', but make the repository readable by all users." msgstr "" #. type: Labeled list -#: en/git-init.txt:110 +#: en/git-init.txt:113 #, no-wrap, priority:300 msgid "'0xxx'" msgstr "" #. type: Plain text -#: en/git-init.txt:117 +#: en/git-init.txt:120 #, priority:300 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others." msgstr "" #. type: Plain text -#: en/git-init.txt:122 +#: en/git-init.txt:125 #, priority:300 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it." msgstr "" #. type: Plain text -#: en/git-init.txt:125 +#: en/git-init.txt:128 #, priority:300 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created." msgstr "" #. type: Title - -#: en/git-init.txt:127 +#: en/git-init.txt:130 #, no-wrap, priority:300 msgid "TEMPLATE DIRECTORY" msgstr "" #. type: Plain text -#: en/git-init.txt:131 +#: en/git-init.txt:134 #, priority:300 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created." msgstr "" #. type: Plain text -#: en/git-init.txt:133 +#: en/git-init.txt:136 #, priority:300 msgid "The template directory will be one of the following (in order):" msgstr "" #. type: Plain text -#: en/git-init.txt:135 +#: en/git-init.txt:138 #, priority:300 msgid "the argument given with the `--template` option;" msgstr "" #. type: Plain text -#: en/git-init.txt:137 +#: en/git-init.txt:140 #, priority:300 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;" msgstr "" #. type: Plain text -#: en/git-init.txt:139 +#: en/git-init.txt:142 #, priority:300 msgid "the `init.templateDir` configuration variable; or" msgstr "" #. type: Plain text -#: en/git-init.txt:141 +#: en/git-init.txt:144 #, priority:300 msgid "the default template directory: `/usr/share/git-core/templates`." msgstr "" #. type: Plain text -#: en/git-init.txt:144 +#: en/git-init.txt:147 #, priority:300 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files." msgstr "" #. type: Plain text -#: en/git-init.txt:147 +#: en/git-init.txt:150 #, priority:300 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix." msgstr "" #. type: Plain text -#: en/git-init.txt:149 +#: en/git-init.txt:152 #, priority:300 msgid "See linkgit:githooks[5] for more general info on hook execution." msgstr "" #. type: Labeled list -#: en/git-init.txt:153 +#: en/git-init.txt:156 #, no-wrap, priority:300 msgid "Start a new Git repository for an existing code base" msgstr "" #. type: delimited block - -#: en/git-init.txt:160 +#: en/git-init.txt:163 #, no-wrap, priority:300 msgid "" "$ cd /path/to/my/codebase\n" @@ -29656,28 +29662,28 @@ msgid "" msgstr "" #. type: Plain text -#: en/git-init.txt:163 +#: en/git-init.txt:166 #, priority:300 msgid "Create a /path/to/my/codebase/.git directory." msgstr "" #. type: Plain text -#: en/git-init.txt:164 +#: en/git-init.txt:167 #, priority:300 msgid "Add all existing files to the index." msgstr "" #. type: Plain text -#: en/git-init.txt:165 +#: en/git-init.txt:168 #, priority:300 msgid "Record the pristine state as the first commit in the history." msgstr "" #. type: Title = #: en/git-instaweb.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-instaweb(1)" -msgstr "" +msgstr "git-instaweb(1)" #. type: Plain text #: en/git-instaweb.txt:7 @@ -29708,9 +29714,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--httpd" -msgstr "" +msgstr "--httpd" #. type: Plain text #: en/git-instaweb.txt:35 @@ -29720,9 +29726,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--module-path" -msgstr "" +msgstr "--module-path" #. type: Plain text #: en/git-instaweb.txt:40 @@ -29732,9 +29738,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:42 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--port" -msgstr "" +msgstr "--port" #. type: Plain text #: en/git-instaweb.txt:44 @@ -29744,9 +29750,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--browser" -msgstr "" +msgstr "--browser" #. type: Plain text #: en/git-instaweb.txt:52 @@ -29762,9 +29768,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:54 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--start" -msgstr "" +msgstr "--start" #. type: Plain text #: en/git-instaweb.txt:57 @@ -29780,9 +29786,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:59 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stop" -msgstr "" +msgstr "--stop" #. type: Plain text #: en/git-instaweb.txt:63 @@ -29798,9 +29804,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:65 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--restart" -msgstr "" +msgstr "--restart" #. type: Plain text #: en/git-instaweb.txt:68 @@ -29834,9 +29840,9 @@ msgstr "" #. type: Title = #: en/git-interpret-trailers.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-interpret-trailers(1)" -msgstr "" +msgstr "git-interpret-trailers(1)" #. type: Plain text #: en/git-interpret-trailers.txt:7 @@ -29846,7 +29852,7 @@ msgstr "" #. type: Plain text #: en/git-interpret-trailers.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n" "'git interpret-trailers' [<options>] [--parse] [<file>...]\n" @@ -29920,9 +29926,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:74 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--in-place" -msgstr "" +msgstr "--in-place" #. type: Plain text #: en/git-interpret-trailers.txt:76 @@ -29932,9 +29938,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:77 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--trim-empty" -msgstr "" +msgstr "--trim-empty" #. type: Plain text #: en/git-interpret-trailers.txt:81 @@ -29962,9 +29968,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:88 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-where" -msgstr "" +msgstr "--no-where" #. type: Plain text #: en/git-interpret-trailers.txt:94 @@ -29980,9 +29986,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:96 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-if-exists" -msgstr "" +msgstr "--no-if-exists" #. type: Plain text #: en/git-interpret-trailers.txt:103 @@ -29998,9 +30004,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:105 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-if-missing" -msgstr "" +msgstr "--no-if-missing" #. type: Plain text #: en/git-interpret-trailers.txt:112 @@ -30010,9 +30016,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:113 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--only-trailers" -msgstr "" +msgstr "--only-trailers" #. type: Plain text #: en/git-interpret-trailers.txt:115 @@ -30022,9 +30028,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:116 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--only-input" -msgstr "" +msgstr "--only-input" #. type: Plain text #: en/git-interpret-trailers.txt:120 @@ -30034,9 +30040,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:121 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unfold" -msgstr "" +msgstr "--unfold" #. type: Plain text #: en/git-interpret-trailers.txt:124 @@ -30046,9 +30052,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:125 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--parse" -msgstr "" +msgstr "--parse" #. type: Plain text #: en/git-interpret-trailers.txt:128 @@ -30058,9 +30064,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:129 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-divider" -msgstr "" +msgstr "--no-divider" #. type: Plain text #: en/git-interpret-trailers.txt:133 @@ -30498,15 +30504,15 @@ msgstr "" #. type: Plain text #: en/git-interpret-trailers.txt:387 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]" #. type: Title = #: en/git-log.txt:2 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "git-log(1)" -msgstr "" +msgstr "git-log(1)" #. type: Plain text #: en/git-log.txt:7 @@ -30516,7 +30522,7 @@ msgstr "" #. type: Plain text #: en/git-log.txt:13 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n" msgstr "" @@ -30534,9 +30540,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:30 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--follow" -msgstr "" +msgstr "--follow" #. type: Plain text #: en/git-log.txt:33 @@ -30546,9 +30552,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:34 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-decorate" -msgstr "" +msgstr "--no-decorate" #. type: Labeled list #: en/git-log.txt:35 @@ -30582,9 +30588,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:54 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--source" -msgstr "" +msgstr "--source" #. type: Plain text #: en/git-log.txt:57 @@ -30594,15 +30600,15 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:58 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--[no-]mailmap" -msgstr "" +msgstr "--[no-]mailmap" #. type: Labeled list #: en/git-log.txt:59 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--[no-]use-mailmap" -msgstr "" +msgstr "--[no-]use-mailmap" #. type: Plain text #: en/git-log.txt:63 @@ -30612,13 +30618,13 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:64 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--full-diff" -msgstr "" +msgstr "--full-diff" #. type: Plain text #: en/git-log.txt:70 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Without this flag, `git log -p <path>...` shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits." msgstr "" @@ -30630,9 +30636,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:74 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--log-size" -msgstr "" +msgstr "--log-size" #. type: Plain text #: en/git-log.txt:79 @@ -30654,7 +30660,7 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:91 en/git-shortlog.txt:101 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "[--] <path>..." msgstr "" @@ -30714,9 +30720,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:146 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-diff-merges" -msgstr "" +msgstr "--no-diff-merges" #. type: Plain text #: en/git-log.txt:149 @@ -30852,9 +30858,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:223 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "format.pretty" -msgstr "" +msgstr "format.pretty" #. type: Plain text #: en/git-log.txt:226 @@ -30864,9 +30870,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:227 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "i18n.logOutputEncoding" -msgstr "" +msgstr "i18n.logOutputEncoding" #. type: Plain text #: en/git-log.txt:231 @@ -30876,9 +30882,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:232 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "log.date" -msgstr "" +msgstr "log.date" #. type: Plain text #: en/git-log.txt:236 @@ -30894,9 +30900,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:241 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "log.follow" -msgstr "" +msgstr "log.follow" #. type: Plain text #: en/git-log.txt:246 @@ -30906,9 +30912,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:247 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "log.showRoot" -msgstr "" +msgstr "log.showRoot" #. type: Plain text #: en/git-log.txt:252 @@ -30918,9 +30924,9 @@ msgstr "" #. type: Labeled list #: en/git-log.txt:253 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "log.showSignature" -msgstr "" +msgstr "log.showSignature" #. type: Plain text #: en/git-log.txt:256 @@ -30966,9 +30972,9 @@ msgstr "" #. type: Title = #: en/git-ls-files.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-ls-files(1)" -msgstr "" +msgstr "git-ls-files(1)" #. type: Plain text #: en/git-ls-files.txt:7 @@ -30978,7 +30984,7 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:23 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git ls-files' [-z] [-t] [-v] [-f]\n" "\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n" @@ -31013,9 +31019,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--deleted" -msgstr "" +msgstr "--deleted" #. type: Plain text #: en/git-ls-files.txt:42 @@ -31025,9 +31031,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--modified" -msgstr "" +msgstr "--modified" #. type: Plain text #: en/git-ls-files.txt:46 @@ -31037,9 +31043,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--others" -msgstr "" +msgstr "--others" #. type: Plain text #: en/git-ls-files.txt:50 @@ -31049,9 +31055,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignored" -msgstr "" +msgstr "--ignored" #. type: Plain text #: en/git-ls-files.txt:58 @@ -31061,9 +31067,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:60 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stage" -msgstr "" +msgstr "--stage" #. type: Plain text #: en/git-ls-files.txt:62 @@ -31073,9 +31079,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:63 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--directory" -msgstr "" +msgstr "--directory" #. type: Plain text #: en/git-ls-files.txt:66 @@ -31085,9 +31091,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:67 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-empty-directory" -msgstr "" +msgstr "--no-empty-directory" #. type: Plain text #: en/git-ls-files.txt:69 @@ -31097,9 +31103,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:71 en/git-update-index.txt:68 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unmerged" -msgstr "" +msgstr "--unmerged" #. type: Plain text #: en/git-ls-files.txt:73 @@ -31109,9 +31115,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:75 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--killed" -msgstr "" +msgstr "--killed" #. type: Plain text #: en/git-ls-files.txt:79 @@ -31175,9 +31181,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:102 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--error-unmatch" -msgstr "" +msgstr "--error-unmatch" #. type: Plain text #: en/git-ls-files.txt:105 @@ -31325,9 +31331,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-files.txt:166 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--eol" -msgstr "" +msgstr "--eol" #. type: Plain text #: en/git-ls-files.txt:171 @@ -31441,15 +31447,15 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:248 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]" -msgstr "" +msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]" #. type: Title = #: en/git-ls-remote.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-ls-remote(1)" -msgstr "" +msgstr "git-ls-remote(1)" #. type: Plain text #: en/git-ls-remote.txt:7 @@ -31459,7 +31465,7 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:15 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" "\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" @@ -31474,9 +31480,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-remote.txt:25 en/git-show-ref.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--heads" -msgstr "" +msgstr "--heads" #. type: Plain text #: en/git-ls-remote.txt:34 @@ -31486,9 +31492,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-remote.txt:35 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--refs" -msgstr "" +msgstr "--refs" #. type: Plain text #: en/git-ls-remote.txt:37 @@ -31522,9 +31528,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-remote.txt:54 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--get-url" -msgstr "" +msgstr "--get-url" #. type: Plain text #: en/git-ls-remote.txt:58 @@ -31534,9 +31540,9 @@ msgstr "" #. type: Labeled list #: en/git-ls-remote.txt:59 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--symref" -msgstr "" +msgstr "--symref" #. type: Plain text #: en/git-ls-remote.txt:64 @@ -31564,7 +31570,7 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:93 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed." msgstr "" @@ -31591,15 +31597,15 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:118 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-check-ref-format[1]." -msgstr "" +msgstr "linkgit:git-check-ref-format[1]." #. type: Title = #: en/git-ls-tree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-ls-tree(1)" -msgstr "" +msgstr "git-ls-tree(1)" #. type: Plain text #: en/git-ls-tree.txt:7 @@ -31609,7 +31615,7 @@ msgstr "" #. type: Plain text #: en/git-ls-tree.txt:15 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n" "\t [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]\n" @@ -31690,7 +31696,7 @@ msgstr "" #. type: Labeled list #: en/git-ls-tree.txt:77 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "[<path>...]" msgstr "" @@ -31738,9 +31744,9 @@ msgstr "" #. type: Title = #: en/git-mailinfo.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-mailinfo(1)" -msgstr "" +msgstr "git-mailinfo(1)" #. type: Plain text #: en/git-mailinfo.txt:7 @@ -31888,9 +31894,9 @@ msgstr "" #. type: Title = #: en/git-mailsplit.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-mailsplit(1)" -msgstr "" +msgstr "git-mailsplit(1)" #. type: Plain text #: en/git-mailsplit.txt:7 @@ -31900,7 +31906,7 @@ msgstr "" #. type: Plain text #: en/git-mailsplit.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n" "\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n" @@ -31986,9 +31992,9 @@ msgstr "" #. type: Labeled list #: en/git-mailsplit.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-cr" -msgstr "" +msgstr "--keep-cr" #. type: Plain text #: en/git-mailsplit.txt:50 @@ -31998,9 +32004,9 @@ msgstr "" #. type: Labeled list #: en/git-mailsplit.txt:51 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--mboxrd" -msgstr "" +msgstr "--mboxrd" #. type: Plain text #: en/git-mailsplit.txt:54 @@ -32010,9 +32016,9 @@ msgstr "" #. type: Title = #: en/git-merge-base.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-merge-base(1)" -msgstr "" +msgstr "git-merge-base(1)" #. type: Plain text #: en/git-merge-base.txt:7 @@ -32022,7 +32028,7 @@ msgstr "" #. type: Plain text #: en/git-merge-base.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git merge-base' [-a|--all] <commit> <commit>...\n" "'git merge-base' [-a|--all] --octopus <commit>...\n" @@ -32063,9 +32069,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-base.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--octopus" -msgstr "" +msgstr "--octopus" #. type: Plain text #: en/git-merge-base.txt:47 @@ -32075,9 +32081,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-base.txt:48 en/git-show-branch.txt:90 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--independent" -msgstr "" +msgstr "--independent" #. type: Plain text #: en/git-merge-base.txt:54 @@ -32087,9 +32093,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-base.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--is-ancestor" -msgstr "" +msgstr "--is-ancestor" #. type: Plain text #: en/git-merge-base.txt:59 @@ -32099,9 +32105,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-base.txt:60 en/git-rebase.txt:441 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--fork-point" -msgstr "" +msgstr "--fork-point" #. type: Plain text #: en/git-merge-base.txt:68 @@ -32219,7 +32225,7 @@ msgstr "" #. type: delimited block . #: en/git-merge-base.txt:148 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "A=$(git rev-parse --verify A)\n" "if test \"$A\" = \"$(git merge-base A B)\"\n" @@ -32236,7 +32242,7 @@ msgstr "" #. type: delimited block . #: en/git-merge-base.txt:157 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "if git merge-base --is-ancestor A B\n" "then\n" @@ -32356,15 +32362,15 @@ msgstr "" #. type: Plain text #: en/git-merge-base.txt:244 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]" -msgstr "" +msgstr "linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]" #. type: Title = #: en/git-merge-file.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-merge-file(1)" -msgstr "" +msgstr "git-merge-file(1)" #. type: Plain text #: en/git-merge-file.txt:7 @@ -32448,9 +32454,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-file.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--diff3" -msgstr "" +msgstr "--diff3" #. type: Plain text #: en/git-merge-file.txt:72 @@ -32460,9 +32466,9 @@ msgstr "" #. type: Labeled list #: en/git-merge-file.txt:75 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--union" -msgstr "" +msgstr "--union" #. type: Plain text #: en/git-merge-file.txt:78 @@ -32496,9 +32502,9 @@ msgstr "" #. type: Title = #: en/git-merge-index.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-merge-index(1)" -msgstr "" +msgstr "git-merge-index(1)" #. type: Plain text #: en/git-merge-index.txt:7 @@ -32597,9 +32603,9 @@ msgstr "" #. type: Title = #: en/git-merge-one-file.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-merge-one-file(1)" -msgstr "" +msgstr "git-merge-one-file(1)" #. type: Plain text #: en/git-merge-one-file.txt:7 @@ -32711,9 +32717,9 @@ msgstr "" #. type: Title = #: en/git-mergetool.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-mergetool(1)" -msgstr "" +msgstr "git-mergetool(1)" #. type: Plain text #: en/git-mergetool.txt:7 @@ -32723,7 +32729,7 @@ msgstr "" #. type: Plain text #: en/git-mergetool.txt:12 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n" msgstr "" @@ -32795,9 +32801,9 @@ msgstr "" #. type: Labeled list #: en/git-mergetool.txt:83 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--gui" -msgstr "" +msgstr "--gui" #. type: Plain text #: en/git-mergetool.txt:89 @@ -32807,9 +32813,9 @@ msgstr "" #. type: Labeled list #: en/git-mergetool.txt:90 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-gui" -msgstr "" +msgstr "--no-gui" #. type: Plain text #: en/git-mergetool.txt:94 @@ -32843,9 +32849,9 @@ msgstr "" #. type: Title = #: en/git-merge-tree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-merge-tree(1)" -msgstr "" +msgstr "git-merge-tree(1)" #. type: Plain text #: en/git-merge-tree.txt:7 @@ -32873,9 +32879,9 @@ msgstr "" #. type: Title = #: en/git-merge.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-merge(1)" -msgstr "" +msgstr "git-merge(1)" #. type: Plain text #: en/git-merge.txt:7 @@ -32885,7 +32891,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:17 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n" "\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n" @@ -33354,15 +33360,15 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:374 -#, priority:240 +#, ignore-same, priority:240 msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]" -msgstr "" +msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]" #. type: Title = #: en/git-mktag.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-mktag(1)" -msgstr "" +msgstr "git-mktag(1)" #. type: Plain text #: en/git-mktag.txt:7 @@ -33418,9 +33424,9 @@ msgstr "" #. type: Title = #: en/git-mktree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-mktree(1)" -msgstr "" +msgstr "git-mktree(1)" #. type: Plain text #: en/git-mktree.txt:7 @@ -33448,9 +33454,9 @@ msgstr "" #. type: Labeled list #: en/git-mktree.txt:26 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--missing" -msgstr "" +msgstr "--missing" #. type: Plain text #: en/git-mktree.txt:31 @@ -33466,9 +33472,9 @@ msgstr "" #. type: Title = #: en/git-mv.txt:2 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "git-mv(1)" -msgstr "" +msgstr "git-mv(1)" #. type: Plain text #: en/git-mv.txt:7 @@ -33478,7 +33484,7 @@ msgstr "" #. type: Plain text #: en/git-mv.txt:13 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git mv' <options>... <args>...\n" msgstr "" @@ -33490,7 +33496,7 @@ msgstr "" #. type: Plain text #: en/git-mv.txt:20 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" " git mv [-v] [-f] [-n] [-k] <source> <destination>\n" " git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n" @@ -33546,9 +33552,9 @@ msgstr "" #. type: Title = #: en/git-name-rev.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-name-rev(1)" -msgstr "" +msgstr "git-name-rev(1)" #. type: Plain text #: en/git-name-rev.txt:7 @@ -33558,7 +33564,7 @@ msgstr "" #. type: Plain text #: en/git-name-rev.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git name-rev' [--tags] [--refs=<pattern>]\n" "\t ( --all | --stdin | <commit-ish>... )\n" @@ -33614,9 +33620,9 @@ msgstr "" #. type: Labeled list #: en/git-name-rev.txt:57 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-undefined" -msgstr "" +msgstr "--no-undefined" #. type: Plain text #: en/git-name-rev.txt:60 @@ -33664,9 +33670,9 @@ msgstr "" #. type: Title = #: en/git-notes.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-notes(1)" -msgstr "" +msgstr "git-notes(1)" #. type: Plain text #: en/git-notes.txt:7 @@ -33676,7 +33682,7 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:23 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git notes' [list [<object>]]\n" "'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n" @@ -33736,9 +33742,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:95 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -33844,9 +33850,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:123 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -33856,9 +33862,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:119 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -33982,9 +33988,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:192 en/merge-options.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--commit" -msgstr "" +msgstr "--commit" #. type: Plain text #: en/git-notes.txt:200 @@ -34012,7 +34018,7 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:229 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]." msgstr "" @@ -34078,7 +34084,7 @@ msgstr "" #. type: delimited block - #: en/git-notes.txt:288 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n" "$ git show -s 72a144e\n" @@ -34117,9 +34123,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:313 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "core.notesRef" -msgstr "" +msgstr "core.notesRef" #. type: Plain text #: en/git-notes.txt:318 @@ -34225,9 +34231,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:375 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_NOTES_REF`" -msgstr "" +msgstr "`GIT_NOTES_REF`" #. type: Plain text #: en/git-notes.txt:378 @@ -34237,9 +34243,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:379 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_NOTES_DISPLAY_REF`" -msgstr "" +msgstr "`GIT_NOTES_DISPLAY_REF`" #. type: Plain text #: en/git-notes.txt:385 @@ -34255,9 +34261,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:389 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_NOTES_REWRITE_MODE`" -msgstr "" +msgstr "`GIT_NOTES_REWRITE_MODE`" #. type: Plain text #: en/git-notes.txt:394 @@ -34267,9 +34273,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:395 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_NOTES_REWRITE_REF`" -msgstr "" +msgstr "`GIT_NOTES_REWRITE_REF`" #. type: Plain text #: en/git-notes.txt:399 @@ -34285,9 +34291,9 @@ msgstr "" #. type: Title = #: en/git-p4.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4(1)" -msgstr "" +msgstr "git-p4(1)" #. type: Plain text #: en/git-p4.txt:7 @@ -34297,7 +34303,7 @@ msgstr "" #. type: Plain text #: en/git-p4.txt:16 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...\n" "'git p4 sync' [<sync options>] [<p4 depot path>...]\n" @@ -34680,9 +34686,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:236 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--detect-branches" -msgstr "" +msgstr "--detect-branches" #. type: Plain text #: en/git-p4.txt:239 @@ -34704,9 +34710,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:245 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--silent" -msgstr "" +msgstr "--silent" #. type: Plain text #: en/git-p4.txt:247 @@ -34716,9 +34722,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:248 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--detect-labels" -msgstr "" +msgstr "--detect-labels" #. type: Plain text #: en/git-p4.txt:252 @@ -34728,9 +34734,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:253 en/git-p4.txt:430 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--import-labels" -msgstr "" +msgstr "--import-labels" #. type: Plain text #: en/git-p4.txt:255 @@ -34740,9 +34746,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:256 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--import-local" -msgstr "" +msgstr "--import-local" #. type: Plain text #: en/git-p4.txt:263 @@ -34776,9 +34782,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:280 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-path" -msgstr "" +msgstr "--keep-path" #. type: Plain text #: en/git-p4.txt:287 @@ -34788,9 +34794,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:288 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--use-client-spec" -msgstr "" +msgstr "--use-client-spec" #. type: Plain text #: en/git-p4.txt:291 @@ -34872,9 +34878,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:323 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--preserve-user" -msgstr "" +msgstr "--preserve-user" #. type: Plain text #: en/git-p4.txt:326 @@ -34884,9 +34890,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:327 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--export-labels" -msgstr "" +msgstr "--export-labels" #. type: Plain text #: en/git-p4.txt:330 @@ -34902,9 +34908,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:336 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--prepare-p4-only" -msgstr "" +msgstr "--prepare-p4-only" #. type: Plain text #: en/git-p4.txt:342 @@ -34914,9 +34920,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:343 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--shelve" -msgstr "" +msgstr "--shelve" #. type: Plain text #: en/git-p4.txt:347 @@ -34974,9 +34980,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:368 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--disable-rebase" -msgstr "" +msgstr "--disable-rebase" #. type: Plain text #: en/git-p4.txt:371 @@ -34986,9 +34992,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:372 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--disable-p4sync" -msgstr "" +msgstr "--disable-p4sync" #. type: Plain text #: en/git-p4.txt:376 @@ -35094,9 +35100,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:436 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--origin" -msgstr "" +msgstr "--origin" #. type: Plain text #: en/git-p4.txt:439 @@ -35184,7 +35190,7 @@ msgstr "" #. type: Plain text #: en/git-p4.txt:486 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' knows only a subset of the view syntax. It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace. Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path. 'git p4' will complain if it encounters an unhandled wildcard." msgstr "" @@ -35226,7 +35232,7 @@ msgstr "" #. type: delimited block - #: en/git-p4.txt:516 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "//depot/main/...\n" "//depot/branch1/...\n" @@ -35240,7 +35246,7 @@ msgstr "" #. type: delimited block - #: en/git-p4.txt:521 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "//depot/main/... //depot/branch1/...\n" msgstr "" @@ -35298,9 +35304,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:562 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.user" -msgstr "" +msgstr "git-p4.user" #. type: Plain text #: en/git-p4.txt:565 @@ -35310,9 +35316,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:566 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.password" -msgstr "" +msgstr "git-p4.password" #. type: Plain text #: en/git-p4.txt:570 @@ -35322,9 +35328,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:571 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.port" -msgstr "" +msgstr "git-p4.port" #. type: Plain text #: en/git-p4.txt:575 @@ -35334,9 +35340,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:576 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.host" -msgstr "" +msgstr "git-p4.host" #. type: Plain text #: en/git-p4.txt:580 @@ -35346,9 +35352,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:581 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.client" -msgstr "" +msgstr "git-p4.client" #. type: Plain text #: en/git-p4.txt:584 @@ -35358,9 +35364,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:585 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.retries" -msgstr "" +msgstr "git-p4.retries" #. type: Plain text #: en/git-p4.txt:590 @@ -35376,9 +35382,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:593 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.syncFromOrigin" -msgstr "" +msgstr "git-p4.syncFromOrigin" #. type: Plain text #: en/git-p4.txt:599 @@ -35388,9 +35394,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:600 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.branchUser" -msgstr "" +msgstr "git-p4.branchUser" #. type: Plain text #: en/git-p4.txt:605 @@ -35400,9 +35406,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:606 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.branchList" -msgstr "" +msgstr "git-p4.branchList" #. type: Plain text #: en/git-p4.txt:611 @@ -35432,9 +35438,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:621 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.importLabels" -msgstr "" +msgstr "git-p4.importLabels" #. type: Plain text #: en/git-p4.txt:623 @@ -35444,9 +35450,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:624 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.labelImportRegexp" -msgstr "" +msgstr "git-p4.labelImportRegexp" #. type: Plain text #: en/git-p4.txt:627 @@ -35456,9 +35462,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:628 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.useClientSpec" -msgstr "" +msgstr "git-p4.useClientSpec" #. type: Plain text #: en/git-p4.txt:633 @@ -35468,9 +35474,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:634 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.pathEncoding" -msgstr "" +msgstr "git-p4.pathEncoding" #. type: Plain text #: en/git-p4.txt:640 @@ -35480,9 +35486,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:641 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.largeFileSystem" -msgstr "" +msgstr "git-p4.largeFileSystem" #. type: Plain text #: en/git-p4.txt:647 @@ -35498,9 +35504,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:652 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.largeFileExtensions" -msgstr "" +msgstr "git-p4.largeFileExtensions" #. type: Plain text #: en/git-p4.txt:655 @@ -35510,9 +35516,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:656 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.largeFileThreshold" -msgstr "" +msgstr "git-p4.largeFileThreshold" #. type: Plain text #: en/git-p4.txt:660 @@ -35522,9 +35528,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:661 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.largeFileCompressedThreshold" -msgstr "" +msgstr "git-p4.largeFileCompressedThreshold" #. type: Plain text #: en/git-p4.txt:666 @@ -35534,9 +35540,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:667 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.largeFilePush" -msgstr "" +msgstr "git-p4.largeFilePush" #. type: Plain text #: en/git-p4.txt:670 @@ -35546,9 +35552,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:671 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.keepEmptyCommits" -msgstr "" +msgstr "git-p4.keepEmptyCommits" #. type: Plain text #: en/git-p4.txt:674 @@ -35558,9 +35564,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:675 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.mapUser" -msgstr "" +msgstr "git-p4.mapUser" #. type: Plain text #: en/git-p4.txt:678 @@ -35588,9 +35594,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:688 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.detectRenames" -msgstr "" +msgstr "git-p4.detectRenames" #. type: Plain text #: en/git-p4.txt:691 @@ -35600,9 +35606,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:692 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.detectCopies" -msgstr "" +msgstr "git-p4.detectCopies" #. type: Plain text #: en/git-p4.txt:695 @@ -35612,9 +35618,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:696 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.detectCopiesHarder" -msgstr "" +msgstr "git-p4.detectCopiesHarder" #. type: Plain text #: en/git-p4.txt:698 @@ -35624,9 +35630,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:699 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.preserveUser" -msgstr "" +msgstr "git-p4.preserveUser" #. type: Plain text #: en/git-p4.txt:702 @@ -35648,9 +35654,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:708 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.skipSubmitEdit" -msgstr "" +msgstr "git-p4.skipSubmitEdit" #. type: Plain text #: en/git-p4.txt:712 @@ -35660,9 +35666,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:713 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.skipSubmitEditCheck" -msgstr "" +msgstr "git-p4.skipSubmitEditCheck" #. type: Plain text #: en/git-p4.txt:717 @@ -35672,9 +35678,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:718 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.allowSubmit" -msgstr "" +msgstr "git-p4.allowSubmit" #. type: Plain text #: en/git-p4.txt:724 @@ -35684,9 +35690,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:725 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.skipUserNameCheck" -msgstr "" +msgstr "git-p4.skipUserNameCheck" #. type: Plain text #: en/git-p4.txt:729 @@ -35696,9 +35702,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:730 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.attemptRCSCleanup" -msgstr "" +msgstr "git-p4.attemptRCSCleanup" #. type: Plain text #: en/git-p4.txt:735 @@ -35708,9 +35714,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:736 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.exportLabels" -msgstr "" +msgstr "git-p4.exportLabels" #. type: Plain text #: en/git-p4.txt:738 @@ -35720,9 +35726,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:739 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.labelExportRegexp" -msgstr "" +msgstr "git-p4.labelExportRegexp" #. type: Plain text #: en/git-p4.txt:742 @@ -35732,9 +35738,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:743 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.conflict" -msgstr "" +msgstr "git-p4.conflict" #. type: Plain text #: en/git-p4.txt:746 @@ -35744,9 +35750,9 @@ msgstr "" #. type: Labeled list #: en/git-p4.txt:747 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-p4.disableRebase" -msgstr "" +msgstr "git-p4.disableRebase" #. type: Plain text #: en/git-p4.txt:749 @@ -35798,9 +35804,9 @@ msgstr "" #. type: Title = #: en/git-pack-objects.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-pack-objects(1)" -msgstr "" +msgstr "git-pack-objects(1)" #. type: Plain text #: en/git-pack-objects.txt:7 @@ -35870,9 +35876,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:63 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--revs" -msgstr "" +msgstr "--revs" #. type: Plain text #: en/git-pack-objects.txt:71 @@ -35882,9 +35888,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:72 en/rev-list-options.txt:855 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--unpacked" -msgstr "" +msgstr "--unpacked" #. type: Plain text #: en/git-pack-objects.txt:76 @@ -35942,9 +35948,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:126 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--honor-pack-keep" -msgstr "" +msgstr "--honor-pack-keep" #. type: Plain text #: en/git-pack-objects.txt:130 @@ -35978,9 +35984,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:147 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--non-empty" -msgstr "" +msgstr "--non-empty" #. type: Plain text #: en/git-pack-objects.txt:150 @@ -35990,9 +35996,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:177 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-reuse-delta" -msgstr "" +msgstr "--no-reuse-delta" #. type: Plain text #: en/git-pack-objects.txt:183 @@ -36002,9 +36008,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:184 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-reuse-object" -msgstr "" +msgstr "--no-reuse-object" #. type: Plain text #: en/git-pack-objects.txt:190 @@ -36026,9 +36032,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:199 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]sparse" -msgstr "" +msgstr "--[no-]sparse" #. type: Plain text #: en/git-pack-objects.txt:209 @@ -36050,9 +36056,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:220 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--shallow" -msgstr "" +msgstr "--shallow" #. type: Plain text #: en/git-pack-objects.txt:224 @@ -36062,9 +36068,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:225 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--delta-base-offset" -msgstr "" +msgstr "--delta-base-offset" #. type: Plain text #: en/git-pack-objects.txt:235 @@ -36086,9 +36092,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:256 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-true-parents" -msgstr "" +msgstr "--keep-true-parents" #. type: Plain text #: en/git-pack-objects.txt:259 @@ -36104,9 +36110,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:265 en/rev-list-options.txt:916 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-filter" -msgstr "" +msgstr "--no-filter" #. type: Plain text #: en/git-pack-objects.txt:267 @@ -36146,9 +36152,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:286 en/rev-list-options.txt:941 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--exclude-promisor-objects" -msgstr "" +msgstr "--exclude-promisor-objects" #. type: Plain text #: en/git-pack-objects.txt:292 @@ -36158,9 +36164,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:293 en/git-repack.txt:157 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-unreachable" -msgstr "" +msgstr "--keep-unreachable" #. type: Plain text #: en/git-pack-objects.txt:298 @@ -36170,9 +36176,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:299 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--pack-loose-unreachable" -msgstr "" +msgstr "--pack-loose-unreachable" #. type: Plain text #: en/git-pack-objects.txt:302 @@ -36182,9 +36188,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:303 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unpack-unreachable" -msgstr "" +msgstr "--unpack-unreachable" #. type: Plain text #: en/git-pack-objects.txt:305 @@ -36194,9 +36200,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:306 en/git-repack.txt:164 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--delta-islands" -msgstr "" +msgstr "--delta-islands" #. type: Plain text #: en/git-pack-objects.txt:309 @@ -36303,15 +36309,15 @@ msgstr "" #. type: Plain text #: en/git-pack-objects.txt:408 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]" -msgstr "" +msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]" #. type: Title = #: en/git-pack-redundant.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-pack-redundant(1)" -msgstr "" +msgstr "git-pack-redundant(1)" #. type: Plain text #: en/git-pack-redundant.txt:7 @@ -36321,7 +36327,7 @@ msgstr "" #. type: Plain text #: en/git-pack-redundant.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n" msgstr "" @@ -36351,9 +36357,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-redundant.txt:35 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--alt-odb" -msgstr "" +msgstr "--alt-odb" #. type: Plain text #: en/git-pack-redundant.txt:38 @@ -36369,15 +36375,15 @@ msgstr "" #. type: Plain text #: en/git-pack-redundant.txt:47 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]" -msgstr "" +msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]" #. type: Title = #: en/git-pack-refs.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-pack-refs(1)" -msgstr "" +msgstr "git-pack-refs(1)" #. type: Plain text #: en/git-pack-refs.txt:7 @@ -36433,35 +36439,11 @@ msgstr "" msgid "Older documentation written before the packed-refs mechanism was introduced may still say things like \".git/refs/heads/<branch> file exists\" when it means \"branch <branch> exists\"." msgstr "" -#. type: Title = -#: en/git-parse-remote.txt:2 -#, no-wrap, priority:100 -msgid "git-parse-remote(1)" -msgstr "" - -#. type: Plain text -#: en/git-parse-remote.txt:7 -#, priority:100 -msgid "git-parse-remote - Routines to help parsing remote repository access parameters" -msgstr "" - -#. type: Plain text -#: en/git-parse-remote.txt:13 -#, no-wrap, priority:100 -msgid "'. \"$(git --exec-path)/git-parse-remote\"'\n" -msgstr "" - -#. type: Plain text -#: en/git-parse-remote.txt:20 -#, priority:100 -msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing." -msgstr "" - #. type: Title = #: en/git-patch-id.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-patch-id(1)" -msgstr "" +msgstr "git-patch-id(1)" #. type: Plain text #: en/git-patch-id.txt:7 @@ -36501,9 +36483,9 @@ msgstr "" #. type: Labeled list #: en/git-patch-id.txt:33 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stable" -msgstr "" +msgstr "--stable" #. type: Plain text #: en/git-patch-id.txt:35 @@ -36531,9 +36513,9 @@ msgstr "" #. type: Labeled list #: en/git-patch-id.txt:50 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unstable" -msgstr "" +msgstr "--unstable" #. type: Plain text #: en/git-patch-id.txt:56 @@ -36549,9 +36531,9 @@ msgstr "" #. type: Title = #: en/git-prune-packed.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-prune-packed(1)" -msgstr "" +msgstr "git-prune-packed(1)" #. type: Plain text #: en/git-prune-packed.txt:7 @@ -36603,15 +36585,15 @@ msgstr "" #. type: Plain text #: en/git-prune-packed.txt:44 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]" -msgstr "" +msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]" #. type: Title = #: en/git-prune.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-prune(1)" -msgstr "" +msgstr "git-prune(1)" #. type: Plain text #: en/git-prune.txt:7 @@ -36621,7 +36603,7 @@ msgstr "" #. type: Plain text #: en/git-prune.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n" msgstr "" @@ -36675,7 +36657,7 @@ msgstr "" #. type: Labeled list #: en/git-prune.txt:54 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<head>..." msgstr "" @@ -36711,15 +36693,15 @@ msgstr "" #. type: Plain text #: en/git-prune.txt:86 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]" -msgstr "" +msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]" #. type: Title = #: en/git-pull.txt:2 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "git-pull(1)" -msgstr "" +msgstr "git-pull(1)" #. type: Plain text #: en/git-pull.txt:7 @@ -36729,7 +36711,7 @@ msgstr "" #. type: Plain text #: en/git-pull.txt:13 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n" msgstr "" @@ -36893,9 +36875,9 @@ msgstr "" #. type: Labeled list #: en/git-pull.txt:134 en/git-svn.txt:261 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--no-rebase" -msgstr "" +msgstr "--no-rebase" #. type: Plain text #: en/git-pull.txt:136 @@ -37035,15 +37017,15 @@ msgstr "" #. type: Plain text #: en/git-pull.txt:252 -#, priority:220 +#, ignore-same, priority:220 msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]" #. type: Title = #: en/git-push.txt:2 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "git-push(1)" -msgstr "" +msgstr "git-push(1)" #. type: Plain text #: en/git-push.txt:7 @@ -37053,7 +37035,7 @@ msgstr "" #. type: Plain text #: en/git-push.txt:18 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "" "'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n" "\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n" @@ -37083,7 +37065,7 @@ msgstr "" #. type: Plain text #: en/git-push.txt:39 -#, priority:220 +#, ignore-ellipsis, priority:220 msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)." msgstr "" @@ -37107,7 +37089,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:56 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "<refspec>..." msgstr "" @@ -37251,9 +37233,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:191 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--follow-tags" -msgstr "" +msgstr "--follow-tags" #. type: Plain text #: en/git-push.txt:198 @@ -37263,9 +37245,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:199 en/git-send-pack.txt:73 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]signed" -msgstr "" +msgstr "--[no-]signed" #. type: Labeled list #: en/git-push.txt:200 en/git-send-pack.txt:74 @@ -37281,9 +37263,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:210 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]atomic" -msgstr "" +msgstr "--[no-]atomic" #. type: Plain text #: en/git-push.txt:214 @@ -37323,9 +37305,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:234 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]force-with-lease" -msgstr "" +msgstr "--[no-]force-with-lease" #. type: Labeled list #: en/git-push.txt:235 @@ -37473,15 +37455,15 @@ msgstr "" #. type: Plain text #: en/git-push.txt:351 -#, priority:220 +#, ignore-ellipsis, priority:220 msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details." msgstr "" #. type: Labeled list #: en/git-push.txt:352 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]force-if-includes" -msgstr "" +msgstr "--[no-]force-if-includes" #. type: Plain text #: en/git-push.txt:355 @@ -37527,9 +37509,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:379 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]thin" -msgstr "" +msgstr "--[no-]thin" #. type: Plain text #: en/git-push.txt:384 @@ -37557,9 +37539,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:417 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]verify" -msgstr "" +msgstr "--[no-]verify" #. type: Plain text #: en/git-push.txt:421 @@ -37635,7 +37617,7 @@ msgstr "" #. type: Plain text #: en/git-push.txt:469 -#, priority:220 +#, ignore-ellipsis, priority:220 msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)." msgstr "" @@ -37896,7 +37878,7 @@ msgstr "" #. type: Plain text #: en/git-push.txt:640 -#, priority:220 +#, ignore-ellipsis, priority:220 msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics." msgstr "" @@ -37992,9 +37974,9 @@ msgstr "" #. type: Title = #: en/git-quiltimport.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-quiltimport(1)" -msgstr "" +msgstr "git-quiltimport(1)" #. type: Plain text #: en/git-quiltimport.txt:7 @@ -38084,9 +38066,9 @@ msgstr "" #. type: Title = #: en/git-read-tree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-read-tree(1)" -msgstr "" +msgstr "git-read-tree(1)" #. type: Plain text #: en/git-read-tree.txt:7 @@ -38130,9 +38112,9 @@ msgstr "" #. type: Labeled list #: en/git-read-tree.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reset" -msgstr "" +msgstr "--reset" #. type: Plain text #: en/git-read-tree.txt:44 @@ -38166,9 +38148,9 @@ msgstr "" #. type: Labeled list #: en/git-read-tree.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--trivial" -msgstr "" +msgstr "--trivial" #. type: Plain text #: en/git-read-tree.txt:71 @@ -38238,9 +38220,9 @@ msgstr "" #. type: Labeled list #: en/git-read-tree.txt:118 en/git-reset.txt:91 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--[no-]recurse-submodules" -msgstr "" +msgstr "--[no-]recurse-submodules" #. type: Plain text #: en/git-read-tree.txt:123 @@ -38250,9 +38232,9 @@ msgstr "" #. type: Labeled list #: en/git-read-tree.txt:124 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-sparse-checkout" -msgstr "" +msgstr "--no-sparse-checkout" #. type: Plain text #: en/git-read-tree.txt:127 @@ -38262,9 +38244,9 @@ msgstr "" #. type: Labeled list #: en/git-read-tree.txt:128 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--empty" -msgstr "" +msgstr "--empty" #. type: Plain text #: en/git-read-tree.txt:131 @@ -38597,7 +38579,7 @@ msgstr "" #. type: delimited block - #: en/git-read-tree.txt:357 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git fetch git://.... linus\n" "$ LT=`git rev-parse FETCH_HEAD`\n" @@ -38651,7 +38633,7 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:405 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set." msgstr "" @@ -38695,15 +38677,15 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:440 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];" -msgstr "" +msgstr "linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];" #. type: Title = #: en/git-rebase.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-rebase(1)" -msgstr "" +msgstr "git-rebase(1)" #. type: Plain text #: en/git-rebase.txt:7 @@ -39031,19 +39013,19 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:220 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD." msgstr "" #. type: Labeled list #: en/git-rebase.txt:221 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-base" -msgstr "" +msgstr "--keep-base" #. type: Plain text #: en/git-rebase.txt:226 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'." msgstr "" @@ -39109,21 +39091,21 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:286 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)." msgstr "" #. type: Plain text #: en/git-rebase.txt:289 en/git-rebase.txt:647 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-keep-empty" -msgstr "" +msgstr "--no-keep-empty" #. type: Labeled list #: en/git-rebase.txt:290 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-empty" -msgstr "" +msgstr "--keep-empty" #. type: Plain text #: en/git-rebase.txt:298 @@ -39145,15 +39127,15 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:310 en/git-rebase.txt:649 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reapply-cherry-picks" -msgstr "" +msgstr "--reapply-cherry-picks" #. type: Labeled list #: en/git-rebase.txt:311 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-reapply-cherry-picks" -msgstr "" +msgstr "--no-reapply-cherry-picks" #. type: Plain text #: en/git-rebase.txt:317 @@ -39187,9 +39169,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:339 en/git-rebase.txt:650 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--edit-todo" -msgstr "" +msgstr "--edit-todo" #. type: Plain text #: en/git-rebase.txt:341 @@ -39199,9 +39181,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:342 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-current-patch" -msgstr "" +msgstr "--show-current-patch" #. type: Plain text #: en/git-rebase.txt:346 @@ -39283,9 +39265,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--verify" -msgstr "" +msgstr "--verify" #. type: Plain text #: en/git-rebase.txt:419 @@ -39301,15 +39283,15 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:428 en/merge-options.txt:43 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-ff" -msgstr "" +msgstr "--no-ff" #. type: Labeled list #: en/git-rebase.txt:429 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--force-rebase" -msgstr "" +msgstr "--force-rebase" #. type: Plain text #: en/git-rebase.txt:434 @@ -39325,9 +39307,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:442 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-fork-point" -msgstr "" +msgstr "--no-fork-point" #. type: Plain text #: en/git-rebase.txt:446 @@ -39385,9 +39367,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:491 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reset-author-date" -msgstr "" +msgstr "--reset-author-date" #. type: Plain text #: en/git-rebase.txt:495 @@ -39439,7 +39421,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:541 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands." msgstr "" @@ -39451,9 +39433,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:545 en/git-rebase.txt:644 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--preserve-merges" -msgstr "" +msgstr "--preserve-merges" #. type: Plain text #: en/git-rebase.txt:550 @@ -39493,7 +39475,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:568 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n" msgstr "" @@ -39505,7 +39487,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:572 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n" msgstr "" @@ -39529,19 +39511,19 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:594 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--autosquash" -msgstr "" +msgstr "--autosquash" #. type: Labeled list #: en/git-rebase.txt:595 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-autosquash" -msgstr "" +msgstr "--no-autosquash" #. type: Plain text #: en/git-rebase.txt:606 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]." msgstr "" @@ -39553,15 +39535,15 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:613 en/merge-options.txt:154 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--autostash" -msgstr "" +msgstr "--autostash" #. type: Labeled list #: en/git-rebase.txt:614 en/merge-options.txt:155 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-autostash" -msgstr "" +msgstr "--no-autostash" #. type: Plain text #: en/git-rebase.txt:620 @@ -39571,15 +39553,15 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:621 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reschedule-failed-exec" -msgstr "" +msgstr "--reschedule-failed-exec" #. type: Labeled list #: en/git-rebase.txt:622 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-reschedule-failed-exec" -msgstr "" +msgstr "--no-reschedule-failed-exec" #. type: Plain text #: en/git-rebase.txt:625 @@ -39601,9 +39583,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:633 -#, priority:100 +#, ignore-same, priority:100 msgid "--whitespace" -msgstr "" +msgstr "--whitespace" #. type: Plain text #: en/git-rebase.txt:636 @@ -39613,33 +39595,33 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:639 -#, priority:100 +#, ignore-same, priority:100 msgid "--strategy" -msgstr "" +msgstr "--strategy" #. type: Plain text #: en/git-rebase.txt:640 -#, priority:100 +#, ignore-same, priority:100 msgid "--strategy-option" -msgstr "" +msgstr "--strategy-option" #. type: Plain text #: en/git-rebase.txt:642 -#, priority:100 +#, ignore-same, priority:100 msgid "--[no-]autosquash" -msgstr "" +msgstr "--[no-]autosquash" #. type: Labeled list #: en/git-rebase.txt:643 en/git-svn.txt:680 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--rebase-merges" -msgstr "" +msgstr "--rebase-merges" #. type: Plain text #: en/git-rebase.txt:646 -#, priority:100 +#, ignore-same, priority:100 msgid "--exec" -msgstr "" +msgstr "--exec" #. type: Plain text #: en/git-rebase.txt:648 @@ -39865,7 +39847,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:800 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr." msgstr "" @@ -40003,7 +39985,7 @@ msgstr "" #. type: delimited block - #: en/git-rebase.txt:866 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "pick deadbee The oneline of this commit\n" "pick fa1afe1 The oneline of the next commit\n" @@ -40107,7 +40089,7 @@ msgstr "" #. type: delimited block - #: en/git-rebase.txt:940 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "pick deadbee Implement feature XXX\n" "fixup f1a5c00 Fix to feature XXX\n" @@ -40126,7 +40108,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:950 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree." msgstr "" @@ -40270,7 +40252,7 @@ msgstr "" #. type: delimited block - #: en/git-rebase.txt:1045 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " o---o---o---o---o---o---o---o master\n" "\t \\\t\t\t \\\n" @@ -40635,9 +40617,9 @@ msgstr "" #. type: Title = #: en/git-receive-pack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-receive-pack(1)" -msgstr "" +msgstr "git-receive-pack(1)" #. type: Plain text #: en/git-receive-pack.txt:7 @@ -40725,9 +40707,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PUSH_CERT_SIGNER`" -msgstr "" +msgstr "`GIT_PUSH_CERT_SIGNER`" #. type: Plain text #: en/git-receive-pack.txt:69 @@ -40737,9 +40719,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PUSH_CERT_KEY`" -msgstr "" +msgstr "`GIT_PUSH_CERT_KEY`" #. type: Plain text #: en/git-receive-pack.txt:72 @@ -40749,9 +40731,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:73 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PUSH_CERT_STATUS`" -msgstr "" +msgstr "`GIT_PUSH_CERT_STATUS`" #. type: Plain text #: en/git-receive-pack.txt:77 @@ -40761,9 +40743,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:78 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PUSH_CERT_NONCE`" -msgstr "" +msgstr "`GIT_PUSH_CERT_NONCE`" #. type: Plain text #: en/git-receive-pack.txt:84 @@ -40773,15 +40755,15 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:85 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PUSH_CERT_NONCE_STATUS`" -msgstr "" +msgstr "`GIT_PUSH_CERT_NONCE_STATUS`" #. type: Labeled list #: en/git-receive-pack.txt:86 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`UNSOLICITED`" -msgstr "" +msgstr "`UNSOLICITED`" #. type: Plain text #: en/git-receive-pack.txt:89 @@ -40791,9 +40773,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`MISSING`" -msgstr "" +msgstr "`MISSING`" #. type: Plain text #: en/git-receive-pack.txt:91 @@ -40803,9 +40785,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:91 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`BAD`" -msgstr "" +msgstr "`BAD`" #. type: Plain text #: en/git-receive-pack.txt:93 @@ -40815,9 +40797,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:93 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`OK`" -msgstr "" +msgstr "`OK`" #. type: Plain text #: en/git-receive-pack.txt:95 @@ -40827,9 +40809,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:95 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`SLOP`" -msgstr "" +msgstr "`SLOP`" #. type: Plain text #: en/git-receive-pack.txt:99 @@ -40839,9 +40821,9 @@ msgstr "" #. type: Labeled list #: en/git-receive-pack.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PUSH_CERT_NONCE_SLOP`" -msgstr "" +msgstr "`GIT_PUSH_CERT_NONCE_SLOP`" #. type: Plain text #: en/git-receive-pack.txt:108 @@ -41044,15 +41026,15 @@ msgstr "" #. type: Plain text #: en/git-receive-pack.txt:253 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]" -msgstr "" +msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]" #. type: Title = #: en/git-reflog.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-reflog(1)" -msgstr "" +msgstr "git-reflog(1)" #. type: Plain text #: en/git-reflog.txt:7 @@ -41068,7 +41050,7 @@ msgstr "" #. type: Plain text #: en/git-reflog.txt:27 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git reflog' ['show'] [log-options] [<ref>]\n" "'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n" @@ -41141,9 +41123,9 @@ msgstr "" #. type: Labeled list #: en/git-reflog.txt:75 en/rev-list-options.txt:192 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--single-worktree" -msgstr "" +msgstr "--single-worktree" #. type: Plain text #: en/git-reflog.txt:79 @@ -41177,9 +41159,9 @@ msgstr "" #. type: Labeled list #: en/git-reflog.txt:98 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--updateref" -msgstr "" +msgstr "--updateref" #. type: Plain text #: en/git-reflog.txt:102 @@ -41189,9 +41171,9 @@ msgstr "" #. type: Labeled list #: en/git-reflog.txt:103 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--rewrite" -msgstr "" +msgstr "--rewrite" #. type: Plain text #: en/git-reflog.txt:107 @@ -41201,9 +41183,9 @@ msgstr "" #. type: Labeled list #: en/git-reflog.txt:108 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stale-fix" -msgstr "" +msgstr "--stale-fix" #. type: Plain text #: en/git-reflog.txt:113 @@ -41243,9 +41225,9 @@ msgstr "" #. type: Title = #: en/git-remote-ext.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-remote-ext(1)" -msgstr "" +msgstr "git-remote-ext(1)" #. type: Plain text #: en/git-remote-ext.txt:7 @@ -41255,7 +41237,7 @@ msgstr "" #. type: Plain text #: en/git-remote-ext.txt:12 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n" msgstr "" @@ -41309,9 +41291,9 @@ msgstr "" #. type: Labeled list #: en/git-remote-ext.txt:34 en/pretty-formats.txt:214 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%s'" -msgstr "" +msgstr "'%s'" #. type: Plain text #: en/git-remote-ext.txt:37 @@ -41321,9 +41303,9 @@ msgstr "" #. type: Labeled list #: en/git-remote-ext.txt:38 en/pretty-formats.txt:211 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%S'" -msgstr "" +msgstr "'%S'" #. type: Plain text #: en/git-remote-ext.txt:42 @@ -41369,9 +41351,9 @@ msgstr "" #. type: Labeled list #: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_TRANSLOOP_DEBUG" -msgstr "" +msgstr "GIT_TRANSLOOP_DEBUG" #. type: Plain text #: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35 @@ -41387,25 +41369,25 @@ msgstr "" #. type: Labeled list #: en/git-remote-ext.txt:67 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_EXT_SERVICE" -msgstr "" +msgstr "GIT_EXT_SERVICE" #. type: Plain text #: en/git-remote-ext.txt:70 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke." msgstr "" #. type: Labeled list #: en/git-remote-ext.txt:71 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_EXT_SERVICE_NOPREFIX" -msgstr "" +msgstr "GIT_EXT_SERVICE_NOPREFIX" #. type: Plain text #: en/git-remote-ext.txt:74 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke." msgstr "" @@ -41489,15 +41471,15 @@ msgstr "" #. type: Plain text #: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitremote-helpers[7]" -msgstr "" +msgstr "linkgit:gitremote-helpers[7]" #. type: Title = #: en/git-remote-fd.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-remote-fd(1)" -msgstr "" +msgstr "git-remote-fd(1)" #. type: Plain text #: en/git-remote-fd.txt:7 @@ -41573,9 +41555,9 @@ msgstr "" #. type: Title = #: en/git-remote.txt:2 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "git-remote(1)" -msgstr "" +msgstr "git-remote(1)" #. type: Plain text #: en/git-remote.txt:7 @@ -41585,7 +41567,7 @@ msgstr "" #. type: Plain text #: en/git-remote.txt:25 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "" "'git remote' [-v | --verbose]\n" "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n" @@ -41922,7 +41904,7 @@ msgstr "" #. type: delimited block - #: en/git-remote.txt:246 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "" "$ git remote\n" "origin\n" @@ -41968,15 +41950,15 @@ msgstr "" #. type: Plain text #: en/git-remote.txt:264 -#, priority:220 +#, ignore-same, priority:220 msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]" #. type: Title = #: en/git-repack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-repack(1)" -msgstr "" +msgstr "git-repack(1)" #. type: Plain text #: en/git-repack.txt:7 @@ -42082,9 +42064,9 @@ msgstr "" #. type: Labeled list #: en/git-repack.txt:127 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--write-bitmap-index" -msgstr "" +msgstr "--write-bitmap-index" #. type: Plain text #: en/git-repack.txt:133 @@ -42094,9 +42076,9 @@ msgstr "" #. type: Labeled list #: en/git-repack.txt:134 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--pack-kept-objects" -msgstr "" +msgstr "--pack-kept-objects" #. type: Plain text #: en/git-repack.txt:142 @@ -42148,15 +42130,15 @@ msgstr "" #. type: Plain text #: en/git-repack.txt:185 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]" -msgstr "" +msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]" #. type: Title = #: en/git-replace.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-replace(1)" -msgstr "" +msgstr "git-replace(1)" #. type: Plain text #: en/git-replace.txt:7 @@ -42166,7 +42148,7 @@ msgstr "" #. type: Plain text #: en/git-replace.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git replace' [-f] <object> <replacement>\n" "'git replace' [-f] --edit <object>\n" @@ -42286,21 +42268,21 @@ msgstr "" #. type: Labeled list #: en/git-replace.txt:86 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "--graft <commit> [<parent>...]" msgstr "" #. type: Plain text #: en/git-replace.txt:93 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead." msgstr "" #. type: Labeled list #: en/git-replace.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--convert-graft-file" -msgstr "" +msgstr "--convert-graft-file" #. type: Plain text #: en/git-replace.txt:98 @@ -42418,9 +42400,9 @@ msgstr "" #. type: Title = #: en/git-request-pull.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-request-pull(1)" -msgstr "" +msgstr "git-request-pull(1)" #. type: Plain text #: en/git-request-pull.txt:7 @@ -42550,9 +42532,9 @@ msgstr "" #. type: Title = #: en/git-rerere.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-rerere(1)" -msgstr "" +msgstr "git-rerere(1)" #. type: Plain text #: en/git-rerere.txt:7 @@ -42714,7 +42696,7 @@ msgstr "" #. type: delimited block - #: en/git-rerere.txt:121 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "\t$ git switch topic\n" "\t$ git merge master\n" @@ -42746,7 +42728,7 @@ msgstr "" #. type: delimited block - #: en/git-rerere.txt:145 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "\t$ git switch topic\n" "\t$ git merge master\n" @@ -42839,9 +42821,9 @@ msgstr "" #. type: Title = #: en/git-reset.txt:2 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "git-reset(1)" -msgstr "" +msgstr "git-reset(1)" #. type: Plain text #: en/git-reset.txt:7 @@ -42851,7 +42833,7 @@ msgstr "" #. type: Plain text #: en/git-reset.txt:15 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n" "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]\n" @@ -42867,7 +42849,7 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:23 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git reset' [-q] [<tree-ish>] [--] <pathspec>..." msgstr "" @@ -42885,7 +42867,7 @@ msgstr "" #. type: Plain text #: en/git-reset.txt:32 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "This means that `git reset <pathspec>` is the opposite of `git add <pathspec>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <pathspec>...`." msgstr "" @@ -42897,7 +42879,7 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:40 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]" msgstr "" @@ -42927,9 +42909,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:56 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--soft" -msgstr "" +msgstr "--soft" #. type: Plain text #: en/git-reset.txt:61 @@ -42939,9 +42921,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:62 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--mixed" -msgstr "" +msgstr "--mixed" #. type: Plain text #: en/git-reset.txt:66 @@ -42957,9 +42939,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:70 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--hard" -msgstr "" +msgstr "--hard" #. type: Plain text #: en/git-reset.txt:73 @@ -42999,9 +42981,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:107 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-quiet" -msgstr "" +msgstr "--no-quiet" #. type: Plain text #: en/git-reset.txt:111 @@ -43058,7 +43040,7 @@ msgstr "" #. type: delimited block - #: en/git-reset.txt:166 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git commit ...\n" "$ git reset --soft HEAD^ <1>\n" @@ -43131,7 +43113,7 @@ msgstr "" #. type: delimited block - #: en/git-reset.txt:198 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git commit ...\n" "$ git reset --hard HEAD~3 <1>\n" @@ -43151,7 +43133,7 @@ msgstr "" #. type: delimited block - #: en/git-reset.txt:218 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git pull <1>\n" "Auto-merging nitfol\n" @@ -43196,7 +43178,7 @@ msgstr "" #. type: delimited block - #: en/git-reset.txt:243 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git pull <1>\n" "Auto-merging nitfol\n" @@ -43322,7 +43304,7 @@ msgstr "" #. type: delimited block - #: en/git-reset.txt:317 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git tag start\n" "$ git switch -c branch1\n" @@ -43365,7 +43347,7 @@ msgstr "" #. type: delimited block - #: en/git-reset.txt:345 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "$ git reset -N HEAD^ <1>\n" "$ git add -p <2>\n" @@ -43579,9 +43561,9 @@ msgstr "" #. type: Title = #: en/git-restore.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-restore(1)" -msgstr "" +msgstr "git-restore(1)" #. type: Plain text #: en/git-restore.txt:7 @@ -43591,7 +43573,7 @@ msgstr "" #. type: Plain text #: en/git-restore.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n" "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n" @@ -43666,9 +43648,9 @@ msgstr "" #. type: Labeled list #: en/git-restore.txt:61 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--staged" -msgstr "" +msgstr "--staged" #. type: Plain text #: en/git-restore.txt:65 @@ -43702,9 +43684,9 @@ msgstr "" #. type: Labeled list #: en/git-restore.txt:98 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-unmerged" -msgstr "" +msgstr "--ignore-unmerged" #. type: Plain text #: en/git-restore.txt:103 @@ -43832,15 +43814,15 @@ msgstr "" #. type: Plain text #: en/git-restore.txt:216 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-checkout[1], linkgit:git-reset[1]" -msgstr "" +msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]" #. type: Title = #: en/git-revert.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-revert(1)" -msgstr "" +msgstr "git-revert(1)" #. type: Plain text #: en/git-revert.txt:7 @@ -43850,7 +43832,7 @@ msgstr "" #. type: Plain text #: en/git-revert.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n" "'git revert' (--continue | --skip | --abort | --quit)\n" @@ -43942,9 +43924,9 @@ msgstr "" #. type: Title = #: en/git-rev-list.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-rev-list(1)" -msgstr "" +msgstr "git-rev-list(1)" #. type: Plain text #: en/git-rev-list.txt:7 @@ -43954,7 +43936,7 @@ msgstr "" #. type: Plain text #: en/git-rev-list.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n" msgstr "" @@ -43966,9 +43948,9 @@ msgstr "" #. type: Title = #: en/git-rev-parse.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-rev-parse(1)" -msgstr "" +msgstr "git-rev-parse(1)" #. type: Plain text #: en/git-rev-parse.txt:7 @@ -43978,7 +43960,7 @@ msgstr "" #. type: Plain text #: en/git-rev-parse.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git rev-parse' [<options>] <args>...\n" msgstr "" @@ -44002,9 +43984,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:33 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--parseopt" -msgstr "" +msgstr "--parseopt" #. type: Plain text #: en/git-rev-parse.txt:35 @@ -44014,9 +43996,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:36 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--sq-quote" -msgstr "" +msgstr "--sq-quote" #. type: Plain text #: en/git-rev-parse.txt:40 @@ -44032,9 +44014,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-dashdash" -msgstr "" +msgstr "--keep-dashdash" #. type: Plain text #: en/git-rev-parse.txt:47 @@ -44044,9 +44026,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stop-at-non-option" -msgstr "" +msgstr "--stop-at-non-option" #. type: Plain text #: en/git-rev-parse.txt:52 @@ -44056,9 +44038,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:53 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stuck-long" -msgstr "" +msgstr "--stuck-long" #. type: Plain text #: en/git-rev-parse.txt:56 @@ -44074,9 +44056,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:60 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--revs-only" -msgstr "" +msgstr "--revs-only" #. type: Plain text #: en/git-rev-parse.txt:63 @@ -44086,9 +44068,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-revs" -msgstr "" +msgstr "--no-revs" #. type: Plain text #: en/git-rev-parse.txt:67 @@ -44098,9 +44080,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:68 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--flags" -msgstr "" +msgstr "--flags" #. type: Plain text #: en/git-rev-parse.txt:70 @@ -44110,9 +44092,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:71 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-flags" -msgstr "" +msgstr "--no-flags" #. type: Plain text #: en/git-rev-parse.txt:73 @@ -44192,9 +44174,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:124 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--sq" -msgstr "" +msgstr "--sq" #. type: Plain text #: en/git-rev-parse.txt:132 @@ -44234,9 +44216,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:149 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--symbolic" -msgstr "" +msgstr "--symbolic" #. type: Plain text #: en/git-rev-parse.txt:153 @@ -44246,9 +44228,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:154 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--symbolic-full-name" -msgstr "" +msgstr "--symbolic-full-name" #. type: Plain text #: en/git-rev-parse.txt:161 @@ -44348,9 +44330,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:209 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--local-env-vars" -msgstr "" +msgstr "--local-env-vars" #. type: Plain text #: en/git-rev-parse.txt:214 @@ -44360,9 +44342,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:215 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--git-dir" -msgstr "" +msgstr "--git-dir" #. type: Plain text #: en/git-rev-parse.txt:219 @@ -44378,9 +44360,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:224 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--absolute-git-dir" -msgstr "" +msgstr "--absolute-git-dir" #. type: Plain text #: en/git-rev-parse.txt:227 @@ -44390,9 +44372,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:228 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--git-common-dir" -msgstr "" +msgstr "--git-common-dir" #. type: Plain text #: en/git-rev-parse.txt:230 @@ -44402,9 +44384,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:231 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--is-inside-git-dir" -msgstr "" +msgstr "--is-inside-git-dir" #. type: Plain text #: en/git-rev-parse.txt:234 @@ -44414,9 +44396,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:235 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--is-inside-work-tree" -msgstr "" +msgstr "--is-inside-work-tree" #. type: Plain text #: en/git-rev-parse.txt:238 @@ -44426,9 +44408,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:239 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--is-bare-repository" -msgstr "" +msgstr "--is-bare-repository" #. type: Plain text #: en/git-rev-parse.txt:241 @@ -44438,9 +44420,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:242 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--is-shallow-repository" -msgstr "" +msgstr "--is-shallow-repository" #. type: Plain text #: en/git-rev-parse.txt:244 @@ -44468,15 +44450,15 @@ msgstr "" #. type: Plain text #: en/git-rev-parse.txt:257 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc." msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:258 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-cdup" -msgstr "" +msgstr "--show-cdup" #. type: Plain text #: en/git-rev-parse.txt:262 @@ -44486,9 +44468,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:263 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-prefix" -msgstr "" +msgstr "--show-prefix" #. type: Plain text #: en/git-rev-parse.txt:267 @@ -44498,9 +44480,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:268 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-toplevel" -msgstr "" +msgstr "--show-toplevel" #. type: Plain text #: en/git-rev-parse.txt:271 @@ -44510,9 +44492,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:272 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-superproject-working-tree" -msgstr "" +msgstr "--show-superproject-working-tree" #. type: Plain text #: en/git-rev-parse.txt:277 @@ -44522,9 +44504,9 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:278 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--shared-index-path" -msgstr "" +msgstr "--shared-index-path" #. type: Plain text #: en/git-rev-parse.txt:281 @@ -44588,7 +44570,7 @@ msgstr "" #. type: Labeled list #: en/git-rev-parse.txt:302 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<args>..." msgstr "" @@ -44720,7 +44702,7 @@ msgstr "" #. type: delimited block - #: en/git-rev-parse.txt:376 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "OPTS_SPEC=\"\\\n" "some-command [<options>] <args>...\n" @@ -44778,7 +44760,7 @@ msgstr "" #. type: delimited block - #: en/git-rev-parse.txt:401 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "usage: some-command [<options>] <args>...\n" msgstr "" @@ -44790,7 +44772,7 @@ msgstr "" #. type: delimited block - #: en/git-rev-parse.txt:409 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " -h, --help show the help\n" " --foo some nifty option --foo\n" @@ -44801,7 +44783,7 @@ msgstr "" #. type: delimited block - #: en/git-rev-parse.txt:412 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "An option group Header\n" " -C[...] option C with an optional argument\n" @@ -44894,9 +44876,9 @@ msgstr "" #. type: Title = #: en/git-rm.txt:2 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "git-rm(1)" -msgstr "" +msgstr "git-rm(1)" #. type: Plain text #: en/git-rm.txt:7 @@ -44906,7 +44888,7 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:14 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" "\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" @@ -44963,9 +44945,9 @@ msgstr "" #. type: Labeled list #: en/git-rm.txt:70 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-unmatch" -msgstr "" +msgstr "--ignore-unmatch" #. type: Plain text #: en/git-rm.txt:72 @@ -45125,9 +45107,9 @@ msgstr "" #. type: Title = #: en/git-send-email.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-send-email(1)" -msgstr "" +msgstr "git-send-email(1)" #. type: Plain text #: en/git-send-email.txt:7 @@ -45137,7 +45119,7 @@ msgstr "" #. type: Plain text #: en/git-send-email.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git send-email' [<options>] <file|directory|rev-list options>...\n" "'git send-email' --dump-aliases\n" @@ -45193,9 +45175,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:48 en/git-tag.txt:61 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--annotate" -msgstr "" +msgstr "--annotate" #. type: Plain text #: en/git-send-email.txt:52 @@ -45205,7 +45187,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:53 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "--bcc=<address>,..." msgstr "" @@ -45223,7 +45205,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:59 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "--cc=<address>,..." msgstr "" @@ -45235,9 +45217,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:65 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--compose" -msgstr "" +msgstr "--compose" #. type: Plain text #: en/git-send-email.txt:68 @@ -45307,7 +45289,7 @@ msgstr "" #. type: Plain text #: en/git-send-email.txt:110 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " [PATCH 0/2] Here is what I did...\n" " [PATCH 1/2] Clean up and tests\n" @@ -45338,7 +45320,7 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:119 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "--to=<address>,..." msgstr "" @@ -45398,15 +45380,15 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:152 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--xmailer" -msgstr "" +msgstr "--xmailer" #. type: Labeled list #: en/git-send-email.txt:153 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-xmailer" -msgstr "" +msgstr "--no-xmailer" #. type: Plain text #: en/git-send-email.txt:157 @@ -45470,7 +45452,7 @@ msgstr "" #. type: delimited block - #: en/git-send-email.txt:188 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n" msgstr "" @@ -45500,9 +45482,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:209 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-smtp-auth" -msgstr "" +msgstr "--no-smtp-auth" #. type: Plain text #: en/git-send-email.txt:211 @@ -45554,9 +45536,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:239 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--smtp-ssl" -msgstr "" +msgstr "--smtp-ssl" #. type: Plain text #: en/git-send-email.txt:241 @@ -45566,9 +45548,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:242 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--smtp-ssl-cert-path" -msgstr "" +msgstr "--smtp-ssl-cert-path" #. type: Plain text #: en/git-send-email.txt:252 @@ -45644,9 +45626,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:285 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-identity" -msgstr "" +msgstr "--no-identity" #. type: Plain text #: en/git-send-email.txt:288 @@ -45680,9 +45662,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:301 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]chain-reply-to" -msgstr "" +msgstr "--[no-]chain-reply-to" #. type: Plain text #: en/git-send-email.txt:308 @@ -45704,9 +45686,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:315 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]signed-off-by-cc" -msgstr "" +msgstr "--[no-]signed-off-by-cc" #. type: Plain text #: en/git-send-email.txt:319 @@ -45716,9 +45698,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:320 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]cc-cover" -msgstr "" +msgstr "--[no-]cc-cover" #. type: Plain text #: en/git-send-email.txt:325 @@ -45728,9 +45710,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:326 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]to-cover" -msgstr "" +msgstr "--[no-]to-cover" #. type: Plain text #: en/git-send-email.txt:331 @@ -45812,9 +45794,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:357 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]suppress-from" -msgstr "" +msgstr "--[no-]suppress-from" #. type: Plain text #: en/git-send-email.txt:361 @@ -45824,9 +45806,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:362 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]thread" -msgstr "" +msgstr "--[no-]thread" #. type: Plain text #: en/git-send-email.txt:368 @@ -45908,9 +45890,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:403 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]format-patch" -msgstr "" +msgstr "--[no-]format-patch" #. type: Plain text #: en/git-send-email.txt:408 @@ -45926,9 +45908,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:413 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]validate" -msgstr "" +msgstr "--[no-]validate" #. type: Plain text #: en/git-send-email.txt:416 @@ -45978,9 +45960,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:436 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--dump-aliases" -msgstr "" +msgstr "--dump-aliases" #. type: Plain text #: en/git-send-email.txt:441 @@ -45990,9 +45972,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:446 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "sendemail.aliasesFile" -msgstr "" +msgstr "sendemail.aliasesFile" #. type: Plain text #: en/git-send-email.txt:449 @@ -46002,9 +45984,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:450 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "sendemail.aliasFileType" -msgstr "" +msgstr "sendemail.aliasFileType" #. type: Plain text #: en/git-send-email.txt:453 @@ -46068,9 +46050,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:471 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "sendemail.multiEdit" -msgstr "" +msgstr "sendemail.multiEdit" #. type: Plain text #: en/git-send-email.txt:476 @@ -46080,9 +46062,9 @@ msgstr "" #. type: Labeled list #: en/git-send-email.txt:477 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "sendemail.confirm" -msgstr "" +msgstr "sendemail.confirm" #. type: Plain text #: en/git-send-email.txt:481 @@ -46154,9 +46136,9 @@ msgstr "" #. type: Title = #: en/git-send-pack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-send-pack(1)" -msgstr "" +msgstr "git-send-pack(1)" #. type: Plain text #: en/git-send-pack.txt:7 @@ -46166,7 +46148,7 @@ msgstr "" #. type: Plain text #: en/git-send-pack.txt:16 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]\n" "\t\t[--verbose] [--thin] [--atomic]\n" @@ -46206,9 +46188,9 @@ msgstr "" #. type: Labeled list #: en/git-send-pack.txt:68 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--atomic" -msgstr "" +msgstr "--atomic" #. type: Plain text #: en/git-send-pack.txt:72 @@ -46284,9 +46266,9 @@ msgstr "" #. type: Title = #: en/git-shell.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-shell(1)" -msgstr "" +msgstr "git-shell(1)" #. type: Plain text #: en/git-shell.txt:7 @@ -46479,9 +46461,9 @@ msgstr "" #. type: Title = #: en/git-sh-i18n.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-sh-i18n(1)" -msgstr "" +msgstr "git-sh-i18n(1)" #. type: Plain text #: en/git-sh-i18n.txt:7 @@ -46527,9 +46509,9 @@ msgstr "" #. type: Title = #: en/git-shortlog.txt:2 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "git-shortlog(1)" -msgstr "" +msgstr "git-shortlog(1)" #. type: Plain text #: en/git-shortlog.txt:7 @@ -46539,7 +46521,7 @@ msgstr "" #. type: Plain text #: en/git-shortlog.txt:13 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n" "git log --pretty=short | 'git shortlog' [<options>]\n" @@ -46577,9 +46559,9 @@ msgstr "" #. type: Labeled list #: en/git-shortlog.txt:39 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--email" -msgstr "" +msgstr "--email" #. type: Plain text #: en/git-shortlog.txt:41 @@ -46655,9 +46637,9 @@ msgstr "" #. type: Labeled list #: en/git-shortlog.txt:80 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--committer" -msgstr "" +msgstr "--committer" #. type: Plain text #: en/git-shortlog.txt:82 @@ -46703,9 +46685,9 @@ msgstr "" #. type: Title = #: en/git-show-branch.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-show-branch(1)" -msgstr "" +msgstr "git-show-branch(1)" #. type: Plain text #: en/git-show-branch.txt:7 @@ -46715,7 +46697,7 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -46781,9 +46763,9 @@ msgstr "" #. type: Labeled list #: en/git-show-branch.txt:51 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--current" -msgstr "" +msgstr "--current" #. type: Plain text #: en/git-show-branch.txt:55 @@ -46793,9 +46775,9 @@ msgstr "" #. type: Labeled list #: en/git-show-branch.txt:56 en/rev-list-options.txt:790 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--topo-order" -msgstr "" +msgstr "--topo-order" #. type: Plain text #: en/git-show-branch.txt:61 @@ -46805,9 +46787,9 @@ msgstr "" #. type: Labeled list #: en/git-show-branch.txt:62 en/rev-list-options.txt:782 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--date-order" -msgstr "" +msgstr "--date-order" #. type: Plain text #: en/git-show-branch.txt:66 @@ -46853,9 +46835,9 @@ msgstr "" #. type: Labeled list #: en/git-show-branch.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-name" -msgstr "" +msgstr "--no-name" #. type: Plain text #: en/git-show-branch.txt:96 @@ -46865,9 +46847,9 @@ msgstr "" #. type: Labeled list #: en/git-show-branch.txt:97 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--sha1-name" -msgstr "" +msgstr "--sha1-name" #. type: Plain text #: en/git-show-branch.txt:102 @@ -46877,9 +46859,9 @@ msgstr "" #. type: Labeled list #: en/git-show-branch.txt:103 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--topics" -msgstr "" +msgstr "--topics" #. type: Plain text #: en/git-show-branch.txt:110 @@ -47004,9 +46986,9 @@ msgstr "" #. type: Title = #: en/git-show-index.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-show-index(1)" -msgstr "" +msgstr "git-show-index(1)" #. type: Plain text #: en/git-show-index.txt:7 @@ -47064,9 +47046,9 @@ msgstr "" #. type: Title = #: en/git-show-ref.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-show-ref(1)" -msgstr "" +msgstr "git-show-ref(1)" #. type: Plain text #: en/git-show-ref.txt:7 @@ -47076,7 +47058,7 @@ msgstr "" #. type: Plain text #: en/git-show-ref.txt:15 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference]\n" "\t [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" @@ -47110,9 +47092,9 @@ msgstr "" #. type: Labeled list #: en/git-show-ref.txt:36 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--head" -msgstr "" +msgstr "--head" #. type: Plain text #: en/git-show-ref.txt:39 @@ -47128,9 +47110,9 @@ msgstr "" #. type: Labeled list #: en/git-show-ref.txt:48 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--dereference" -msgstr "" +msgstr "--dereference" #. type: Plain text #: en/git-show-ref.txt:52 @@ -47224,7 +47206,7 @@ msgstr "" #. type: delimited block - #: en/git-show-ref.txt:111 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git show-ref --head --dereference\n" "832e76a9899f560a90ffd62ae2ce83bbeff58f54 HEAD\n" @@ -47245,7 +47227,7 @@ msgstr "" #. type: delimited block - #: en/git-show-ref.txt:121 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git show-ref --heads --hash\n" "2e3ba0114a1f52b47df29743d6915d056be13278\n" @@ -47348,15 +47330,15 @@ msgstr "" #. type: Plain text #: en/git-show-ref.txt:183 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]" -msgstr "" +msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-ref[1], linkgit:gitrepository-layout[5]" #. type: Title = #: en/git-show.txt:2 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "git-show(1)" -msgstr "" +msgstr "git-show(1)" #. type: Plain text #: en/git-show.txt:7 @@ -47366,7 +47348,7 @@ msgstr "" #. type: Plain text #: en/git-show.txt:13 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "'git show' [<options>] [<object>...]\n" msgstr "" @@ -47414,7 +47396,7 @@ msgstr "" #. type: Labeled list #: en/git-show.txt:37 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "<object>..." msgstr "" @@ -47492,9 +47474,9 @@ msgstr "" #. type: Title = #: en/git-sh-setup.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-sh-setup(1)" -msgstr "" +msgstr "git-sh-setup(1)" #. type: Plain text #: en/git-sh-setup.txt:7 @@ -47528,9 +47510,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:36 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "die" -msgstr "" +msgstr "die" #. type: Plain text #: en/git-sh-setup.txt:39 @@ -47540,9 +47522,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "usage" -msgstr "" +msgstr "usage" #. type: Plain text #: en/git-sh-setup.txt:42 @@ -47552,9 +47534,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "set_reflog_action" -msgstr "" +msgstr "set_reflog_action" #. type: Plain text #: en/git-sh-setup.txt:49 @@ -47564,9 +47546,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:50 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git_editor" -msgstr "" +msgstr "git_editor" #. type: Plain text #: en/git-sh-setup.txt:54 @@ -47588,9 +47570,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:60 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "cd_to_toplevel" -msgstr "" +msgstr "cd_to_toplevel" #. type: Plain text #: en/git-sh-setup.txt:62 @@ -47600,9 +47582,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:63 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "require_work_tree" -msgstr "" +msgstr "require_work_tree" #. type: Plain text #: en/git-sh-setup.txt:66 @@ -47612,9 +47594,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:67 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "require_work_tree_exists" -msgstr "" +msgstr "require_work_tree_exists" #. type: Plain text #: en/git-sh-setup.txt:72 @@ -47642,9 +47624,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:83 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "get_author_ident_from_commit" -msgstr "" +msgstr "get_author_ident_from_commit" #. type: Plain text #: en/git-sh-setup.txt:86 @@ -47654,9 +47636,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:87 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "create_virtual_base" -msgstr "" +msgstr "create_virtual_base" #. type: Plain text #: en/git-sh-setup.txt:92 @@ -47666,9 +47648,9 @@ msgstr "" #. type: Title = #: en/git-stage.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-stage(1)" -msgstr "" +msgstr "git-stage(1)" #. type: Plain text #: en/git-stage.txt:7 @@ -47678,7 +47660,7 @@ msgstr "" #. type: Plain text #: en/git-stage.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git stage' args...\n" msgstr "" @@ -47690,9 +47672,9 @@ msgstr "" #. type: Title = #: en/git-stash.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-stash(1)" -msgstr "" +msgstr "git-stash(1)" #. type: Plain text #: en/git-stash.txt:7 @@ -47702,7 +47684,7 @@ msgstr "" #. type: Plain text #: en/git-stash.txt:23 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git stash' list [<options>]\n" "'git stash' show [<options>] [<stash>]\n" @@ -47726,7 +47708,7 @@ msgstr "" #. type: Plain text #: en/git-stash.txt:39 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one." msgstr "" @@ -47738,7 +47720,7 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:50 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]" msgstr "" @@ -47780,7 +47762,7 @@ msgstr "" #. type: delimited block - #: en/git-stash.txt:81 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n" "stash@{1}: On master: 9cc0589... Add git-stash\n" @@ -47878,9 +47860,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:137 en/git-update-ref.txt:108 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "create" -msgstr "" +msgstr "create" #. type: Plain text #: en/git-stash.txt:144 @@ -47914,9 +47896,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:162 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--include-untracked" -msgstr "" +msgstr "--include-untracked" #. type: Plain text #: en/git-stash.txt:167 @@ -47938,15 +47920,15 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:177 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--keep-index" -msgstr "" +msgstr "--keep-index" #. type: Labeled list #: en/git-stash.txt:178 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-keep-index" -msgstr "" +msgstr "--no-keep-index" #. type: Plain text #: en/git-stash.txt:182 @@ -48049,7 +48031,7 @@ msgstr "" #. type: delimited block - #: en/git-stash.txt:284 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git pull\n" " ...\n" @@ -48067,7 +48049,7 @@ msgstr "" #. type: delimited block - #: en/git-stash.txt:303 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "# ... hack hack hack ...\n" "$ git switch -c my_wip\n" @@ -48088,7 +48070,7 @@ msgstr "" #. type: delimited block - #: en/git-stash.txt:314 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "# ... hack hack hack ...\n" "$ git stash\n" @@ -48112,7 +48094,7 @@ msgstr "" #. type: delimited block - #: en/git-stash.txt:332 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "# ... hack hack hack ...\n" "$ git add --patch foo # add just first part to the index\n" @@ -48148,15 +48130,15 @@ msgstr "" #. type: Plain text #: en/git-stash.txt:355 -#, priority:240 +#, ignore-same, priority:240 msgid "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]" -msgstr "" +msgstr "linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], linkgit:git-reset[1], linkgit:git-switch[1]" #. type: Title = #: en/git-status.txt:2 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "git-status(1)" -msgstr "" +msgstr "git-status(1)" #. type: Plain text #: en/git-status.txt:7 @@ -48166,7 +48148,7 @@ msgstr "" #. type: Plain text #: en/git-status.txt:13 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git status' [<options>...] [--] [<pathspec>...]\n" msgstr "" @@ -48184,9 +48166,9 @@ msgstr "" #. type: Labeled list #: en/git-status.txt:35 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--show-stash" -msgstr "" +msgstr "--show-stash" #. type: Plain text #: en/git-status.txt:37 @@ -48325,15 +48307,15 @@ msgstr "" #. type: Labeled list #: en/git-status.txt:137 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ahead-behind" -msgstr "" +msgstr "--ahead-behind" #. type: Labeled list #: en/git-status.txt:138 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-ahead-behind" -msgstr "" +msgstr "--no-ahead-behind" #. type: Plain text #: en/git-status.txt:141 @@ -48343,9 +48325,9 @@ msgstr "" #. type: Labeled list #: en/git-status.txt:142 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--renames" -msgstr "" +msgstr "--renames" #. type: Plain text #: en/git-status.txt:146 @@ -48643,7 +48625,7 @@ msgstr "" #. type: delimited block . #: en/git-status.txt:349 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "Field Meaning\n" "--------------------------------------------------------\n" @@ -48795,9 +48777,9 @@ msgstr "" #. type: Title = #: en/git-stripspace.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-stripspace(1)" -msgstr "" +msgstr "git-stripspace(1)" #. type: Plain text #: en/git-stripspace.txt:7 @@ -48866,9 +48848,9 @@ msgstr "" #. type: Labeled list #: en/git-stripspace.txt:39 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--strip-comments" -msgstr "" +msgstr "--strip-comments" #. type: Plain text #: en/git-stripspace.txt:41 @@ -48878,9 +48860,9 @@ msgstr "" #. type: Labeled list #: en/git-stripspace.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--comment-lines" -msgstr "" +msgstr "--comment-lines" #. type: Plain text #: en/git-stripspace.txt:47 @@ -48952,9 +48934,9 @@ msgstr "" #. type: Title = #: en/git-submodule.txt:2 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "git-submodule(1)" -msgstr "" +msgstr "git-submodule(1)" #. type: Plain text #: en/git-submodule.txt:7 @@ -48964,7 +48946,7 @@ msgstr "" #. type: Plain text #: en/git-submodule.txt:24 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "" "'git submodule' [--quiet] [--cached]\n" "'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n" @@ -49036,7 +49018,7 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:75 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "status [--cached] [--recursive] [--] [<path>...]" msgstr "" @@ -49066,7 +49048,7 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:95 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "init [--] [<path>...]" msgstr "" @@ -49096,7 +49078,7 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:118 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "deinit [-f|--force] (--all|[--] <path>...)" msgstr "" @@ -49126,7 +49108,7 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:136 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]" msgstr "" @@ -49240,7 +49222,7 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:193 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]" msgstr "" @@ -49282,7 +49264,7 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:235 -#, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "sync [--recursive] [--] [<path>...]" msgstr "" @@ -49372,9 +49354,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:307 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--files" -msgstr "" +msgstr "--files" #. type: Plain text #: en/git-submodule.txt:311 @@ -49384,9 +49366,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:313 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--summary-limit" -msgstr "" +msgstr "--summary-limit" #. type: Plain text #: en/git-submodule.txt:319 @@ -49396,9 +49378,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:320 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--remote" -msgstr "" +msgstr "--remote" #. type: Plain text #: en/git-submodule.txt:329 @@ -49426,9 +49408,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:352 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--no-fetch" -msgstr "" +msgstr "--no-fetch" #. type: Plain text #: en/git-submodule.txt:355 @@ -49438,9 +49420,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:356 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--checkout" -msgstr "" +msgstr "--checkout" #. type: Plain text #: en/git-submodule.txt:364 @@ -49456,9 +49438,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:375 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--rebase" -msgstr "" +msgstr "--rebase" #. type: Plain text #: en/git-submodule.txt:383 @@ -49468,9 +49450,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:384 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--init" -msgstr "" +msgstr "--init" #. type: Plain text #: en/git-submodule.txt:388 @@ -49480,9 +49462,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:389 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--name" -msgstr "" +msgstr "--name" #. type: Plain text #: en/git-submodule.txt:393 @@ -49525,9 +49507,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:416 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--depth" -msgstr "" +msgstr "--depth" #. type: Plain text #: en/git-submodule.txt:420 @@ -49537,9 +49519,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:421 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]recommend-shallow" -msgstr "" +msgstr "--[no-]recommend-shallow" #. type: Plain text #: en/git-submodule.txt:426 @@ -49573,15 +49555,15 @@ msgstr "" #. type: Plain text #: en/git-submodule.txt:453 -#, priority:220 +#, ignore-same, priority:220 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]." -msgstr "" +msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]." #. type: Title = #: en/git-svn.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-svn(1)" -msgstr "" +msgstr "git-svn(1)" #. type: Plain text #: en/git-svn.txt:7 @@ -49615,9 +49597,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'init'" -msgstr "" +msgstr "'init'" #. type: Plain text #: en/git-svn.txt:39 @@ -49663,9 +49645,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:47 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stdlayout" -msgstr "" +msgstr "--stdlayout" #. type: Plain text #: en/git-svn.txt:58 @@ -49675,9 +49657,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:58 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-metadata" -msgstr "" +msgstr "--no-metadata" #. type: Plain text #: en/git-svn.txt:62 @@ -49687,9 +49669,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:62 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--use-svm-props" -msgstr "" +msgstr "--use-svm-props" #. type: Plain text #: en/git-svn.txt:64 @@ -49699,9 +49681,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--use-svnsync-props" -msgstr "" +msgstr "--use-svnsync-props" #. type: Plain text #: en/git-svn.txt:66 @@ -49795,9 +49777,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:110 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-minimize-url" -msgstr "" +msgstr "--no-minimize-url" #. type: Plain text #: en/git-svn.txt:121 @@ -49807,13 +49789,13 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:122 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'fetch'" -msgstr "" +msgstr "'fetch'" #. type: Plain text #: en/git-svn.txt:127 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument." msgstr "" @@ -49825,9 +49807,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:131 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--localtime" -msgstr "" +msgstr "--localtime" #. type: Plain text #: en/git-svn.txt:135 @@ -49843,9 +49825,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:142 en/git-svn.txt:536 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--parent" -msgstr "" +msgstr "--parent" #. type: Plain text #: en/git-svn.txt:144 @@ -49939,9 +49921,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:204 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'clone'" -msgstr "" +msgstr "'clone'" #. type: Plain text #: en/git-svn.txt:214 @@ -49951,9 +49933,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:215 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--preserve-empty-dirs" -msgstr "" +msgstr "--preserve-empty-dirs" #. type: Plain text #: en/git-svn.txt:221 @@ -49975,9 +49957,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:226 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'rebase'" -msgstr "" +msgstr "'rebase'" #. type: Plain text #: en/git-svn.txt:229 @@ -50011,9 +49993,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:249 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'dcommit'" -msgstr "" +msgstr "'dcommit'" #. type: Plain text #: en/git-svn.txt:254 @@ -50109,9 +50091,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:305 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'branch'" -msgstr "" +msgstr "'branch'" #. type: Plain text #: en/git-svn.txt:307 @@ -50121,9 +50103,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:309 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--message" -msgstr "" +msgstr "--message" #. type: Plain text #: en/git-svn.txt:311 @@ -50133,9 +50115,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:313 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--tag" -msgstr "" +msgstr "--tag" #. type: Plain text #: en/git-svn.txt:316 @@ -50175,9 +50157,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:333 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--username" -msgstr "" +msgstr "--username" #. type: Plain text #: en/git-svn.txt:336 @@ -50187,9 +50169,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:337 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--commit-url" -msgstr "" +msgstr "--commit-url" #. type: Plain text #: en/git-svn.txt:342 @@ -50205,9 +50187,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:346 en/rev-list-options.txt:1047 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--parents" -msgstr "" +msgstr "--parents" #. type: Plain text #: en/git-svn.txt:350 @@ -50217,9 +50199,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:351 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'tag'" -msgstr "" +msgstr "'tag'" #. type: Plain text #: en/git-svn.txt:354 @@ -50229,9 +50211,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:355 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'log'" -msgstr "" +msgstr "'log'" #. type: Plain text #: en/git-svn.txt:358 @@ -50259,7 +50241,7 @@ msgstr "" #. type: Plain text #: en/git-svn.txt:366 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..." msgstr "" @@ -50295,9 +50277,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:380 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-commit" -msgstr "" +msgstr "--show-commit" #. type: Plain text #: en/git-svn.txt:382 @@ -50307,9 +50289,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:382 en/pretty-options.txt:31 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--oneline" -msgstr "" +msgstr "--oneline" #. type: Plain text #: en/git-svn.txt:384 @@ -50331,9 +50313,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:392 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'blame'" -msgstr "" +msgstr "'blame'" #. type: Plain text #: en/git-svn.txt:399 @@ -50343,9 +50325,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:400 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--git-format" -msgstr "" +msgstr "--git-format" #. type: Plain text #: en/git-svn.txt:405 @@ -50355,9 +50337,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:406 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'find-rev'" -msgstr "" +msgstr "'find-rev'" #. type: Plain text #: en/git-svn.txt:411 @@ -50373,9 +50355,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:413 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--before" -msgstr "" +msgstr "--before" #. type: Plain text #: en/git-svn.txt:417 @@ -50385,9 +50367,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:419 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--after" -msgstr "" +msgstr "--after" #. type: Plain text #: en/git-svn.txt:423 @@ -50397,9 +50379,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:424 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'set-tree'" -msgstr "" +msgstr "'set-tree'" #. type: Plain text #: en/git-svn.txt:432 @@ -50409,9 +50391,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:433 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'create-ignore'" -msgstr "" +msgstr "'create-ignore'" #. type: Plain text #: en/git-svn.txt:438 @@ -50421,9 +50403,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:439 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'show-ignore'" -msgstr "" +msgstr "'show-ignore'" #. type: Plain text #: en/git-svn.txt:443 @@ -50433,9 +50415,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:444 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'mkdirs'" -msgstr "" +msgstr "'mkdirs'" #. type: Plain text #: en/git-svn.txt:452 @@ -50445,9 +50427,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:453 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'commit-diff'" -msgstr "" +msgstr "'commit-diff'" #. type: Plain text #: en/git-svn.txt:462 @@ -50726,9 +50708,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:602 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--rmdir" -msgstr "" +msgstr "--rmdir" #. type: Plain text #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628 @@ -50890,9 +50872,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:702 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--use-log-author" -msgstr "" +msgstr "--use-log-author" #. type: Plain text #: en/git-svn.txt:706 @@ -50908,9 +50890,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:710 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--add-author-from" -msgstr "" +msgstr "--add-author-from" #. type: Plain text #: en/git-svn.txt:716 @@ -50968,9 +50950,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:736 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--follow-parent" -msgstr "" +msgstr "--follow-parent" #. type: Plain text #: en/git-svn.txt:751 @@ -51166,7 +51148,7 @@ msgstr "" #. type: delimited block - #: en/git-svn.txt:877 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "# Clone a repo (like git clone):\n" "\tgit svn clone http://svn.example.com/project/trunk\n" @@ -51219,7 +51201,7 @@ msgstr "" #. type: delimited block - #: en/git-svn.txt:925 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "# Do the initial import on a server\n" "\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n" @@ -51529,9 +51511,9 @@ msgstr "" #. type: Title = #: en/git-switch.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-switch(1)" -msgstr "" +msgstr "git-switch(1)" #. type: Plain text #: en/git-switch.txt:7 @@ -51663,9 +51645,9 @@ msgstr "" #. type: Labeled list #: en/git-switch.txt:114 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--discard-changes" -msgstr "" +msgstr "--discard-changes" #. type: Plain text #: en/git-switch.txt:120 @@ -51824,15 +51806,15 @@ msgstr "" #. type: Plain text #: en/git-switch.txt:273 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-checkout[1], linkgit:git-branch[1]" -msgstr "" +msgstr "linkgit:git-checkout[1], linkgit:git-branch[1]" #. type: Title = #: en/git-symbolic-ref.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-symbolic-ref(1)" -msgstr "" +msgstr "git-symbolic-ref(1)" #. type: Plain text #: en/git-symbolic-ref.txt:7 @@ -51911,9 +51893,9 @@ msgstr "" #. type: Title = #: en/git-tag.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-tag(1)" -msgstr "" +msgstr "git-tag(1)" #. type: Plain text #: en/git-tag.txt:7 @@ -51923,7 +51905,7 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:20 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]\n" "\t<tagname> [<commit> | <object>]\n" @@ -51991,9 +51973,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:65 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--sign" -msgstr "" +msgstr "--sign" #. type: Plain text #: en/git-tag.txt:70 @@ -52003,9 +51985,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:71 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-sign" -msgstr "" +msgstr "--no-sign" #. type: Plain text #: en/git-tag.txt:74 @@ -52069,7 +52051,7 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:103 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)." msgstr "" @@ -52359,13 +52341,13 @@ msgstr "" #. type: delimited block - #: en/git-tag.txt:319 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "\tgit://git..../proj.git master\n" msgstr "" #. type: delimited block - #: en/git-tag.txt:321 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "to get the following updates...\n" msgstr "" @@ -52377,7 +52359,7 @@ msgstr "" #. type: delimited block - #: en/git-tag.txt:327 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "$ git pull git://git..../proj.git master\n" msgstr "" @@ -52497,7 +52479,7 @@ msgstr "" #. type: Plain text #: en/git.txt:55 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`." msgstr "" @@ -52541,7 +52523,7 @@ msgstr "" #. type: Plain text #: en/git.txt:82 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`." msgstr "" @@ -52559,9 +52541,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--html-path" -msgstr "" +msgstr "--html-path" #. type: Plain text #: en/git.txt:92 @@ -52571,9 +52553,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:93 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--man-path" -msgstr "" +msgstr "--man-path" #. type: Plain text #: en/git.txt:96 @@ -52583,9 +52565,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:97 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--info-path" -msgstr "" +msgstr "--info-path" #. type: Plain text #: en/git.txt:100 @@ -52595,9 +52577,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:102 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--paginate" -msgstr "" +msgstr "--paginate" #. type: Plain text #: en/git.txt:107 @@ -52607,9 +52589,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:109 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-pager" -msgstr "" +msgstr "--no-pager" #. type: Plain text #: en/git.txt:111 @@ -52685,9 +52667,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:154 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-replace-objects" -msgstr "" +msgstr "--no-replace-objects" #. type: Plain text #: en/git.txt:157 @@ -52697,9 +52679,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:158 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--literal-pathspecs" -msgstr "" +msgstr "--literal-pathspecs" #. type: Plain text #: en/git.txt:162 @@ -52709,9 +52691,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:163 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--glob-pathspecs" -msgstr "" +msgstr "--glob-pathspecs" #. type: Plain text #: en/git.txt:168 @@ -52721,9 +52703,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:169 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--noglob-pathspecs" -msgstr "" +msgstr "--noglob-pathspecs" #. type: Plain text #: en/git.txt:174 @@ -52733,9 +52715,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:175 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--icase-pathspecs" -msgstr "" +msgstr "--icase-pathspecs" #. type: Plain text #: en/git.txt:178 @@ -52745,9 +52727,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:179 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-optional-locks" -msgstr "" +msgstr "--no-optional-locks" #. type: Plain text #: en/git.txt:182 @@ -52757,7 +52739,7 @@ msgstr "" #. type: Labeled list #: en/git.txt:183 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "--list-cmds=group[,group...]" msgstr "" @@ -53142,9 +53124,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:424 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_INDEX_FILE`" -msgstr "" +msgstr "`GIT_INDEX_FILE`" #. type: Plain text #: en/git.txt:428 @@ -53154,9 +53136,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:429 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_INDEX_VERSION`" -msgstr "" +msgstr "`GIT_INDEX_VERSION`" #. type: Plain text #: en/git.txt:434 @@ -53166,9 +53148,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:435 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_OBJECT_DIRECTORY`" -msgstr "" +msgstr "`GIT_OBJECT_DIRECTORY`" #. type: Plain text #: en/git.txt:440 @@ -53178,9 +53160,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:441 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`" -msgstr "" +msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`" #. type: Plain text #: en/git.txt:447 @@ -53196,9 +53178,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:454 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_DIR`" -msgstr "" +msgstr "`GIT_DIR`" #. type: Plain text #: en/git.txt:459 @@ -53208,9 +53190,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:460 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_WORK_TREE`" -msgstr "" +msgstr "`GIT_WORK_TREE`" #. type: Plain text #: en/git.txt:464 @@ -53220,9 +53202,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:465 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_NAMESPACE`" -msgstr "" +msgstr "`GIT_NAMESPACE`" #. type: Plain text #: en/git.txt:468 @@ -53232,9 +53214,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:469 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_CEILING_DIRECTORIES`" -msgstr "" +msgstr "`GIT_CEILING_DIRECTORIES`" #. type: Plain text #: en/git.txt:483 @@ -53244,9 +53226,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:484 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`" -msgstr "" +msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`" #. type: Plain text #: en/git.txt:493 @@ -53256,21 +53238,21 @@ msgstr "" #. type: Labeled list #: en/git.txt:494 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_COMMON_DIR`" -msgstr "" +msgstr "`GIT_COMMON_DIR`" #. type: Plain text #: en/git.txt:502 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..." msgstr "" #. type: Labeled list #: en/git.txt:503 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_DEFAULT_HASH`" -msgstr "" +msgstr "`GIT_DEFAULT_HASH`" #. type: Plain text #: en/git.txt:509 @@ -53286,9 +53268,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:512 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_AUTHOR_NAME`" -msgstr "" +msgstr "`GIT_AUTHOR_NAME`" #. type: Plain text #: en/git.txt:516 @@ -53298,9 +53280,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:517 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_AUTHOR_EMAIL`" -msgstr "" +msgstr "`GIT_AUTHOR_EMAIL`" #. type: Plain text #: en/git.txt:521 @@ -53310,9 +53292,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:522 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_AUTHOR_DATE`" -msgstr "" +msgstr "`GIT_AUTHOR_DATE`" #. type: Plain text #: en/git.txt:525 @@ -53322,9 +53304,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:526 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_COMMITTER_NAME`" -msgstr "" +msgstr "`GIT_COMMITTER_NAME`" #. type: Plain text #: en/git.txt:530 @@ -53334,9 +53316,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:531 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_COMMITTER_EMAIL`" -msgstr "" +msgstr "`GIT_COMMITTER_EMAIL`" #. type: Plain text #: en/git.txt:535 @@ -53346,9 +53328,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:536 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_COMMITTER_DATE`" -msgstr "" +msgstr "`GIT_COMMITTER_DATE`" #. type: Plain text #: en/git.txt:539 @@ -53358,9 +53340,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:540 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`EMAIL`" -msgstr "" +msgstr "`EMAIL`" #. type: Plain text #: en/git.txt:543 @@ -53376,9 +53358,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:546 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_DIFF_OPTS`" -msgstr "" +msgstr "`GIT_DIFF_OPTS`" #. type: Plain text #: en/git.txt:551 @@ -53388,9 +53370,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:552 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_EXTERNAL_DIFF`" -msgstr "" +msgstr "`GIT_EXTERNAL_DIFF`" #. type: Plain text #: en/git.txt:558 @@ -53466,9 +53448,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:580 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_DIFF_PATH_COUNTER`" -msgstr "" +msgstr "`GIT_DIFF_PATH_COUNTER`" #. type: Plain text #: en/git.txt:582 @@ -53478,9 +53460,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:583 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_DIFF_PATH_TOTAL`" -msgstr "" +msgstr "`GIT_DIFF_PATH_TOTAL`" #. type: Plain text #: en/git.txt:585 @@ -53490,9 +53472,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:588 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_MERGE_VERBOSITY`" -msgstr "" +msgstr "`GIT_MERGE_VERBOSITY`" #. type: Plain text #: en/git.txt:592 @@ -53502,9 +53484,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:593 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PAGER`" -msgstr "" +msgstr "`GIT_PAGER`" #. type: Plain text #: en/git.txt:598 @@ -53514,9 +53496,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:599 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PROGRESS_DELAY`" -msgstr "" +msgstr "`GIT_PROGRESS_DELAY`" #. type: Plain text #: en/git.txt:602 @@ -53526,9 +53508,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:603 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_EDITOR`" -msgstr "" +msgstr "`GIT_EDITOR`" #. type: Plain text #: en/git.txt:608 @@ -53538,9 +53520,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:609 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_SEQUENCE_EDITOR`" -msgstr "" +msgstr "`GIT_SEQUENCE_EDITOR`" #. type: Plain text #: en/git.txt:614 @@ -53550,15 +53532,15 @@ msgstr "" #. type: Labeled list #: en/git.txt:615 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_SSH`" -msgstr "" +msgstr "`GIT_SSH`" #. type: Labeled list #: en/git.txt:616 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_SSH_COMMAND`" -msgstr "" +msgstr "`GIT_SSH_COMMAND`" #. type: Plain text #: en/git.txt:623 @@ -53580,9 +53562,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:634 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_SSH_VARIANT`" -msgstr "" +msgstr "`GIT_SSH_VARIANT`" #. type: Plain text #: en/git.txt:639 @@ -53592,9 +53574,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:640 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_ASKPASS`" -msgstr "" +msgstr "`GIT_ASKPASS`" #. type: Plain text #: en/git.txt:646 @@ -53604,9 +53586,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:647 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TERMINAL_PROMPT`" -msgstr "" +msgstr "`GIT_TERMINAL_PROMPT`" #. type: Plain text #: en/git.txt:650 @@ -53616,9 +53598,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:651 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_CONFIG_NOSYSTEM`" -msgstr "" +msgstr "`GIT_CONFIG_NOSYSTEM`" #. type: Plain text #: en/git.txt:658 @@ -53628,9 +53610,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:659 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_FLUSH`" -msgstr "" +msgstr "`GIT_FLUSH`" #. type: Plain text #: en/git.txt:669 @@ -53649,9 +53631,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:670 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE`" -msgstr "" +msgstr "`GIT_TRACE`" #. type: Plain text #: en/git.txt:673 @@ -53685,9 +53667,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:691 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_FSMONITOR`" -msgstr "" +msgstr "`GIT_TRACE_FSMONITOR`" #. type: Plain text #: en/git.txt:694 @@ -53697,9 +53679,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:695 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_PACK_ACCESS`" -msgstr "" +msgstr "`GIT_TRACE_PACK_ACCESS`" #. type: Plain text #: en/git.txt:701 @@ -53709,9 +53691,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:702 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_PACKET`" -msgstr "" +msgstr "`GIT_TRACE_PACKET`" #. type: Plain text #: en/git.txt:708 @@ -53721,9 +53703,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:709 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_PACKFILE`" -msgstr "" +msgstr "`GIT_TRACE_PACKFILE`" #. type: Plain text #: en/git.txt:716 @@ -53739,9 +53721,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:720 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_PERFORMANCE`" -msgstr "" +msgstr "`GIT_TRACE_PERFORMANCE`" #. type: Plain text #: en/git.txt:724 @@ -53751,9 +53733,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:725 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_REFS`" -msgstr "" +msgstr "`GIT_TRACE_REFS`" #. type: Plain text #: en/git.txt:728 @@ -53763,9 +53745,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:729 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_SETUP`" -msgstr "" +msgstr "`GIT_TRACE_SETUP`" #. type: Plain text #: en/git.txt:733 @@ -53775,9 +53757,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:734 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_SHALLOW`" -msgstr "" +msgstr "`GIT_TRACE_SHALLOW`" #. type: Plain text #: en/git.txt:738 @@ -53787,9 +53769,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:739 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_CURL`" -msgstr "" +msgstr "`GIT_TRACE_CURL`" #. type: Plain text #: en/git.txt:744 @@ -53799,9 +53781,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:745 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_CURL_NO_DATA`" -msgstr "" +msgstr "`GIT_TRACE_CURL_NO_DATA`" #. type: Plain text #: en/git.txt:748 @@ -53811,9 +53793,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:749 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE2`" -msgstr "" +msgstr "`GIT_TRACE2`" #. type: Plain text #: en/git.txt:753 @@ -53841,9 +53823,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:784 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE2_EVENT`" -msgstr "" +msgstr "`GIT_TRACE2_EVENT`" #. type: Plain text #: en/git.txt:789 @@ -53853,9 +53835,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:790 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE2_PERF`" -msgstr "" +msgstr "`GIT_TRACE2_PERF`" #. type: Plain text #: en/git.txt:796 @@ -53865,9 +53847,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:797 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_TRACE_REDACT`" -msgstr "" +msgstr "`GIT_TRACE_REDACT`" #. type: Plain text #: en/git.txt:801 @@ -53877,9 +53859,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:802 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_LITERAL_PATHSPECS`" -msgstr "" +msgstr "`GIT_LITERAL_PATHSPECS`" #. type: Plain text #: en/git.txt:810 @@ -53889,9 +53871,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:811 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_GLOB_PATHSPECS`" -msgstr "" +msgstr "`GIT_GLOB_PATHSPECS`" #. type: Plain text #: en/git.txt:814 @@ -53901,9 +53883,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:815 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_NOGLOB_PATHSPECS`" -msgstr "" +msgstr "`GIT_NOGLOB_PATHSPECS`" #. type: Plain text #: en/git.txt:818 @@ -53913,9 +53895,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:819 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_ICASE_PATHSPECS`" -msgstr "" +msgstr "`GIT_ICASE_PATHSPECS`" #. type: Plain text #: en/git.txt:822 @@ -53925,9 +53907,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:823 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_REFLOG_ACTION`" -msgstr "" +msgstr "`GIT_REFLOG_ACTION`" #. type: Plain text #: en/git.txt:832 @@ -53937,9 +53919,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:833 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_REF_PARANOIA`" -msgstr "" +msgstr "`GIT_REF_PARANOIA`" #. type: Plain text #: en/git.txt:843 @@ -53949,9 +53931,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:844 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_ALLOW_PROTOCOL`" -msgstr "" +msgstr "`GIT_ALLOW_PROTOCOL`" #. type: Plain text #: en/git.txt:852 @@ -53961,9 +53943,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:853 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PROTOCOL_FROM_USER`" -msgstr "" +msgstr "`GIT_PROTOCOL_FROM_USER`" #. type: Plain text #: en/git.txt:859 @@ -53973,9 +53955,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:860 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_PROTOCOL`" -msgstr "" +msgstr "`GIT_PROTOCOL`" #. type: Plain text #: en/git.txt:865 @@ -53985,9 +53967,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:866 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_OPTIONAL_LOCKS`" -msgstr "" +msgstr "`GIT_OPTIONAL_LOCKS`" #. type: Plain text #: en/git.txt:873 @@ -53997,21 +53979,21 @@ msgstr "" #. type: Labeled list #: en/git.txt:874 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_REDIRECT_STDIN`" -msgstr "" +msgstr "`GIT_REDIRECT_STDIN`" #. type: Labeled list #: en/git.txt:875 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_REDIRECT_STDOUT`" -msgstr "" +msgstr "`GIT_REDIRECT_STDOUT`" #. type: Labeled list #: en/git.txt:876 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`GIT_REDIRECT_STDERR`" -msgstr "" +msgstr "`GIT_REDIRECT_STDERR`" #. type: Plain text #: en/git.txt:886 @@ -54183,9 +54165,9 @@ msgstr "" #. type: Title = #: en/git-unpack-file.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-unpack-file(1)" -msgstr "" +msgstr "git-unpack-file(1)" #. type: Plain text #: en/git-unpack-file.txt:7 @@ -54216,9 +54198,9 @@ msgstr "" #. type: Title = #: en/git-unpack-objects.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-unpack-objects(1)" -msgstr "" +msgstr "git-unpack-objects(1)" #. type: Plain text #: en/git-unpack-objects.txt:7 @@ -54276,9 +54258,9 @@ msgstr "" #. type: Title = #: en/git-update-index.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-update-index(1)" -msgstr "" +msgstr "git-update-index(1)" #. type: Plain text #: en/git-update-index.txt:7 @@ -54288,7 +54270,7 @@ msgstr "" #. type: Plain text #: en/git-update-index.txt:30 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git update-index'\n" "\t [--add] [--remove | --force-remove] [--replace]\n" @@ -54336,9 +54318,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:50 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--remove" -msgstr "" +msgstr "--remove" #. type: Plain text #: en/git-update-index.txt:54 @@ -54360,9 +54342,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-submodules" -msgstr "" +msgstr "--ignore-submodules" #. type: Plain text #: en/git-update-index.txt:67 @@ -54402,9 +54384,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:83 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--index-info" -msgstr "" +msgstr "--index-info" #. type: Plain text #: en/git-update-index.txt:85 @@ -54420,9 +54402,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]assume-unchanged" -msgstr "" +msgstr "--[no-]assume-unchanged" #. type: Plain text #: en/git-update-index.txt:101 @@ -54438,9 +54420,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:107 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--really-refresh" -msgstr "" +msgstr "--really-refresh" #. type: Plain text #: en/git-update-index.txt:110 @@ -54450,9 +54432,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:111 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]skip-worktree" -msgstr "" +msgstr "--[no-]skip-worktree" #. type: Plain text #: en/git-update-index.txt:116 @@ -54462,9 +54444,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:118 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]ignore-skip-worktree-entries" -msgstr "" +msgstr "--[no-]ignore-skip-worktree-entries" #. type: Plain text #: en/git-update-index.txt:121 @@ -54474,9 +54456,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:122 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]fsmonitor-valid" -msgstr "" +msgstr "--[no-]fsmonitor-valid" #. type: Plain text #: en/git-update-index.txt:127 @@ -54486,9 +54468,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:129 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--again" -msgstr "" +msgstr "--again" #. type: Plain text #: en/git-update-index.txt:132 @@ -54498,9 +54480,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:133 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unresolve" -msgstr "" +msgstr "--unresolve" #. type: Plain text #: en/git-update-index.txt:136 @@ -54510,9 +54492,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:137 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--info-only" -msgstr "" +msgstr "--info-only" #. type: Plain text #: en/git-update-index.txt:141 @@ -54522,9 +54504,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--force-remove" -msgstr "" +msgstr "--force-remove" #. type: Plain text #: en/git-update-index.txt:145 @@ -54534,9 +54516,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:146 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--replace" -msgstr "" +msgstr "--replace" #. type: Plain text #: en/git-update-index.txt:153 @@ -54576,15 +54558,15 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:178 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--split-index" -msgstr "" +msgstr "--split-index" #. type: Labeled list #: en/git-update-index.txt:179 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-split-index" -msgstr "" +msgstr "--no-split-index" #. type: Plain text #: en/git-update-index.txt:184 @@ -54600,15 +54582,15 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:191 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--untracked-cache" -msgstr "" +msgstr "--untracked-cache" #. type: Labeled list #: en/git-update-index.txt:192 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-untracked-cache" -msgstr "" +msgstr "--no-untracked-cache" #. type: Plain text #: en/git-update-index.txt:195 @@ -54624,9 +54606,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:202 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--test-untracked-cache" -msgstr "" +msgstr "--test-untracked-cache" #. type: Plain text #: en/git-update-index.txt:211 @@ -54636,9 +54618,9 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:212 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--force-untracked-cache" -msgstr "" +msgstr "--force-untracked-cache" #. type: Plain text #: en/git-update-index.txt:217 @@ -54648,15 +54630,15 @@ msgstr "" #. type: Labeled list #: en/git-update-index.txt:218 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--fsmonitor" -msgstr "" +msgstr "--fsmonitor" #. type: Labeled list #: en/git-update-index.txt:219 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-fsmonitor" -msgstr "" +msgstr "--no-fsmonitor" #. type: Plain text #: en/git-update-index.txt:226 @@ -54843,7 +54825,7 @@ msgstr "" #. type: Plain text #: en/git-update-index.txt:354 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want to mark them as \"assume unchanged\")." msgstr "" @@ -55145,15 +55127,15 @@ msgstr "" #. type: Plain text #: en/git-update-index.txt:573 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]" -msgstr "" +msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]" #. type: Title = #: en/git-update-ref.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-update-ref(1)" -msgstr "" +msgstr "git-update-ref(1)" #. type: Plain text #: en/git-update-ref.txt:7 @@ -55313,9 +55295,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:112 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "delete" -msgstr "" +msgstr "delete" #. type: Plain text #: en/git-update-ref.txt:115 @@ -55325,9 +55307,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:116 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "verify" -msgstr "" +msgstr "verify" #. type: Plain text #: en/git-update-ref.txt:119 @@ -55337,9 +55319,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:120 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "option" -msgstr "" +msgstr "option" #. type: Plain text #: en/git-update-ref.txt:124 @@ -55439,9 +55421,9 @@ msgstr "" #. type: Title = #: en/git-update-server-info.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-update-server-info(1)" -msgstr "" +msgstr "git-update-server-info(1)" #. type: Plain text #: en/git-update-server-info.txt:7 @@ -55481,9 +55463,9 @@ msgstr "" #. type: Title = #: en/git-upload-archive.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-upload-archive(1)" -msgstr "" +msgstr "git-upload-archive(1)" #. type: Plain text #: en/git-upload-archive.txt:7 @@ -55559,9 +55541,9 @@ msgstr "" #. type: Title = #: en/git-upload-pack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-upload-pack(1)" -msgstr "" +msgstr "git-upload-pack(1)" #. type: Plain text #: en/git-upload-pack.txt:7 @@ -55591,9 +55573,9 @@ msgstr "" #. type: Labeled list #: en/git-upload-pack.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]strict" -msgstr "" +msgstr "--[no-]strict" #. type: Plain text #: en/git-upload-pack.txt:30 @@ -55609,9 +55591,9 @@ msgstr "" #. type: Labeled list #: en/git-upload-pack.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stateless-rpc" -msgstr "" +msgstr "--stateless-rpc" #. type: Plain text #: en/git-upload-pack.txt:38 @@ -55621,9 +55603,9 @@ msgstr "" #. type: Labeled list #: en/git-upload-pack.txt:39 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--advertise-refs" -msgstr "" +msgstr "--advertise-refs" #. type: Plain text #: en/git-upload-pack.txt:43 @@ -55639,15 +55621,15 @@ msgstr "" #. type: Plain text #: en/git-upload-pack.txt:50 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitnamespaces[7]" -msgstr "" +msgstr "linkgit:gitnamespaces[7]" #. type: Title = #: en/git-var.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-var(1)" -msgstr "" +msgstr "git-var(1)" #. type: Plain text #: en/git-var.txt:7 @@ -55689,9 +55671,9 @@ msgstr "" #. type: Labeled list #: en/git-var.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_AUTHOR_IDENT" -msgstr "" +msgstr "GIT_AUTHOR_IDENT" #. type: Plain text #: en/git-var.txt:36 @@ -55701,9 +55683,9 @@ msgstr "" #. type: Labeled list #: en/git-var.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_COMMITTER_IDENT" -msgstr "" +msgstr "GIT_COMMITTER_IDENT" #. type: Plain text #: en/git-var.txt:39 @@ -55713,9 +55695,9 @@ msgstr "" #. type: Labeled list #: en/git-var.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_EDITOR" -msgstr "" +msgstr "GIT_EDITOR" #. type: Plain text #: en/git-var.txt:48 @@ -55731,9 +55713,9 @@ msgstr "" #. type: Labeled list #: en/git-var.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "GIT_PAGER" -msgstr "" +msgstr "GIT_PAGER" #. type: Plain text #: en/git-var.txt:58 @@ -55749,15 +55731,15 @@ msgstr "" #. type: Plain text #: en/git-var.txt:67 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]" #. type: Title = #: en/git-verify-commit.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-verify-commit(1)" -msgstr "" +msgstr "git-verify-commit(1)" #. type: Plain text #: en/git-verify-commit.txt:7 @@ -55767,7 +55749,7 @@ msgstr "" #. type: Plain text #: en/git-verify-commit.txt:12 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git verify-commit' <commit>...\n" msgstr "" @@ -55797,9 +55779,9 @@ msgstr "" #. type: Title = #: en/git-verify-pack.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-verify-pack(1)" -msgstr "" +msgstr "git-verify-pack(1)" #. type: Plain text #: en/git-verify-pack.txt:7 @@ -55809,7 +55791,7 @@ msgstr "" #. type: Plain text #: en/git-verify-pack.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n" msgstr "" @@ -55821,7 +55803,7 @@ msgstr "" #. type: Labeled list #: en/git-verify-pack.txt:23 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<pack>.idx ..." msgstr "" @@ -55839,9 +55821,9 @@ msgstr "" #. type: Labeled list #: en/git-verify-pack.txt:32 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--stat-only" -msgstr "" +msgstr "--stat-only" #. type: Plain text #: en/git-verify-pack.txt:35 @@ -55887,9 +55869,9 @@ msgstr "" #. type: Title = #: en/git-verify-tag.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-verify-tag(1)" -msgstr "" +msgstr "git-verify-tag(1)" #. type: Plain text #: en/git-verify-tag.txt:7 @@ -55899,7 +55881,7 @@ msgstr "" #. type: Plain text #: en/git-verify-tag.txt:12 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git verify-tag' [--format=<format>] <tag>...\n" msgstr "" @@ -55917,7 +55899,7 @@ msgstr "" #. type: Labeled list #: en/git-verify-tag.txt:27 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "<tag>..." msgstr "" @@ -55941,7 +55923,7 @@ msgstr "" #. type: Plain text #: en/git-web--browse.txt:12 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git web{litdd}browse' [<options>] <url|file>...\n" msgstr "" @@ -56203,9 +56185,9 @@ msgstr "" #. type: Title = #: en/git-whatchanged.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-whatchanged(1)" -msgstr "" +msgstr "git-whatchanged(1)" #. type: Plain text #: en/git-whatchanged.txt:7 @@ -56215,7 +56197,7 @@ msgstr "" #. type: Plain text #: en/git-whatchanged.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git whatchanged' <option>...\n" msgstr "" @@ -56263,9 +56245,9 @@ msgstr "" #. type: Title = #: en/git-worktree.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-worktree(1)" -msgstr "" +msgstr "git-worktree(1)" #. type: Plain text #: en/git-worktree.txt:7 @@ -56275,7 +56257,7 @@ msgstr "" #. type: Plain text #: en/git-worktree.txt:20 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]\n" "'git worktree list' [--porcelain]\n" @@ -56361,9 +56343,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:103 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:110 @@ -56373,9 +56355,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:111 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:118 @@ -56397,7 +56379,7 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:130 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "repair [<path>...]" msgstr "" @@ -56421,9 +56403,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:147 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:150 @@ -56475,9 +56457,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:185 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--[no-]checkout" -msgstr "" +msgstr "--[no-]checkout" #. type: Plain text #: en/git-worktree.txt:190 @@ -56487,9 +56469,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:191 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--[no-]guess-remote" -msgstr "" +msgstr "--[no-]guess-remote" #. type: Plain text #: en/git-worktree.txt:197 @@ -56505,9 +56487,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:201 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--[no-]track" -msgstr "" +msgstr "--[no-]track" #. type: Plain text #: en/git-worktree.txt:206 @@ -56517,9 +56499,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:207 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--lock" -msgstr "" +msgstr "--lock" #. type: Plain text #: en/git-worktree.txt:211 @@ -56782,7 +56764,7 @@ msgstr "" #. type: delimited block - #: en/git-worktree.txt:411 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git worktree add -b emergency-fix ../temp master\n" "$ pushd ../temp\n" @@ -56800,9 +56782,9 @@ msgstr "" #. type: Title = #: en/git-write-tree.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-write-tree(1)" -msgstr "" +msgstr "git-write-tree(1)" #. type: Plain text #: en/git-write-tree.txt:7 @@ -56836,9 +56818,9 @@ msgstr "" #. type: Labeled list #: en/git-write-tree.txt:30 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--missing-ok" -msgstr "" +msgstr "--missing-ok" #. type: Plain text #: en/git-write-tree.txt:34 @@ -56854,9 +56836,9 @@ msgstr "" #. type: Title = #: en/gitglossary.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "gitglossary(7)" -msgstr "" +msgstr "gitglossary(7)" #. type: Plain text #: en/gitglossary.txt:7 @@ -57916,7 +57898,7 @@ msgstr "" #. type: Plain text #: en/glossary-content.txt:572 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." msgstr "" @@ -58412,9 +58394,9 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:44 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ff-only" -msgstr "" +msgstr "--ff-only" #. type: Plain text #: en/merge-options.txt:50 @@ -58472,15 +58454,15 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:91 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--squash" -msgstr "" +msgstr "--squash" #. type: Labeled list #: en/merge-options.txt:92 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-squash" -msgstr "" +msgstr "--no-squash" #. type: Plain text #: en/merge-options.txt:100 @@ -58526,15 +58508,15 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:123 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--verify-signatures" -msgstr "" +msgstr "--verify-signatures" #. type: Labeled list #: en/merge-options.txt:124 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-verify-signatures" -msgstr "" +msgstr "--no-verify-signatures" #. type: Plain text #: en/merge-options.txt:130 @@ -58544,9 +58526,9 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:132 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-summary" -msgstr "" +msgstr "--no-summary" #. type: Plain text #: en/merge-options.txt:135 @@ -58574,9 +58556,9 @@ msgstr "" #. type: Labeled list #: en/merge-options.txt:162 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--allow-unrelated-histories" -msgstr "" +msgstr "--allow-unrelated-histories" #. type: Plain text #: en/merge-options.txt:168 @@ -58598,9 +58580,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:9 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "resolve" -msgstr "" +msgstr "resolve" #. type: Plain text #: en/merge-strategies.txt:15 @@ -58610,9 +58592,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:16 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "recursive" -msgstr "" +msgstr "recursive" #. type: Plain text #: en/merge-strategies.txt:29 @@ -58628,9 +58610,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:32 en/merge-strategies.txt:115 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "ours" -msgstr "" +msgstr "ours" #. type: Plain text #: en/merge-strategies.txt:37 @@ -58646,9 +58628,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:42 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "theirs" -msgstr "" +msgstr "theirs" #. type: Plain text #: en/merge-strategies.txt:45 @@ -58658,9 +58640,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:46 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "patience" -msgstr "" +msgstr "patience" #. type: Plain text #: en/merge-strategies.txt:52 @@ -58670,9 +58652,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:53 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "diff-algorithm=[patience|minimal|histogram|myers]" -msgstr "" +msgstr "diff-algorithm=[patience|minimal|histogram|myers]" #. type: Plain text #: en/merge-strategies.txt:58 @@ -58682,9 +58664,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:62 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "ignore-cr-at-eol" -msgstr "" +msgstr "ignore-cr-at-eol" #. type: Plain text #: en/merge-strategies.txt:68 @@ -58712,9 +58694,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:75 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "renormalize" -msgstr "" +msgstr "renormalize" #. type: Plain text #: en/merge-strategies.txt:82 @@ -58724,9 +58706,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:83 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "no-renormalize" -msgstr "" +msgstr "no-renormalize" #. type: Plain text #: en/merge-strategies.txt:86 @@ -58736,9 +58718,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:87 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "no-renames" -msgstr "" +msgstr "no-renames" #. type: Plain text #: en/merge-strategies.txt:91 @@ -58784,9 +58766,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:108 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "octopus" -msgstr "" +msgstr "octopus" #. type: Plain text #: en/merge-strategies.txt:114 @@ -58802,9 +58784,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:123 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "subtree" -msgstr "" +msgstr "subtree" #. type: Plain text #: en/merge-strategies.txt:129 @@ -58820,99 +58802,99 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:2 -#, priority:240 +#, ignore-same, priority:240 msgid "araxis" -msgstr "" +msgstr "araxis" #. type: Plain text #: en/mergetools-merge.txt:3 -#, priority:240 +#, ignore-same, priority:240 msgid "bc" -msgstr "" +msgstr "bc" #. type: Plain text #: en/mergetools-merge.txt:4 -#, priority:240 +#, ignore-same, priority:240 msgid "bc3" -msgstr "" +msgstr "bc3" #. type: Plain text #: en/mergetools-merge.txt:5 -#, priority:240 +#, ignore-same, priority:240 msgid "codecompare" -msgstr "" +msgstr "codecompare" #. type: Plain text #: en/mergetools-merge.txt:6 -#, priority:240 +#, ignore-same, priority:240 msgid "deltawalker" -msgstr "" +msgstr "deltawalker" #. type: Plain text #: en/mergetools-merge.txt:7 -#, priority:240 +#, ignore-same, priority:240 msgid "diffmerge" -msgstr "" +msgstr "diffmerge" #. type: Plain text #: en/mergetools-merge.txt:8 -#, priority:240 +#, ignore-same, priority:240 msgid "diffuse" -msgstr "" +msgstr "diffuse" #. type: Plain text #: en/mergetools-merge.txt:9 -#, priority:240 +#, ignore-same, priority:240 msgid "ecmerge" -msgstr "" +msgstr "ecmerge" #. type: Plain text #: en/mergetools-merge.txt:10 -#, priority:240 +#, ignore-same, priority:240 msgid "emerge" -msgstr "" +msgstr "emerge" #. type: Plain text #: en/mergetools-merge.txt:11 -#, priority:240 +#, ignore-same, priority:240 msgid "examdiff" -msgstr "" +msgstr "examdiff" #. type: Plain text #: en/mergetools-merge.txt:12 -#, priority:240 +#, ignore-same, priority:240 msgid "guiffy" -msgstr "" +msgstr "guiffy" #. type: Plain text #: en/mergetools-merge.txt:13 -#, priority:240 +#, ignore-same, priority:240 msgid "gvimdiff" -msgstr "" +msgstr "gvimdiff" #. type: Plain text #: en/mergetools-merge.txt:14 -#, priority:240 +#, ignore-same, priority:240 msgid "gvimdiff2" -msgstr "" +msgstr "gvimdiff2" #. type: Plain text #: en/mergetools-merge.txt:15 -#, priority:240 +#, ignore-same, priority:240 msgid "gvimdiff3" -msgstr "" +msgstr "gvimdiff3" #. type: Plain text #: en/mergetools-merge.txt:16 -#, priority:240 +#, ignore-same, priority:240 msgid "kdiff3" -msgstr "" +msgstr "kdiff3" #. type: Plain text #: en/mergetools-merge.txt:17 -#, priority:240 +#, ignore-same, priority:240 msgid "meld" -msgstr "" +msgstr "meld" #. type: Plain text #: en/mergetools-merge.txt:18 @@ -58934,63 +58916,63 @@ msgstr "" #. type: Plain text #: en/mergetools-merge.txt:21 -#, priority:240 +#, ignore-same, priority:240 msgid "opendiff" -msgstr "" +msgstr "opendiff" #. type: Plain text #: en/mergetools-merge.txt:22 -#, priority:240 +#, ignore-same, priority:240 msgid "p4merge" -msgstr "" +msgstr "p4merge" #. type: Plain text #: en/mergetools-merge.txt:23 -#, priority:240 +#, ignore-same, priority:240 msgid "smerge" -msgstr "" +msgstr "smerge" #. type: Plain text #: en/mergetools-merge.txt:24 -#, priority:240 +#, ignore-same, priority:240 msgid "tkdiff" -msgstr "" +msgstr "tkdiff" #. type: Plain text #: en/mergetools-merge.txt:25 -#, priority:240 +#, ignore-same, priority:240 msgid "tortoisemerge" -msgstr "" +msgstr "tortoisemerge" #. type: Plain text #: en/mergetools-merge.txt:26 -#, priority:240 +#, ignore-same, priority:240 msgid "vimdiff" -msgstr "" +msgstr "vimdiff" #. type: Plain text #: en/mergetools-merge.txt:27 -#, priority:240 +#, ignore-same, priority:240 msgid "vimdiff2" -msgstr "" +msgstr "vimdiff2" #. type: Plain text #: en/mergetools-merge.txt:28 -#, priority:240 +#, ignore-same, priority:240 msgid "vimdiff3" -msgstr "" +msgstr "vimdiff3" #. type: Plain text #: en/mergetools-merge.txt:29 -#, priority:240 +#, ignore-same, priority:240 msgid "winmerge" -msgstr "" +msgstr "winmerge" #. type: Plain text #: en/mergetools-merge.txt:29 -#, priority:240 +#, ignore-same, priority:240 msgid "xxdiff" -msgstr "" +msgstr "xxdiff" #. type: Title - #: en/pretty-formats.txt:2 @@ -59012,9 +58994,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:22 -#, priority:260 +#, ignore-same, priority:260 msgid "'oneline'" -msgstr "" +msgstr "'oneline'" #. type: Plain text #: en/pretty-formats.txt:24 @@ -59030,9 +59012,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:28 -#, priority:260 +#, ignore-same, priority:260 msgid "'short'" -msgstr "" +msgstr "'short'" #. type: Plain text #: en/pretty-formats.txt:31 @@ -59050,9 +59032,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:35 -#, priority:260 +#, ignore-same, priority:260 msgid "'medium'" -msgstr "" +msgstr "'medium'" #. type: Plain text #: en/pretty-formats.txt:39 @@ -59071,9 +59053,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:45 -#, priority:260 +#, ignore-same, priority:260 msgid "'full'" -msgstr "" +msgstr "'full'" #. type: Plain text #: en/pretty-formats.txt:49 @@ -59086,9 +59068,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:55 -#, priority:260 +#, ignore-same, priority:260 msgid "'fuller'" -msgstr "" +msgstr "'fuller'" #. type: Plain text #: en/pretty-formats.txt:61 @@ -59121,9 +59103,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:78 -#, priority:260 +#, ignore-same, priority:260 msgid "'email'" -msgstr "" +msgstr "'email'" #. type: Plain text #: en/pretty-formats.txt:83 @@ -59149,9 +59131,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:93 -#, priority:260 +#, ignore-same, priority:260 msgid "'raw'" -msgstr "" +msgstr "'raw'" #. type: Plain text #: en/pretty-formats.txt:103 @@ -59199,9 +59181,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:123 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%n'" -msgstr "" +msgstr "'%n'" #. type: Plain text #: en/pretty-formats.txt:124 @@ -59235,9 +59217,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:128 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%Cred'" -msgstr "" +msgstr "'%Cred'" #. type: Plain text #: en/pretty-formats.txt:129 @@ -59247,9 +59229,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:129 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%Cgreen'" -msgstr "" +msgstr "'%Cgreen'" #. type: Plain text #: en/pretty-formats.txt:130 @@ -59259,9 +59241,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:130 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%Cblue'" -msgstr "" +msgstr "'%Cblue'" #. type: Plain text #: en/pretty-formats.txt:131 @@ -59271,9 +59253,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:131 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%Creset'" -msgstr "" +msgstr "'%Creset'" #. type: Plain text #: en/pretty-formats.txt:132 @@ -59283,21 +59265,21 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:132 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "'%C(...)'" msgstr "" #. type: Plain text #: en/pretty-formats.txt:146 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again." msgstr "" #. type: Labeled list #: en/pretty-formats.txt:146 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%m'" -msgstr "" +msgstr "'%m'" #. type: Plain text #: en/pretty-formats.txt:147 @@ -59385,9 +59367,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:171 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%H'" -msgstr "" +msgstr "'%H'" #. type: Plain text #: en/pretty-formats.txt:172 @@ -59397,9 +59379,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:172 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%h'" -msgstr "" +msgstr "'%h'" #. type: Plain text #: en/pretty-formats.txt:173 @@ -59409,9 +59391,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:173 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%T'" -msgstr "" +msgstr "'%T'" #. type: Plain text #: en/pretty-formats.txt:174 @@ -59421,9 +59403,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:174 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%t'" -msgstr "" +msgstr "'%t'" #. type: Plain text #: en/pretty-formats.txt:175 @@ -59433,9 +59415,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:175 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%P'" -msgstr "" +msgstr "'%P'" #. type: Plain text #: en/pretty-formats.txt:176 @@ -59445,9 +59427,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:176 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%p'" -msgstr "" +msgstr "'%p'" #. type: Plain text #: en/pretty-formats.txt:177 @@ -59457,9 +59439,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:177 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%an'" -msgstr "" +msgstr "'%an'" #. type: Plain text #: en/pretty-formats.txt:178 @@ -59469,9 +59451,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:178 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%aN'" -msgstr "" +msgstr "'%aN'" #. type: Plain text #: en/pretty-formats.txt:180 @@ -59481,9 +59463,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:180 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ae'" -msgstr "" +msgstr "'%ae'" #. type: Plain text #: en/pretty-formats.txt:181 @@ -59493,9 +59475,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:181 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%aE'" -msgstr "" +msgstr "'%aE'" #. type: Plain text #: en/pretty-formats.txt:183 @@ -59505,9 +59487,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:183 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%al'" -msgstr "" +msgstr "'%al'" #. type: Plain text #: en/pretty-formats.txt:184 @@ -59517,9 +59499,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:184 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%aL'" -msgstr "" +msgstr "'%aL'" #. type: Plain text #: en/pretty-formats.txt:186 @@ -59529,9 +59511,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:186 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ad'" -msgstr "" +msgstr "'%ad'" #. type: Plain text #: en/pretty-formats.txt:187 @@ -59541,9 +59523,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:187 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%aD'" -msgstr "" +msgstr "'%aD'" #. type: Plain text #: en/pretty-formats.txt:188 @@ -59553,9 +59535,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:188 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ar'" -msgstr "" +msgstr "'%ar'" #. type: Plain text #: en/pretty-formats.txt:189 @@ -59565,9 +59547,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:189 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%at'" -msgstr "" +msgstr "'%at'" #. type: Plain text #: en/pretty-formats.txt:190 @@ -59577,9 +59559,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:190 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ai'" -msgstr "" +msgstr "'%ai'" #. type: Plain text #: en/pretty-formats.txt:191 @@ -59589,9 +59571,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:191 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%aI'" -msgstr "" +msgstr "'%aI'" #. type: Plain text #: en/pretty-formats.txt:192 @@ -59601,9 +59583,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:192 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%as'" -msgstr "" +msgstr "'%as'" #. type: Plain text #: en/pretty-formats.txt:193 @@ -59613,9 +59595,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:193 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cn'" -msgstr "" +msgstr "'%cn'" #. type: Plain text #: en/pretty-formats.txt:194 @@ -59625,9 +59607,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:194 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cN'" -msgstr "" +msgstr "'%cN'" #. type: Plain text #: en/pretty-formats.txt:196 @@ -59637,9 +59619,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:196 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ce'" -msgstr "" +msgstr "'%ce'" #. type: Plain text #: en/pretty-formats.txt:197 @@ -59649,9 +59631,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:197 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cE'" -msgstr "" +msgstr "'%cE'" #. type: Plain text #: en/pretty-formats.txt:199 @@ -59661,9 +59643,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:199 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cl'" -msgstr "" +msgstr "'%cl'" #. type: Plain text #: en/pretty-formats.txt:200 @@ -59673,9 +59655,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:200 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cL'" -msgstr "" +msgstr "'%cL'" #. type: Plain text #: en/pretty-formats.txt:202 @@ -59685,9 +59667,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:202 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cd'" -msgstr "" +msgstr "'%cd'" #. type: Plain text #: en/pretty-formats.txt:203 @@ -59697,9 +59679,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:203 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cD'" -msgstr "" +msgstr "'%cD'" #. type: Plain text #: en/pretty-formats.txt:204 @@ -59709,9 +59691,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:204 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cr'" -msgstr "" +msgstr "'%cr'" #. type: Plain text #: en/pretty-formats.txt:205 @@ -59721,9 +59703,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:205 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ct'" -msgstr "" +msgstr "'%ct'" #. type: Plain text #: en/pretty-formats.txt:206 @@ -59733,9 +59715,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:206 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ci'" -msgstr "" +msgstr "'%ci'" #. type: Plain text #: en/pretty-formats.txt:207 @@ -59745,9 +59727,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:207 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cI'" -msgstr "" +msgstr "'%cI'" #. type: Plain text #: en/pretty-formats.txt:208 @@ -59757,9 +59739,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:208 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%cs'" -msgstr "" +msgstr "'%cs'" #. type: Plain text #: en/pretty-formats.txt:209 @@ -59769,9 +59751,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:209 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%d'" -msgstr "" +msgstr "'%d'" #. type: Plain text #: en/pretty-formats.txt:210 @@ -59781,9 +59763,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:210 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%D'" -msgstr "" +msgstr "'%D'" #. type: Plain text #: en/pretty-formats.txt:211 @@ -59799,9 +59781,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:213 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%e'" -msgstr "" +msgstr "'%e'" #. type: Plain text #: en/pretty-formats.txt:214 @@ -59817,9 +59799,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:215 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%f'" -msgstr "" +msgstr "'%f'" #. type: Plain text #: en/pretty-formats.txt:216 @@ -59829,9 +59811,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:216 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%b'" -msgstr "" +msgstr "'%b'" #. type: Plain text #: en/pretty-formats.txt:217 @@ -59841,9 +59823,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:217 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%B'" -msgstr "" +msgstr "'%B'" #. type: Plain text #: en/pretty-formats.txt:218 @@ -59853,9 +59835,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:219 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%N'" -msgstr "" +msgstr "'%N'" #. type: Plain text #: en/pretty-formats.txt:220 @@ -59865,9 +59847,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:221 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%GG'" -msgstr "" +msgstr "'%GG'" #. type: Plain text #: en/pretty-formats.txt:222 @@ -59889,9 +59871,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:230 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%GS'" -msgstr "" +msgstr "'%GS'" #. type: Plain text #: en/pretty-formats.txt:231 @@ -59901,9 +59883,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:231 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%GK'" -msgstr "" +msgstr "'%GK'" #. type: Plain text #: en/pretty-formats.txt:232 @@ -59913,9 +59895,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:232 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%GF'" -msgstr "" +msgstr "'%GF'" #. type: Plain text #: en/pretty-formats.txt:233 @@ -59925,9 +59907,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:233 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%GP'" -msgstr "" +msgstr "'%GP'" #. type: Plain text #: en/pretty-formats.txt:235 @@ -59937,9 +59919,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:235 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%GT'" -msgstr "" +msgstr "'%GT'" #. type: Plain text #: en/pretty-formats.txt:236 @@ -59949,9 +59931,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:236 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%gD'" -msgstr "" +msgstr "'%gD'" #. type: Plain text #: en/pretty-formats.txt:241 @@ -59961,9 +59943,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:241 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%gd'" -msgstr "" +msgstr "'%gd'" #. type: Plain text #: en/pretty-formats.txt:244 @@ -59973,9 +59955,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:244 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%gn'" -msgstr "" +msgstr "'%gn'" #. type: Plain text #: en/pretty-formats.txt:245 @@ -59985,9 +59967,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:245 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%gN'" -msgstr "" +msgstr "'%gN'" #. type: Plain text #: en/pretty-formats.txt:247 @@ -59997,9 +59979,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:247 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%ge'" -msgstr "" +msgstr "'%ge'" #. type: Plain text #: en/pretty-formats.txt:248 @@ -60009,9 +59991,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:248 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%gE'" -msgstr "" +msgstr "'%gE'" #. type: Plain text #: en/pretty-formats.txt:250 @@ -60021,9 +60003,9 @@ msgstr "" #. type: Labeled list #: en/pretty-formats.txt:250 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "'%gs'" -msgstr "" +msgstr "'%gs'" #. type: Plain text #: en/pretty-formats.txt:251 @@ -60169,9 +60151,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:17 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--abbrev-commit" -msgstr "" +msgstr "--abbrev-commit" #. type: Plain text #: en/pretty-options.txt:22 @@ -60187,9 +60169,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:26 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-abbrev-commit" -msgstr "" +msgstr "--no-abbrev-commit" #. type: Plain text #: en/pretty-options.txt:30 @@ -60217,15 +60199,15 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:46 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--expand-tabs" -msgstr "" +msgstr "--expand-tabs" #. type: Labeled list #: en/pretty-options.txt:47 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-expand-tabs" -msgstr "" +msgstr "--no-expand-tabs" #. type: Plain text #: en/pretty-options.txt:54 @@ -60277,9 +60259,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:89 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--[no-]standard-notes" -msgstr "" +msgstr "--[no-]standard-notes" #. type: Plain text #: en/pretty-options.txt:92 @@ -60289,9 +60271,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:94 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--show-signature" -msgstr "" +msgstr "--show-signature" #. type: Plain text #: en/pretty-options.txt:96 @@ -60375,7 +60357,7 @@ msgstr "" #. type: Plain text #: en/pull-fetch-param.txt:62 -#, priority:220 +#, ignore-ellipsis, priority:220 msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below." msgstr "" @@ -60852,13 +60834,13 @@ msgstr "" #. type: Labeled list #: en/revisions.txt:283 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "The '...' (three-dot) Symmetric Difference Notation" msgstr "" #. type: Plain text #: en/revisions.txt:289 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both." msgstr "" @@ -60948,7 +60930,7 @@ msgstr "" #. type: Labeled list #: en/revisions.txt:334 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'<rev1>\\...<rev2>'" msgstr "" @@ -61002,7 +60984,7 @@ msgstr "" #. type: delimited block . #: en/revisions.txt:380 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " Args Expanded arguments Selected commits\n" " D G H D\n" @@ -61198,9 +61180,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:69 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--invert-grep" -msgstr "" +msgstr "--invert-grep" #. type: Plain text #: en/rev-list-options.txt:72 @@ -61210,9 +61192,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:74 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--regexp-ignore-case" -msgstr "" +msgstr "--regexp-ignore-case" #. type: Plain text #: en/rev-list-options.txt:77 @@ -61246,9 +61228,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:101 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--remove-empty" -msgstr "" +msgstr "--remove-empty" #. type: Plain text #: en/rev-list-options.txt:103 @@ -61258,9 +61240,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:104 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--merges" -msgstr "" +msgstr "--merges" #. type: Plain text #: en/rev-list-options.txt:106 @@ -61270,9 +61252,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:107 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-merges" -msgstr "" +msgstr "--no-merges" #. type: Plain text #: en/rev-list-options.txt:110 @@ -61294,15 +61276,15 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:113 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-min-parents" -msgstr "" +msgstr "--no-min-parents" #. type: Labeled list #: en/rev-list-options.txt:114 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-max-parents" -msgstr "" +msgstr "--no-max-parents" #. type: Plain text #: en/rev-list-options.txt:119 @@ -61384,9 +61366,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:180 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--reflog" -msgstr "" +msgstr "--reflog" #. type: Plain text #: en/rev-list-options.txt:183 @@ -61396,9 +61378,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:184 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--alternate-refs" -msgstr "" +msgstr "--alternate-refs" #. type: Plain text #: en/rev-list-options.txt:191 @@ -61420,9 +61402,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:205 en/rev-list-options.txt:723 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--bisect" -msgstr "" +msgstr "--bisect" #. type: Plain text #: en/rev-list-options.txt:210 @@ -61444,9 +61426,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:227 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--cherry-mark" -msgstr "" +msgstr "--cherry-mark" #. type: Plain text #: en/rev-list-options.txt:230 @@ -61456,9 +61438,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:231 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--cherry-pick" -msgstr "" +msgstr "--cherry-pick" #. type: Plain text #: en/rev-list-options.txt:235 @@ -61474,15 +61456,15 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:244 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--left-only" -msgstr "" +msgstr "--left-only" #. type: Labeled list #: en/rev-list-options.txt:245 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--right-only" -msgstr "" +msgstr "--right-only" #. type: Plain text #: en/rev-list-options.txt:249 @@ -61492,31 +61474,31 @@ msgstr "" #. type: Plain text #: en/rev-list-options.txt:255 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list." msgstr "" #. type: Labeled list #: en/rev-list-options.txt:256 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--cherry" -msgstr "" +msgstr "--cherry" #. type: Plain text #: en/rev-list-options.txt:262 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`." msgstr "" #. type: Labeled list #: en/rev-list-options.txt:264 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--walk-reflogs" -msgstr "" +msgstr "--walk-reflogs" #. type: Plain text #: en/rev-list-options.txt:270 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)." msgstr "" @@ -61570,9 +61552,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:302 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--boundary" -msgstr "" +msgstr "--boundary" #. type: Plain text #: en/rev-list-options.txt:305 @@ -61582,9 +61564,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:307 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--use-bitmap-index" -msgstr "" +msgstr "--use-bitmap-index" #. type: Plain text #: en/rev-list-options.txt:312 @@ -61636,9 +61618,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:331 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--simplify-by-decoration" -msgstr "" +msgstr "--simplify-by-decoration" #. type: Plain text #: en/rev-list-options.txt:333 @@ -61672,9 +61654,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:344 en/rev-list-options.txt:674 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--show-pulls" -msgstr "" +msgstr "--show-pulls" #. type: Plain text #: en/rev-list-options.txt:349 @@ -61684,9 +61666,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:350 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--full-history" -msgstr "" +msgstr "--full-history" #. type: Plain text #: en/rev-list-options.txt:352 @@ -61696,9 +61678,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:353 en/rev-list-options.txt:486 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--dense" -msgstr "" +msgstr "--dense" #. type: Plain text #: en/rev-list-options.txt:356 @@ -61714,9 +61696,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:360 en/rev-list-options.txt:497 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--simplify-merges" -msgstr "" +msgstr "--simplify-merges" #. type: Plain text #: en/rev-list-options.txt:364 @@ -61726,9 +61708,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:365 en/rev-list-options.txt:544 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--ancestry-path" -msgstr "" +msgstr "--ancestry-path" #. type: Plain text #: en/rev-list-options.txt:371 @@ -62260,9 +62242,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:747 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--bisect-vars" -msgstr "" +msgstr "--bisect-vars" #. type: Plain text #: en/rev-list-options.txt:758 @@ -62272,9 +62254,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:759 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--bisect-all" -msgstr "" +msgstr "--bisect-all" #. type: Plain text #: en/rev-list-options.txt:765 @@ -62314,9 +62296,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:786 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--author-date-order" -msgstr "" +msgstr "--author-date-order" #. type: Plain text #: en/rev-list-options.txt:789 @@ -62377,9 +62359,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:827 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--objects" -msgstr "" +msgstr "--objects" #. type: Plain text #: en/rev-list-options.txt:832 @@ -62389,9 +62371,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:833 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--in-commit-order" -msgstr "" +msgstr "--in-commit-order" #. type: Plain text #: en/rev-list-options.txt:837 @@ -62401,9 +62383,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:838 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--objects-edge" -msgstr "" +msgstr "--objects-edge" #. type: Plain text #: en/rev-list-options.txt:844 @@ -62413,9 +62395,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:845 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--objects-edge-aggressive" -msgstr "" +msgstr "--objects-edge-aggressive" #. type: Plain text #: en/rev-list-options.txt:849 @@ -62425,9 +62407,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:850 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--indexed-objects" -msgstr "" +msgstr "--indexed-objects" #. type: Plain text #: en/rev-list-options.txt:854 @@ -62443,9 +62425,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:859 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--object-names" -msgstr "" +msgstr "--object-names" #. type: Plain text #: en/rev-list-options.txt:862 @@ -62455,9 +62437,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:863 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--no-object-names" -msgstr "" +msgstr "--no-object-names" #. type: Plain text #: en/rev-list-options.txt:868 @@ -62509,7 +62491,7 @@ msgstr "" #. type: Plain text #: en/rev-list-options.txt:911 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline." msgstr "" @@ -62527,9 +62509,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:919 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--filter-print-omitted" -msgstr "" +msgstr "--filter-print-omitted" #. type: Plain text #: en/rev-list-options.txt:922 @@ -62581,9 +62563,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:958 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--do-walk" -msgstr "" +msgstr "--do-walk" #. type: Plain text #: en/rev-list-options.txt:960 @@ -62605,9 +62587,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:974 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--relative-date" -msgstr "" +msgstr "--relative-date" #. type: Plain text #: en/rev-list-options.txt:976 @@ -62701,7 +62683,7 @@ msgstr "" #. type: Plain text #: en/rev-list-options.txt:1033 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`." msgstr "" @@ -62725,9 +62707,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:1042 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--header" -msgstr "" +msgstr "--header" #. type: Plain text #: en/rev-list-options.txt:1045 @@ -62737,27 +62719,27 @@ msgstr "" #. type: Plain text #: en/rev-list-options.txt:1050 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above." msgstr "" #. type: Labeled list #: en/rev-list-options.txt:1051 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--children" -msgstr "" +msgstr "--children" #. type: Plain text #: en/rev-list-options.txt:1054 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above." msgstr "" #. type: Labeled list #: en/rev-list-options.txt:1056 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--timestamp" -msgstr "" +msgstr "--timestamp" #. type: Plain text #: en/rev-list-options.txt:1058 @@ -62767,9 +62749,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:1060 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--left-right" -msgstr "" +msgstr "--left-right" #. type: Plain text #: en/rev-list-options.txt:1065 @@ -62802,13 +62784,13 @@ msgstr "" #. type: delimited block - #: en/rev-list-options.txt:1080 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n" msgstr "" #. type: delimited block - #: en/rev-list-options.txt:1087 -#, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "\t>bbbbbbb... 3rd on b\n" "\t>bbbbbbb... 2nd on b\n" @@ -62820,9 +62802,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:1089 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--graph" -msgstr "" +msgstr "--graph" #. type: Plain text #: en/rev-list-options.txt:1095 @@ -63503,7 +63485,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:197 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "$ git bisect start [BAD [GOOD...]]\n" msgstr "" @@ -63527,7 +63509,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:209 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "$ git bisect good [COMMIT...]\n" msgstr "" @@ -63610,7 +63592,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:261 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid ":100644 100644 5cf82581... 4492984e... M Makefile\n" msgstr "" @@ -63662,7 +63644,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:298 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git bisect reset\n" "Checking out files: 100% (21549/21549), done.\n" @@ -63684,7 +63666,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:331 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git bisect start v2.6.27 v2.6.25\n" "Bisecting: 10928 revisions left to test after this (roughly 14 steps)\n" @@ -63712,7 +63694,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:336 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" ":100644 100644 5cf82581... 4492984e... M Makefile\n" "bisect run success\n" @@ -63919,7 +63901,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:463 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "git rev-list BAD --not GOOD1 GOOD2...\n" msgstr "" @@ -64509,7 +64491,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:830 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "The merge base BBBBBB is bad.\n" "This means the bug has been fixed between BBBBBB and [GGGGGG,...].\n" @@ -64517,7 +64499,7 @@ msgstr "" #. type: Plain text #: en/git-bisect-lk2009.txt:834 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "where BBBBBB is the sha1 hash of the bad merge base and [GGGGGG,...] is a comma separated list of the sha1 of the good commits." msgstr "" @@ -64529,7 +64511,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:843 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "Warning: the merge base between BBBBBB and [GGGGGG,...] must be skipped.\n" "So we cannot be sure the first bad commit is between MMMMMM and BBBBBB.\n" @@ -64538,7 +64520,7 @@ msgstr "" #. type: Plain text #: en/git-bisect-lk2009.txt:848 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "where BBBBBB is the sha1 hash of the bad commit, MMMMMM is the sha1 hash of the merge base that is skipped and [GGGGGG,...] is a comma separated list of the sha1 of the good commits." msgstr "" @@ -64686,7 +64668,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:939 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "# We are checking if it stops in a reasonable amount of time, so\n" "# let it run in the background...\n" @@ -64700,7 +64682,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:944 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "# ... and grab its process ID.\n" "pid=$!\n" @@ -64708,7 +64690,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:947 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "# ... and then wait for sufficiently long.\n" "sleep $NORMAL_TIME\n" @@ -64716,7 +64698,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:959 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "# ... and then see if the process is still there.\n" "if kill -0 $pid\n" @@ -64871,7 +64853,7 @@ msgstr "" #. type: Plain text #: en/git-bisect-lk2009.txt:1044 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "In other messages Andreas says that they also use the \"best practices\" described above: small logical commits, topic branches, no evil merge,... These practices all improve the bisectability of the commit graph, by making it easier and more useful to bisect." msgstr "" @@ -64997,7 +64979,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:1139 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n" msgstr "" @@ -65015,7 +64997,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:1157 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'\n" " /\n" @@ -65102,7 +65084,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect-lk2009.txt:1218 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " (BBC+BFC)-X1'-X2'-X3'-X4'-X5'-X6'-Z'-...\n" " /\n" diff --git a/sources.txt b/sources.txt index 0c8570a3cd3bdff89040911852cd1de3f59ee8d7..963851259c51001d28283e23d9394ea8b98fa839 100644 --- a/sources.txt +++ b/sources.txt @@ -106,7 +106,6 @@ git-p4.txt git-pack-objects.txt git-pack-redundant.txt git-pack-refs.txt -git-parse-remote.txt git-patch-id.txt git-prune-packed.txt git-prune.txt