diff --git a/en/cmds-guide.txt b/en/cmds-guide.txt new file mode 100644 index 00000000..cbf61cdc --- /dev/null +++ b/en/cmds-guide.txt @@ -0,0 +1,63 @@ +linkgit:gitattributes[5]:: + Defining attributes per path. + +linkgit:gitcli[7]:: + Git command-line interface and conventions. + +linkgit:gitcore-tutorial[7]:: + A Git core tutorial for developers. + +linkgit:gitcredentials[7]:: + Providing usernames and passwords to Git. + +linkgit:gitcvs-migration[7]:: + Git for CVS users. + +linkgit:gitdiffcore[7]:: + Tweaking diff output. + +linkgit:giteveryday[7]:: + A useful minimum set of commands for Everyday Git. + +linkgit:gitfaq[7]:: + Frequently asked questions about using Git. + +linkgit:gitglossary[7]:: + A Git Glossary. + +linkgit:githooks[5]:: + Hooks used by Git. + +linkgit:gitignore[5]:: + Specifies intentionally untracked files to ignore. + +linkgit:gitmailmap[5]:: + Map author/committer names and/or E-Mail addresses. + +linkgit:gitmodules[5]:: + Defining submodule properties. + +linkgit:gitnamespaces[7]:: + Git namespaces. + +linkgit:gitremote-helpers[7]:: + Helper programs to interact with remote repositories. + +linkgit:gitrepository-layout[5]:: + Git Repository Layout. + +linkgit:gitrevisions[7]:: + Specifying revisions and ranges for Git. + +linkgit:gitsubmodules[7]:: + Mounting one repository inside another. + +linkgit:gittutorial[7]:: + A tutorial introduction to Git. + +linkgit:gittutorial-2[7]:: + A tutorial introduction to Git: part two. + +linkgit:gitworkflows[7]:: + An overview of recommended workflows with Git. + diff --git a/en/line-range-options.txt b/en/line-range-options.txt new file mode 100644 index 00000000..8e295a62 --- /dev/null +++ b/en/line-range-options.txt @@ -0,0 +1,15 @@ +-L,::: +-L:::: + + Trace the evolution of the line range given by ',', + or by the function name regex '', within the ''. You may + not give any pathspec limiters. This is currently limited to + a walk starting from a single revision, i.e., you may only + give zero or one positive revision arguments, and + '' and '' (or '') must exist in the starting revision. + You can specify this option more than once. Implies `--patch`. + Patch output can be suppressed using `--no-patch`, but other diff formats + (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, + `--name-only`, `--name-status`, `--check`) are not currently implemented. ++ +include::line-range-format.txt[] diff --git a/en/object-format-disclaimer.txt b/en/object-format-disclaimer.txt new file mode 100644 index 00000000..4cb106f0 --- /dev/null +++ b/en/object-format-disclaimer.txt @@ -0,0 +1,6 @@ +THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still +in an early stage. A SHA-256 repository will in general not be able to +share work with "regular" SHA-1 repositories. It should be assumed +that, e.g., Git internal file formats in relation to SHA-256 +repositories may change in backwards-incompatible ways. Only use +`--object-format=sha256` for testing purposes. diff --git a/en/ref-reachability-filters.txt b/en/ref-reachability-filters.txt new file mode 100644 index 00000000..9bae46d8 --- /dev/null +++ b/en/ref-reachability-filters.txt @@ -0,0 +1,7 @@ +When combining multiple `--contains` and `--no-contains` filters, only +references that contain at least one of the `--contains` commits and +contain none of the `--no-contains` commits are shown. + +When combining multiple `--merged` and `--no-merged` filters, only +references that are reachable from at least one of the `--merged` +commits and from none of the `--no-merged` commits are shown. diff --git a/en/rev-list-description.txt b/en/rev-list-description.txt new file mode 100644 index 00000000..a9efa7fa --- /dev/null +++ b/en/rev-list-description.txt @@ -0,0 +1,61 @@ +List commits that are reachable by following the `parent` links from the +given commit(s), but exclude commits that are reachable from the one(s) +given with a '{caret}' in front of them. The output is given in reverse +chronological order by default. + +You can think of this as a set operation. Commits reachable from any of +the commits given on the command line form a set, and then commits reachable +from any of the ones given with '{caret}' in front are subtracted from that +set. The remaining commits are what comes out in the command's output. +Various other options and paths parameters can be used to further limit the +result. + +Thus, the following command: + +ifdef::git-rev-list[] +----------------------------------------------------------------------- +$ git rev-list foo bar ^baz +----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- +$ git log foo bar ^baz +----------------------------------------------------------------------- +endif::git-log[] + +means "list all the commits which are reachable from 'foo' or 'bar', but +not from 'baz'". + +A special notation "''..''" can be used as a +short-hand for "^'' ''". For example, either of +the following may be used interchangeably: + +ifdef::git-rev-list[] +----------------------------------------------------------------------- +$ git rev-list origin..HEAD +$ git rev-list HEAD ^origin +----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- +$ git log origin..HEAD +$ git log HEAD ^origin +----------------------------------------------------------------------- +endif::git-log[] + +Another special notation is "''...''" which is useful +for merges. The resulting set of commits is the symmetric difference +between the two operands. The following two commands are equivalent: + +ifdef::git-rev-list[] +----------------------------------------------------------------------- +$ git rev-list A B --not $(git merge-base --all A B) +$ git rev-list A...B +----------------------------------------------------------------------- +endif::git-rev-list[] +ifdef::git-log[] +----------------------------------------------------------------------- +$ git log A B --not $(git merge-base --all A B) +$ git log A...B +----------------------------------------------------------------------- +endif::git-log[] diff --git a/en/signoff-option.txt b/en/signoff-option.txt new file mode 100644 index 00000000..12aa2333 --- /dev/null +++ b/en/signoff-option.txt @@ -0,0 +1,18 @@ +ifdef::git-commit[] +-s:: +endif::git-commit[] +--signoff:: +--no-signoff:: + Add a `Signed-off-by` trailer by the committer at the end of the commit + log message. The meaning of a signoff depends on the project + to which you're committing. For example, it may certify that + the committer has the rights to submit the work under the + project's license or agrees to some contributor representation, + such as a Developer Certificate of Origin. + (See http://developercertificate.org for the one used by the + Linux kernel and Git projects.) Consult the documentation or + leadership of the project to which you're contributing to + understand how the signoffs are used in that project. ++ +The --no-signoff option can be used to countermand an earlier --signoff +option on the command line. diff --git a/po/documentation.de.po b/po/documentation.de.po index 762e6ecf..19584f74 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-12-24 18:29+0000\n" "Last-Translator: Johannes Keyser \n" "Language-Team: Matthias Aßhauer \n" @@ -738,6 +738,265 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Bidirektionale Operationen zwischen einem Subversion-Repository und Git." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, fuzzy, priority:100 +#| msgid "Listing all attributes for a file:" +msgid "Defining attributes per path." +msgstr "Zeige alle Attribute einer Datei:" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, fuzzy, priority:100 +#| msgid "Munging the diff output" +msgid "Tweaking diff output." +msgstr "Manipulation (munging) der 'diff'-Ausgabe" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary - A GIT Glossary" +msgid "A Git Glossary." +msgstr "gitglossary - Ein GIT-Glossar" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "whitespace" +msgid "Git namespaces." +msgstr "whitespace (Leerzeichen)" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +#| msgid "The Git Repository" +msgid "Git Repository Layout." +msgstr "Das Git-Repository" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +#| msgid "A portable graphical interface to Git." +msgid "A tutorial introduction to Git." +msgstr "Eine portable grafische Schnittstelle zu Git." + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, fuzzy, priority:100 +#| msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows." +msgid "An overview of recommended workflows with Git." +msgstr "Siehe linkgit:gitworkflows[7] für eine Übersicht über empfohlene Arbeitsabläufe." + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -978,8 +1237,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3700,7 +3959,7 @@ msgid "\tThis is the default.\n" msgstr "\tDas ist die Standardeinstellung.\n" #. 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -6029,7 +6288,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NAME" @@ -6041,7 +6300,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Fügt Datei-Inhalte zum Index hinzu" #. 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-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-range-diff.txt:9 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 "ÜBERSICHT" @@ -6063,7 +6322,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "BESCHREIBUNG" @@ -6105,7 +6364,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Bitte lesen Sie linkgit:git-commit[1] für Alternativen zum Hinzufügen von Inhalt zu einem Commit." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPTIONEN" @@ -6387,7 +6646,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit Befehlszeilenoptionen verwechselt werden könnten." #. 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "BEISPIELE" @@ -6765,7 +7024,7 @@ msgid "modifying the contents of context or removal lines" msgstr "Ändern des Inhalts von Kontextzeilen oder entfernen von Zeilen" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "SIEHE AUCH" @@ -6777,13 +7036,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Teil der linkgit:git[1] Suite" @@ -6833,7 +7092,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7733,7 +7992,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "KONFIGURATION" @@ -8339,12 +8598,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13959,12 +14212,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -26289,7 +26536,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38867,6 +39114,426 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +#| msgid "Compare two commit ranges (e.g. two versions of a branch)." +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Vergleiche zwei Commit-Bereiche (z.B. zwei Versionen eines Branches)." + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, fuzzy, priority:100 +#| msgid "Use the given as the commit message." +msgid "There are three ways to specify the commit ranges:" +msgstr "Verwende die angegebene als Eintragungsbemerkung (commit message)." + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-notes[=]" +msgid "--[no-]notes[=]" +msgstr "--show-notes[=]" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#| msgid "--reverse .." +msgid "..." +msgstr "--reverse .." + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, fuzzy, no-wrap, priority:100 +#| msgid "--reverse .." +msgid " " +msgstr "--reverse .." + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, fuzzy, no-wrap, priority:100 +#| msgid "OUTPUT FORMAT" +msgid "OUTPUT STABILITY" +msgstr "AUSGABEFORMAT" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, fuzzy, no-wrap, priority:100 +#| msgid "diff.algorithm" +msgid "Algorithm" +msgstr "diff.algorithm" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -42299,12 +42966,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56833,12 +57494,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -59564,142 +60219,24 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ," +msgid "-L,:" +msgstr "-L ," -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L :" +msgid "-L::" +msgstr "-L : " #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -60358,6 +60895,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61812,6 +62355,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -62425,6 +62980,93 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, fuzzy, priority:100 +#| msgid "support the following date formats:" +msgid "Thus, the following command:" +msgstr "unterstützen die folgenden Datumsformate:" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "$ git restore .\n" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "$ git restore .\n" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "$ git reflog -2 HEAD # or\n" +#| "$ git log -g -2 HEAD\n" +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" +"$ git reflog -2 HEAD # oder\n" +"$ git log -g -2 HEAD\n" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62887,18 +63529,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -64299,6 +64929,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66774,9 +67422,6 @@ msgstr "" #~ msgid "and the `--date` option" #~ msgstr "und die Option `--date`" -#~ msgid "support the following date formats:" -#~ msgstr "unterstützen die folgenden Datumsformate:" - #, no-wrap #~ msgid "Configuration" #~ msgstr "Configuration" @@ -66855,10 +67500,6 @@ msgstr "" #~ msgid "--abbrev=" #~ msgstr "--abbrev=" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #~ msgid "Boolean true literals are `yes`, `on`, `true`," #~ msgstr "Boolesche Werte für „true“ können alternativ auch `yes`, `on`, `true`" diff --git a/po/documentation.es.po b/po/documentation.es.po index 808bae4d..fc1c029a 100644 --- a/po/documentation.es.po +++ b/po/documentation.es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-10-30 12:26+0000\n" "Last-Translator: Vibo Lavida \n" "Language-Team: LANGUAGE \n" @@ -732,6 +732,263 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Interacción bidireccional entre un repositorio Subversion y otro Git." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "whitespace" +msgid "Git namespaces." +msgstr "espacio vacío" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, fuzzy, priority:100 +#| msgid "The URL to the remote repository." +msgid "Helper programs to interact with remote repositories." +msgstr "La URL del repositorio remoto." + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +#| msgid "The Git repository browser." +msgid "Git Repository Layout." +msgstr "El navegador de repositorio Git." + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +#| msgid "A portable graphical interface to Git." +msgid "A tutorial introduction to Git." +msgstr "Una interfaz gráfica portable para Git." + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1229,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Crea un repositorio de Git vacío o reinicializa uno ya existente." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3891,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5948,7 +6205,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NOMBRE" @@ -5960,7 +6217,7 @@ msgid "git-add - Add file contents to the index" msgstr "git add: añadir contenido de un archivo al índice" #. 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-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-range-diff.txt:9 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 "SINOPSIS" @@ -5982,7 +6239,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "DESCRIPCIÓN" @@ -6024,7 +6281,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Por favor, revise linkgit:git-commit[1] para encontrar maneras alternativas de añadir contenido a una confirmación de cambios." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPCIONES" @@ -6306,7 +6563,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "EJEMPLOS" @@ -6670,7 +6927,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6682,13 +6939,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, fuzzy, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6738,7 +6995,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7637,7 +7894,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "CONFIGURACIÓN" @@ -8243,12 +8500,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13774,12 +14025,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25879,7 +26124,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38380,6 +38625,421 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +#| msgid "Compare two commit ranges (e.g. two versions of a branch)." +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Compara dos rangos de confirmaciones (por ejemplo: dos versions de una rama)." + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--no-notes" +msgid "--[no-]notes[=]" +msgstr "--no-notes" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41792,12 +42452,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56193,12 +56847,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58904,142 +59552,23 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ," +msgid "-L,:" +msgstr "-L ," -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59694,6 +60223,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61143,6 +61678,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61756,6 +62303,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62218,18 +62846,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63630,6 +64246,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66115,10 +66749,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "o linkgit:git-blame[1])" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po index 8c9e5687..b121a9af 100644 --- a/po/documentation.es_MX.po +++ b/po/documentation.es_MX.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2019-10-05 21:56+0000\n" "Last-Translator: Farándula \n" "Language-Team: LANGUAGE \n" @@ -732,6 +732,259 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Operación bidireccional entre un repositorio Subversion y Git" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +msgid "Git namespaces." +msgstr "--whitespace" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +msgid "Git Repository Layout." +msgstr "El navegador de repositorio Git" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +msgid "A tutorial introduction to Git." +msgstr "Una interfaz gráfica portátil para Git" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1225,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3887,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5947,7 +6200,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "" @@ -5959,7 +6212,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Agrega el contenido de los archivos al índice" #. 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-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-range-diff.txt:9 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 "SINOPSIS" @@ -5985,7 +6238,7 @@ msgstr "" "\t [--chmod=(+|-)x] [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "DESCRIPCIÓN" @@ -6027,7 +6280,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Véase linkgit:git-commit[1] para otras formas de añadir contenido a un commit." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPCIONES" @@ -6310,7 +6563,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6664,7 +6917,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6676,13 +6929,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6732,7 +6985,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7631,7 +7884,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8237,12 +8490,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13771,12 +14018,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25867,7 +26108,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38363,6 +38604,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41776,12 +42431,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56179,12 +56828,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58894,142 +59537,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59687,6 +60210,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61151,6 +61680,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61764,6 +62305,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62226,18 +62848,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63638,6 +64248,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66145,10 +66773,6 @@ msgstr "" #~ msgid "reflog identity email (respecting .mailmap, see" #~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 6d0fbe19..c312f70d 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-02-23 20:50+0000\n" "Last-Translator: Jean-Noël Avila \n" "Language-Team: Jean-Noël Avila \n" @@ -732,6 +732,264 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, fuzzy, priority:100 +#| msgid "Munging the diff output" +msgid "Tweaking diff output." +msgstr "Bricoler la sortie diff" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "whitespace" +msgid "Git namespaces." +msgstr "whitespace" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, fuzzy, priority:100 +#| msgid "The URL to the remote repository." +msgid "Helper programs to interact with remote repositories." +msgstr "L'URL du dépôt distant." + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +#| msgid "The Git repository browser." +msgid "Git Repository Layout." +msgstr "Le navigateur de dépôt Git." + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +#| msgid "A portable graphical interface to Git." +msgid "A tutorial introduction to Git." +msgstr "Une interface graphique portable pour Git." + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1230,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Créer un dépôt Git vide ou réinitialise un dépôt existant." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3736,7 +3994,7 @@ msgid "\tThis is the default.\n" msgstr "\tC'est l'option par défaut.\n" #. 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -6082,7 +6340,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NOM" @@ -6094,7 +6352,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Ajoute le contenu de fichiers à l'index" #. 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-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-range-diff.txt:9 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 "SYNOPSIS" @@ -6116,7 +6374,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "DESCRIPTION" @@ -6158,7 +6416,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Référez-vous linkgit:git-commit[1] pour des méthodes alternatives d'ajout de contenu à une validation." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPTIONS" @@ -6440,7 +6698,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "Cette option permet de séparer les options de la ligne de commande de la liste des fichiers (utile si certains noms de fichiers peuvent être confondus avec des options)." #. 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "EXEMPLES" @@ -6818,7 +7076,7 @@ msgid "modifying the contents of context or removal lines" msgstr "modification de contenu de contexte ou de lignes supprimées" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "VOIR AUSSI" @@ -6830,13 +7088,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Fait partie de la suite linkgit:git[1]" @@ -6894,7 +7152,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this msgstr "La liste de fichiers de boîte aux lettres desquelles on lit les rustines. Si vous ne fournissez pas cet argument, la commande lit depuis l'entrée standard. Si vous fournissez des répertoires, ils sont lus comme des Maildirs." #. 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7803,7 +8061,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "Lorsque `git apply` est utilisé comme « meilleur patch GNU », l'utilisateur peut passer l'option `--unsafe-paths` pour passer outre cette vérification de sécurité. Cette option n'a aucun effet lorsque `--index` ou `--cached` est utilisé." #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "CONFIGURATION" @@ -8414,12 +8672,6 @@ msgstr "`git config tar.tar.xz.command \"xz -c\"`" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "Configurer un format \"tar.xz\" pour la création de fichiers tar compressés LZMA. Vous pouvez l'utiliser en spécifiant `--format=tar.xz`, ou en créant un fichier de sortie comme `-o foo.tar.xz`." -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -14073,12 +14325,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -26279,7 +26525,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38876,6 +39122,485 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +#| msgid "Compare two commit ranges (e.g. two versions of a branch)." +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Comparer deux plages de commits (par exemple deux versions d'une branche)." + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--notes[=]" +msgid "--[no-]notes[=]" +msgstr "--notes[=]" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, fuzzy, priority:100 +#| msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch." +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "Ces drapeaux sont transmis au programme 'git apply' (voir linkgit:git-apply[1]) qui applique le patch." + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#| msgid "--reverse .." +msgid "..." +msgstr "--reverse .." + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, fuzzy, no-wrap, priority:100 +#| msgid "--reverse .." +msgid " " +msgstr "--reverse .." + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, fuzzy, no-wrap, priority:100 +#| msgid "OUTPUT FORMAT" +msgid "OUTPUT STABILITY" +msgstr "FORMAT DE SORTIE" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " B D\n" +#| " / /\n" +#| " ---X---A\n" +msgid " 1 A\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " B D\n" +#| " / /\n" +#| " ---X---A\n" +msgid " 2 B\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " .----W\n" +#| " / /\n" +#| " -----H----I\n" +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" +" .----W\n" +" / /\n" +" -----H----I\n" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " .----W\n" +#| " / /\n" +#| " -----H----I\n" +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" +" .----W\n" +" / /\n" +" -----H----I\n" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "\t .-A---M--. N\n" +#| "\t / / \\ /\n" +#| "\tI B R\n" +#| "\t \\ / /\n" +#| "\t \\ / /\n" +#| "\t `---X--'\n" +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" +"\t .-A---M--. N\n" +"\t / / \\ /\n" +"\tI B R\n" +"\t \\ / /\n" +"\t \\ / /\n" +"\t `---X--'\n" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " B D\n" +#| " / /\n" +#| " ---X---A\n" +msgid " o o\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " o---o---o---o---o\n" +#| " / \\\n" +#| " / o---o---o---o---M\n" +#| " / /\n" +#| "---2---1---o---o---o---A\n" +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" +" o---o---o---o---o\n" +" / \\\n" +" / o---o---o---o---M\n" +" / /\n" +"---2---1---o---o---o---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -42287,12 +43012,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -57061,12 +57780,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -59839,161 +60552,26 @@ msgstr "Ceci n'est valable que pour '' et spécifiera un nombre de lignes a msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "Si `:` est donné à la place de '' et de '', il s'agit d'une expression régulière qui indique la plage depuis première ligne qui correspond à '', jusqu'à la ligne de nom-de-fonction suivante. La recherche de `:` se fait à partir de la fin de la plage `-L` précédente, s'il y en a une, sinon à partir du début du fichier. La recherche de `^:` commence au début du fichier. Les noms de fonction sont déterminés de la même manière que celle par laquelle `git diff` fonctionne sur les en-têtes de section de rustine (voir 'Définir un en-tête personnalisé' dans linkgit:gitattributes[5])." -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "Si le fichier '.mailmap' existe au niveau supérieur du dépôt, ou à l'emplacement indiqué par les options de configuration mailmap.file ou mailmap.blob, il est utilisé pour faire correspondre les noms des auteurs et des validateurs et les adresses e-mail avec les vrais noms canoniques et adresses e-mail." - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "Dans la forme simple, chaque ligne dans le fichier se compose du nom réel canonique d'un auteur, une espace, et une adresse e-mail utilisée dans le commit (entouré par '<' et '>') en correspondance ue nom. Par exemple :" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "\tNom \n" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "Les formes plus complexes sont :" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "\t \n" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "qui permet à mailmap de remplacer uniquement la partie e-mail d'un commit, et :" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "\tNom \n" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "qui permet à mailmap de remplacer à la fois le nom et l'e-mail d'un commit correspondant à l'adresse e-mail de commit spécifiée, et :" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "\tNom Propre Nom dans le Commit \n" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "qui permet à mailmap de remplacer à la fois le nom et l'e-mail d'un commit correspondant à la fois au nom et à l'adresse e-mail du commit spécifié." - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "Exemple 1 : Votre historique contient des commits de deux auteurs, Jane et Joe, dont les noms apparaissent dans le dépôt sous plusieurs formes :" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "Supposons maintenant que Joe veuille que son deuxième prénom soit utilisé, et que Jane préfère que son nom de famille soit entièrement épelé. Un fichier `.mailmap' approprié ressemblerait à :" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" -"Jane Doe \n" -"Joe R. Developer \n" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "Notez qu'il n'y a pas besoin d'une entrée pour ''jane'laptop.(none)', parce que le vrai nom de cet auteur est déjà correct." - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "Exemple 2 : Votre dépôt contient des commits des auteurs suivants :" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "Donc, vous voudrez peut-être un fichier '.mailmap' qui ressemble à :" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ,:" +msgid "-L,:" +msgstr "-L ,:" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" -msgstr "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ::" +msgid "-L::" +msgstr "-L ::" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." -msgstr "Utilisez un dièse '#' pour les commentaires qui sont soit sur leur propre ligne, soit après l'adresse e-mail." +#: en/line-range-options.txt:14 +#, fuzzy, priority:100 +#| msgid "Trace the evolution of the line range given by \",\" (or the function name regex ) within the . You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and and (or ) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." +msgstr "Tracer l'évolution de la plage de lignes donnée par \",\" (ou la regex de nom de la fonction ) dans le fichier . Vous ne pouvez pas donner de limiteurs de spécificateur de chemin. Ceci est actuellement limité à une marche à partir d'une seule révision, c'est-à-dire que vous ne pouvez donner qu'aucun ou un seul argument de révision, et (ou ) doivent exister dans la révision de départ. Vous pouvez spécifier cette option plusieurs fois. Cette option implique `--patch`. L'affichage de la rustine peut être supprimé en utilisant `--no-patch`, mai les autres formats de diff (`--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) ne sont pas implantés actuellement." #. type: Plain text #: en/merge-options.txt:5 @@ -60647,6 +61225,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -62122,6 +62706,18 @@ msgstr "Lorsque la branche distante que vous voulez récupérer est connue pour msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "Il y a une différence entre le fait de lister plusieurs directement sur la ligne de commande 'git pull' et le fait d'avoir plusieurs entrées `remote..fetch` dans votre configuration pour un et d'exécuter une commande 'git pull' sans aucun paramètre explicite. Les s listés explicitement sur la ligne de commande sont toujours fusionnés dans la branche actuelle après avoir été récupérées. En d'autres termes, si vous listez plus d'une référence distante, 'git pull' créera une fusion Octopus. D'un autre côté, si vous n'indiquez aucun paramètre explicite sur la ligne de commande, 'git pull' récupérera tous les s qu'il trouve dans la configuration `remote..fetch` et fusionnera seulement le premier trouvé dans la branche actuelle. C'est parce que faire un Octopus à partir de références distantes est rarement fait, alors que garder la trace de plusieurs têtes distantes en un seul coup en en récupérant plusieurs est souvent utile." +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -62735,6 +63331,98 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "Ainsi, la commande suivante :" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "\t$ git rev-list --bisect foo ^bar ^baz\n" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, fuzzy, no-wrap, priority:100 +#| msgid "\t$ git rev-list --bisect foo ^bar ^baz\n" +msgid "$ git log foo bar ^baz\n" +msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "$ git fetch origin\n" +#| "$ git merge origin/next\n" +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" +"$ git fetch origin\n" +"$ git merge origin/next\n" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "$ git fetch origin\n" +#| "$ git merge origin/next\n" +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" +"$ git fetch origin\n" +"$ git merge origin/next\n" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -63197,18 +63885,6 @@ msgstr "Omettre tout commit qui introduit le même changement qu'un autre commit msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "Par exemple, si vous avez deux branches, `A` et `B`, une façon habituelle de lister tous les commits d'un seul côté d'entre elles est avec `--left-right` (voir l'exemple ci-dessous dans la description de l'option `--left-right`). Cependant, cela montre les commits qui ont été picorés sur l'autre branche (par exemple, ``3rd on b'' peut être trié sur la branche A). Avec cette option, ces paires de commits sont exclues de la sortie." -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -64677,6 +65353,25 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, fuzzy, priority:100 +#| msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)." +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "Ajouter une ligne Signed-off-by du validateur à la fin du message de validation. La signification de signoff dépend du projet, mais ceci certifie typiquement que le validateur a les droits de soumettre son travail sous la même licence et accepte un Certificat d'Origine de Développeur (voir http://developercertificate.org/ pour plus d'information)." + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -67141,6 +67836,110 @@ msgstr "" msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" msgstr "" +#~ msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." +#~ msgstr "Si le fichier '.mailmap' existe au niveau supérieur du dépôt, ou à l'emplacement indiqué par les options de configuration mailmap.file ou mailmap.blob, il est utilisé pour faire correspondre les noms des auteurs et des validateurs et les adresses e-mail avec les vrais noms canoniques et adresses e-mail." + +#~ msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" +#~ msgstr "Dans la forme simple, chaque ligne dans le fichier se compose du nom réel canonique d'un auteur, une espace, et une adresse e-mail utilisée dans le commit (entouré par '<' et '>') en correspondance ue nom. Par exemple :" + +#, no-wrap +#~ msgid "\tProper Name \n" +#~ msgstr "\tNom \n" + +#~ msgid "The more complex forms are:" +#~ msgstr "Les formes plus complexes sont :" + +#, no-wrap +#~ msgid "\t \n" +#~ msgstr "\t \n" + +#~ msgid "which allows mailmap to replace only the email part of a commit, and:" +#~ msgstr "qui permet à mailmap de remplacer uniquement la partie e-mail d'un commit, et :" + +#, no-wrap +#~ msgid "\tProper Name \n" +#~ msgstr "\tNom \n" + +#~ msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" +#~ msgstr "qui permet à mailmap de remplacer à la fois le nom et l'e-mail d'un commit correspondant à l'adresse e-mail de commit spécifiée, et :" + +#, no-wrap +#~ msgid "\tProper Name Commit Name \n" +#~ msgstr "\tNom Propre Nom dans le Commit \n" + +#~ msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." +#~ msgstr "qui permet à mailmap de remplacer à la fois le nom et l'e-mail d'un commit correspondant à la fois au nom et à l'adresse e-mail du commit spécifié." + +#~ msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" +#~ msgstr "Exemple 1 : Votre historique contient des commits de deux auteurs, Jane et Joe, dont les noms apparaissent dans le dépôt sous plusieurs formes :" + +#, no-wrap +#~ msgid "" +#~ "Joe Developer \n" +#~ "Joe R. Developer \n" +#~ "Jane Doe \n" +#~ "Jane Doe \n" +#~ "Jane D. \n" +#~ msgstr "" +#~ "Joe Developer \n" +#~ "Joe R. Developer \n" +#~ "Jane Doe \n" +#~ "Jane Doe \n" +#~ "Jane D. \n" + +#~ msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" +#~ msgstr "Supposons maintenant que Joe veuille que son deuxième prénom soit utilisé, et que Jane préfère que son nom de famille soit entièrement épelé. Un fichier `.mailmap' approprié ressemblerait à :" + +#, no-wrap +#~ msgid "" +#~ "Jane Doe \n" +#~ "Joe R. Developer \n" +#~ msgstr "" +#~ "Jane Doe \n" +#~ "Joe R. Developer \n" + +#~ msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." +#~ msgstr "Notez qu'il n'y a pas besoin d'une entrée pour ''jane'laptop.(none)', parce que le vrai nom de cet auteur est déjà correct." + +#~ msgid "Example 2: Your repository contains commits from the following authors:" +#~ msgstr "Exemple 2 : Votre dépôt contient des commits des auteurs suivants :" + +#, no-wrap +#~ msgid "" +#~ "nick1 \n" +#~ "nick2 \n" +#~ "nick2 \n" +#~ "santa \n" +#~ "claus \n" +#~ "CTO \n" +#~ msgstr "" +#~ "nick1 \n" +#~ "nick2 \n" +#~ "nick2 \n" +#~ "santa \n" +#~ "claus \n" +#~ "CTO \n" + +#~ msgid "Then you might want a `.mailmap` file that looks like:" +#~ msgstr "Donc, vous voudrez peut-être un fichier '.mailmap' qui ressemble à :" + +#, no-wrap +#~ msgid "" +#~ " \n" +#~ "Some Dude nick1 \n" +#~ "Other Author nick2 \n" +#~ "Other Author \n" +#~ "Santa Claus \n" +#~ msgstr "" +#~ " \n" +#~ "Some Dude nick1 \n" +#~ "Other Author nick2 \n" +#~ "Other Author \n" +#~ "Santa Claus \n" + +#~ msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#~ msgstr "Utilisez un dièse '#' pour les commentaires qui sont soit sur leur propre ligne, soit après l'adresse e-mail." + #, ignore-same, no-wrap #~ msgid "linkgit:git-parse-remote[1]" #~ msgstr "linkgit:git-parse-remote[1]" @@ -67342,31 +68141,12 @@ msgstr "" #~ msgid "Use `--no-guess` to disable this." #~ msgstr "Utilisez `--no-guess` pour désactiver ceci." -#~ msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)." -#~ msgstr "Ajouter une ligne Signed-off-by du validateur à la fin du message de validation. La signification de signoff dépend du projet, mais ceci certifie typiquement que le validateur a les droits de soumettre son travail sous la même licence et accepte un Certificat d'Origine de Développeur (voir http://developercertificate.org/ pour plus d'information)." - #~ msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information." #~ msgstr "Ajouter une ligne `Signed-off-by:` au message de commit, en utilisant votre identité pour validateur. Référez-vous à l'option signoff dans linkgit:git-commit[1] pour plus d'information." -#~ msgid "-L ,:" -#~ msgstr "-L ,:" - -#~ msgid "-L ::" -#~ msgstr "-L ::" - -#~ msgid "Trace the evolution of the line range given by \",\" (or the function name regex ) within the . You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and and (or ) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." -#~ msgstr "Tracer l'évolution de la plage de lignes donnée par \",\" (ou la regex de nom de la fonction ) dans le fichier . Vous ne pouvez pas donner de limiteurs de spécificateur de chemin. Ceci est actuellement limité à une marche à partir d'une seule révision, c'est-à-dire que vous ne pouvez donner qu'aucun ou un seul argument de révision, et (ou ) doivent exister dans la révision de départ. Vous pouvez spécifier cette option plusieurs fois. Cette option implique `--patch`. L'affichage de la rustine peut être supprimé en utilisant `--no-patch`, mai les autres formats de diff (`--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) ne sont pas implantés actuellement." - -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #~ msgid "With --no-signoff do not add a Signed-off-by line." #~ msgstr "Avec --no-signoff ne pas ajouter de ligne Signed-off-by." -#~ msgid "Thus, the following command:" -#~ msgstr "Ainsi, la commande suivante :" - #~ msgid "Collect and show committer identities instead of authors." #~ msgstr "Collecter et montrer les identités des validateurs au lieu des auteurs." diff --git a/po/documentation.hu.po b/po/documentation.hu.po index b5d5f808..dbdfb3e2 100644 --- a/po/documentation.hu.po +++ b/po/documentation.hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-01-19 16:32+0000\n" "Last-Translator: Lilian Wang \n" "Language-Team: LANGUAGE \n" @@ -731,6 +731,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1225,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3633,7 +3887,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5946,7 +6200,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "" @@ -5958,7 +6212,7 @@ 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-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-range-diff.txt:9 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 "" @@ -5975,7 +6229,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "" @@ -6017,7 +6271,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" @@ -6299,7 +6553,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6653,7 +6907,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6665,13 +6919,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6721,7 +6975,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7620,7 +7874,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8225,12 +8479,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13760,12 +14008,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25854,7 +26096,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38347,6 +38589,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41761,12 +42417,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56150,12 +56800,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58865,142 +59509,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59658,6 +60182,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61110,6 +61640,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61723,6 +62265,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62185,18 +62808,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63597,6 +64208,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66072,10 +66701,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.id.po b/po/documentation.id.po index dca5a718..404b146f 100644 --- a/po/documentation.id.po +++ b/po/documentation.id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-01-19 16:32+0000\n" "Last-Translator: Lilian Wang \n" "Language-Team: none\n" @@ -732,6 +732,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1226,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3888,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5947,7 +6201,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "" @@ -5959,7 +6213,7 @@ 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-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-range-diff.txt:9 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 "" @@ -5976,7 +6230,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "" @@ -6018,7 +6272,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" @@ -6300,7 +6554,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6654,7 +6908,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6666,13 +6920,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6722,7 +6976,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7621,7 +7875,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8226,12 +8480,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13761,12 +14009,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25855,7 +26097,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38348,6 +38590,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41762,12 +42418,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56151,12 +56801,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58866,142 +59510,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59659,6 +60183,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61111,6 +61641,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61724,6 +62266,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62186,18 +62809,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63598,6 +64209,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66073,10 +66702,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.is.po b/po/documentation.is.po index f82d24cd..b52a3ab5 100644 --- a/po/documentation.is.po +++ b/po/documentation.is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git-manpages-l 10n\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-08-24 14:49+0000\n" "Last-Translator: Þórhalla Guðmundsdóttir Beck \n" "Language-Team: Icelandic\n" @@ -732,6 +732,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1226,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3635,7 +3889,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5948,7 +6202,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NAFN" @@ -5960,7 +6214,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Bæta innihaldi skjala í atriðaskrána" #. 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-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-range-diff.txt:9 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 "SAMANTEKT" @@ -5982,7 +6236,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "ÚTSKÝRING" @@ -6024,7 +6278,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Vinsamlegast skoðið linkgit:git-commit[1] fyrir aðrar leiðir til þess að bæta innihaldi við innlegg." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "VALMÖGULEIKAR" @@ -6306,7 +6560,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "Hægt er að nota þennan valmöguleika til þess að aðskilja valmöguleika skipanalínunnar frá skjalalistanum (hjálplegt þegar skjalanöfn gætu verið mistekin fyrir skipanalínuvalmöguleika)." #. 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "DÆMI" @@ -6684,7 +6938,7 @@ msgid "modifying the contents of context or removal lines" msgstr "Að breyta innihaldi lína sem eru til (\" \") eða á að fjarlægja (\"-\")" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "SJÁ EINNIG" @@ -6696,13 +6950,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Hluti af linkgit:git[1] fylkingunni" @@ -6752,7 +7006,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7650,7 +7904,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8256,12 +8510,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13790,12 +14038,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25923,7 +26165,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38427,6 +38669,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--no-notes" +msgid "--[no-]notes[=]" +msgstr "--no-notes" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41837,12 +42493,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56225,12 +56875,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58935,142 +59579,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59728,6 +60252,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61177,6 +61707,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61790,6 +62332,88 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, fuzzy, priority:100 +#| msgid "support the following date formats:" +msgid "Thus, the following command:" +msgstr "styðja eftirfarandi dagsetningasnið:" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62252,18 +62876,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63664,6 +64276,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66127,9 +66757,6 @@ msgstr "" #~ msgid "and the `--date` option" #~ msgstr "og `--date` valmöguleikinn" -#~ msgid "support the following date formats:" -#~ msgstr "styðja eftirfarandi dagsetningasnið:" - #, ignore-same #~ msgid "git-parse-remote(1)" #~ msgstr "git-parse-remote(1)" @@ -66152,10 +66779,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, ignore-same #~ msgid "`GIT_REDACT_COOKIES`" #~ msgstr "`GIT_REDACT_COOKIES`" diff --git a/po/documentation.it.po b/po/documentation.it.po index eac68908..a00fd35e 100644 --- a/po/documentation.it.po +++ b/po/documentation.it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-01-19 16:32+0000\n" "Last-Translator: Lilian Wang \n" "Language-Team: LANGUAGE \n" @@ -732,6 +732,259 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Operatività bidirezionale tra un repository Subversion e Git" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +msgid "Git namespaces." +msgstr "--whitespace" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +msgid "Git Repository Layout." +msgstr "Il browser per i repository Git" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +msgid "A tutorial introduction to Git." +msgstr "Un'interfaccia grafica portabile per Git" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1225,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3647,7 +3900,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5980,7 +6233,7 @@ msgid "git-add(1)" 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-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-range-diff.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 #, fuzzy, no-wrap, priority:300 msgid "NAME" msgstr "NOME" @@ -5992,7 +6245,7 @@ msgid "git-add - Add file contents to the index" msgstr "Aggiunge i contenuti del file all'indice" #. 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-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-range-diff.txt:9 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 #, fuzzy, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "SINOSSI" @@ -6014,7 +6267,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 #, fuzzy, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "DESCRIZIONE" @@ -6056,7 +6309,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Prego vedere linkgit:git-commit[1] per madalità alternative per aggiungere un contenuto al commit." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, fuzzy, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPZIONI" @@ -6338,7 +6591,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "Questa opzione può essere usata per separare opzioni di comando di linea dalla lista dei file, (utile quando i nomi dei file potrebbero essere errati le opzioni del comando di linea)." #. 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, fuzzy, no-wrap, priority:300 msgid "EXAMPLES" msgstr "ESEMPI" @@ -6716,7 +6969,7 @@ msgid "modifying the contents of context or removal lines" msgstr "modificando i contenuti del contesto o rimuovere le linee." #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, fuzzy, no-wrap, priority:300 msgid "SEE ALSO" msgstr "VEDERE ANCHE" @@ -6728,13 +6981,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, fuzzy, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, fuzzy, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Parte del pacchetto linkgit:git[1]" @@ -6784,7 +7037,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7683,7 +7936,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, fuzzy, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "CONFIGURAZIONE" @@ -8288,12 +8541,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13820,12 +14067,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25945,7 +26186,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38446,6 +38687,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--shallow-since=" +msgid "--[no-]notes[=]" +msgstr "--shallow-since=" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41858,12 +42513,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56256,12 +56905,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58971,142 +59614,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59764,6 +60287,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61216,6 +61745,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61829,6 +62370,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, fuzzy, priority:100 +msgid "Thus, the following command:" +msgstr "supporta i seguenti formati di data:" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62291,18 +62913,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63703,6 +64313,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, fuzzy, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "Aggiungi linea firmata fuori dal committer alla fine del messaggio di registro di commit. Il significato di una firma dipende dal progetto, ma in genere certifica che il committer ha i diritti di presentare quest'opera con la stessa licenza e accetta un certificato di origine per sviluppatori (vedere http://developercertificate.org/ per ulteriori informazioni)." + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66171,10 +66799,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "and the `--date` option" #~ msgstr "e l'opzione `--date`" -#, fuzzy -#~ msgid "support the following date formats:" -#~ msgstr "supporta i seguenti formati di data:" - #, ignore-same #~ msgid "git-parse-remote(1)" #~ msgstr "git-parse-remote(1)" @@ -66205,14 +66829,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "Show whole surrounding functions of changes." #~ msgstr "Mostra tutte le funzioni circostanti delle modifiche." -#, fuzzy -#~ msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)." -#~ msgstr "Aggiungi linea firmata fuori dal committer alla fine del messaggio di registro di commit. Il significato di una firma dipende dal progetto, ma in genere certifica che il committer ha i diritti di presentare quest'opera con la stessa licenza e accetta un certificato di origine per sviluppatori (vedere http://developercertificate.org/ per ulteriori informazioni)." - -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.ja.po b/po/documentation.ja.po index 3e022c7c..29f09f65 100644 --- a/po/documentation.ja.po +++ b/po/documentation.ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git-manpages-l 10n\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-01-19 16:32+0000\n" "Last-Translator: Lilian Wang \n" "Language-Team: Japanese\n" @@ -734,6 +734,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -974,8 +1228,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3636,7 +3890,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5949,7 +6203,7 @@ msgid "git-add(1)" 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-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-range-diff.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 #, fuzzy, no-wrap, priority:300 msgid "NAME" msgstr "NAME" @@ -5961,7 +6215,7 @@ 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-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-range-diff.txt:9 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 "" @@ -5978,7 +6232,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "" @@ -6020,7 +6274,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" @@ -6302,7 +6556,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6656,7 +6910,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6668,13 +6922,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6724,7 +6978,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7622,7 +7876,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8227,12 +8481,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13757,12 +14005,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25851,7 +26093,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38339,6 +38581,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--no-notes" +msgid "--[no-]notes[=]" +msgstr "--no-notes" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41749,12 +42405,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56135,12 +56785,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58845,142 +59489,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +msgid "-L,:" +msgstr "-L ," -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, fuzzy, no-wrap, priority:100 +msgid "-L::" +msgstr "-L :" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59638,6 +60162,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61087,6 +61617,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61700,6 +62242,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62162,18 +62785,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63574,6 +64185,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66046,7 +66675,3 @@ msgstr "" #, fuzzy #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" - -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" diff --git a/po/documentation.ko.po b/po/documentation.ko.po index e921ba23..6338cc68 100644 --- a/po/documentation.ko.po +++ b/po/documentation.ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git-manpages-l10n\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-08-18 02:32+0000\n" "Last-Translator: JunYeong Park \n" "Language-Team: Korean\n" @@ -732,6 +732,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1226,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3888,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5945,7 +6199,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "이름" @@ -5957,7 +6211,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - 파일 내용들을 인덱스에 추가합니다" #. 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-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-range-diff.txt:9 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 "시놉시스" @@ -5979,7 +6233,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "설명" @@ -6021,7 +6275,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" @@ -6303,7 +6557,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6657,7 +6911,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6669,13 +6923,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6725,7 +6979,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7624,7 +7878,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8229,12 +8483,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13764,12 +14012,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25856,7 +26098,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38348,6 +38590,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--no-notes" +msgid "--[no-]notes[=]" +msgstr "--no-notes" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41761,12 +42417,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56148,12 +56798,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58858,142 +59502,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59651,6 +60175,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61101,6 +61631,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61714,6 +62256,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62176,18 +62799,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63588,6 +64199,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66063,10 +66692,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.mr.po b/po/documentation.mr.po index 844ecb37..d0fff952 100644 --- a/po/documentation.mr.po +++ b/po/documentation.mr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git-manpages-l 10n\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-11-26 19:29+0000\n" "Last-Translator: Prachi Joshi \n" "Language-Team: Marathi\n" @@ -732,6 +732,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1226,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3888,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5945,7 +6199,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "नाव" @@ -5957,7 +6211,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - निर्देशांकात फाईल सामग्री जोडा" #. 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-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-range-diff.txt:9 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 "सारांश" @@ -5974,7 +6228,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "वर्णन" @@ -6016,7 +6270,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "पर्याय" @@ -6298,7 +6552,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6652,7 +6906,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6664,13 +6918,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6720,7 +6974,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7619,7 +7873,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8224,12 +8478,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13759,12 +14007,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25851,7 +26093,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38343,6 +38585,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--no-notes" +msgid "--[no-]notes[=]" +msgstr "--no-notes" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41756,12 +42412,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56143,12 +56793,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58858,142 +59502,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59651,6 +60175,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61101,6 +61631,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61714,6 +62256,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62176,18 +62799,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63588,6 +64199,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66063,10 +66692,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po index ceb02da5..304c8852 100644 --- a/po/documentation.nb_NO.po +++ b/po/documentation.nb_NO.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2019-10-14 23:28+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -729,6 +729,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -969,8 +1223,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3632,7 +3886,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5945,7 +6199,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "" @@ -5957,7 +6211,7 @@ 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-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-range-diff.txt:9 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 "" @@ -5974,7 +6228,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "" @@ -6016,7 +6270,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" @@ -6299,7 +6553,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6653,7 +6907,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6665,13 +6919,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6721,7 +6975,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7620,7 +7874,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8226,12 +8480,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13761,12 +14009,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25857,7 +26099,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38350,6 +38592,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41764,12 +42420,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56161,12 +56811,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58876,142 +59520,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59669,6 +60193,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61134,6 +61664,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61747,6 +62289,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62209,18 +62832,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63621,6 +64232,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66120,10 +66749,6 @@ msgstr "" #~ msgid "reflog identity email (respecting .mailmap, see" #~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.nl.po b/po/documentation.nl.po index 241c5f17..16c442bc 100644 --- a/po/documentation.nl.po +++ b/po/documentation.nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-08-07 23:32+0000\n" "Last-Translator: Karel Vanhelden \n" "Language-Team: LANGUAGE \n" @@ -731,6 +731,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1225,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3633,7 +3887,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5946,7 +6200,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NAAM" @@ -5958,7 +6212,7 @@ 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-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-range-diff.txt:9 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 "" @@ -5975,7 +6229,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "BESCHRIJVING" @@ -6017,7 +6271,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPTIES" @@ -6299,7 +6553,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "VOORBEELDEN" @@ -6660,7 +6914,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6672,13 +6926,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6728,7 +6982,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7627,7 +7881,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8233,12 +8487,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13768,12 +14016,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25863,7 +26105,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38367,6 +38609,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41786,12 +42442,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56269,12 +56919,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58995,142 +59639,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59790,6 +60314,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61255,6 +61785,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61868,6 +62410,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62341,18 +62964,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63757,6 +64368,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66256,10 +66885,6 @@ msgstr "" #~ msgid "reflog identity email (respecting .mailmap, see" #~ msgstr "linkgit:git-switch[1], linkgit:git-restore[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "linkgit:git-show-index[1]" diff --git a/po/documentation.pl.po b/po/documentation.pl.po index 36d09676..ace3636d 100644 --- a/po/documentation.pl.po +++ b/po/documentation.pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-04-23 20:24+0000\n" "Last-Translator: Michal Biesiada \n" "Language-Team: LANGUAGE \n" @@ -731,6 +731,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1225,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3633,7 +3887,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5946,7 +6200,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NAZWA" @@ -5958,7 +6212,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Dodaj zawartość pliku do indeksu" #. 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-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-range-diff.txt:9 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 "STRESZCZENIE" @@ -5980,7 +6234,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "OPIS" @@ -6022,7 +6276,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPCJE" @@ -6304,7 +6558,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "PRZYKŁADY" @@ -6658,7 +6912,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "ZOBACZ TAKŻE" @@ -6670,13 +6924,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6726,7 +6980,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7625,7 +7879,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "KONFIGURACJA" @@ -8231,12 +8485,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13766,12 +14014,6 @@ msgstr "pomoc" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25871,7 +26113,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38376,6 +38618,440 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, fuzzy, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, fuzzy, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, fuzzy, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" +" .----W\n" +" / /\n" +" -----H----I\n" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, fuzzy, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" +" .----W\n" +" / /\n" +" -----H----I\n" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, fuzzy, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" +"\t .-A---M---N---O\n" +"\t / / /\n" +"\tI B D\n" +"\t \\ / /\n" +"\t `---------'\n" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, fuzzy, no-wrap, priority:100 +msgid " o o\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41789,12 +42465,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56181,12 +56851,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58896,142 +59560,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59689,6 +60233,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61141,6 +61691,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61754,6 +62316,89 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, fuzzy, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" +"$ git pull\n" +"$ git pull origin\n" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62216,18 +62861,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63671,6 +64304,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66154,10 +66805,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.pot b/po/documentation.pot index a561f327..35e2dc9a 100644 --- a/po/documentation.pot +++ b/po/documentation.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -759,6 +759,237 @@ msgstr "" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, no-wrap +msgid "linkgit:gitattributes[5]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:3 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, no-wrap +msgid "linkgit:gitcli[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:6 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, no-wrap +msgid "linkgit:gitcore-tutorial[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:9 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, no-wrap +msgid "linkgit:gitcredentials[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:12 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, no-wrap +msgid "linkgit:gitcvs-migration[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:15 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, no-wrap +msgid "linkgit:gitdiffcore[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:18 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, no-wrap +msgid "linkgit:giteveryday[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:21 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, no-wrap +msgid "linkgit:gitfaq[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:24 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, no-wrap +msgid "linkgit:gitglossary[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:27 +msgid "A Git Glossary." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, no-wrap +msgid "linkgit:githooks[5]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:30 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, no-wrap +msgid "linkgit:gitignore[5]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:33 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, no-wrap +msgid "linkgit:gitmailmap[5]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:36 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, no-wrap +msgid "linkgit:gitmodules[5]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:39 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, no-wrap +msgid "linkgit:gitnamespaces[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:42 +msgid "Git namespaces." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, no-wrap +msgid "linkgit:gitremote-helpers[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:45 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, no-wrap +msgid "linkgit:gitrepository-layout[5]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:48 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, no-wrap +msgid "linkgit:gitrevisions[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:51 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, no-wrap +msgid "linkgit:gitsubmodules[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:54 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, no-wrap +msgid "linkgit:gittutorial[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:57 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, no-wrap +msgid "linkgit:gittutorial-2[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:60 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, no-wrap +msgid "linkgit:gitworkflows[7]" +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:63 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, no-wrap @@ -979,8 +1210,8 @@ msgstr "" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, no-wrap msgid "linkgit:git-log[1]" msgstr "" @@ -3782,7 +4013,7 @@ msgstr "" #: 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 +#: en/git-tag.txt:64 en/git-verify-pack.txt:31 en/signoff-option.txt:2 #, no-wrap msgid "-s" msgstr "" @@ -6525,26 +6756,26 @@ msgstr "" #: 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 +#: en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-range-diff.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 msgid "NAME" msgstr "" @@ -6589,20 +6820,20 @@ msgstr "" #: 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-quiltimport.txt:10 en/git-range-diff.txt:9 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 @@ -6662,20 +6893,20 @@ msgstr "" #: 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-quiltimport.txt:17 en/git-range-diff.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 @@ -6772,17 +7003,17 @@ msgstr "" #: 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-range-diff.txt:45 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:43 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 @@ -7164,14 +7395,14 @@ msgstr "" #: en/git-interpret-trailers.txt:256 en/git-log.txt:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 -#: en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 -#: en/git-var.txt:27 en/git-worktree.txt:465 +#: en/git-pull.txt:203 en/git-push.txt:594 en/git-range-diff.txt:131 +#: 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-list.txt:35 en/git-rev-parse.txt:456 +#: 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:61 +#: en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 +#: en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap msgid "EXAMPLES" msgstr "" @@ -7588,15 +7819,15 @@ msgstr "" #: en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 #: en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 #: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 -#: en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 -#: en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 -#: en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 -#: en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 -#: en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 -#: en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 -#: en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 -#: en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 -#: en/gitglossary.txt:18 +#: en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 +#: en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 +#: en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 +#: en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 +#: en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 +#: en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 +#: en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 +#: en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 +#: en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -7643,14 +7874,15 @@ msgstr "" #: en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:421 #: 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:194 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:128 en/git-rev-parse.txt:481 -#: en/git-rm.txt:195 en/git-send-email.txt:529 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-push.txt:696 en/git-quiltimport.txt:63 en/git-range-diff.txt:292 +#: 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:194 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:128 +#: en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 +#: 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:89 en/git-sh-setup.txt:94 #: en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 @@ -7702,14 +7934,15 @@ msgstr "" #: en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:422 #: 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:195 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:129 en/git-rev-parse.txt:482 -#: en/git-rm.txt:196 en/git-send-email.txt:530 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-push.txt:697 en/git-quiltimport.txt:64 en/git-range-diff.txt:293 +#: 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:195 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:129 +#: en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 +#: 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:90 en/git-sh-setup.txt:95 #: en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 @@ -7774,7 +8007,7 @@ 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 +#: en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4 #, no-wrap msgid "--signoff" msgstr "" @@ -8847,9 +9080,9 @@ msgstr "" #: en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 #: en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 #: en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 -#: en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 -#: en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 -#: en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 +#: en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 +#: en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap msgid "CONFIGURATION" msgstr "" @@ -9544,11 +9777,6 @@ msgid "" "foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -msgid "linkgit:gitattributes[5]" -msgstr "" - #. type: Title = #: en/git-bisect.txt:2 #, no-wrap @@ -15893,11 +16121,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -msgid "linkgit:gitignore[5]" -msgstr "" - #. type: Title = #: en/git-clone.txt:2 #, no-wrap @@ -30225,7 +30448,7 @@ msgid "" msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap msgid "--creation-factor=" msgstr "" @@ -44606,6 +44829,505 @@ msgid "" "`$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, no-wrap +msgid "git-range-diff(1)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:7 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, no-wrap +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +msgid "" +"This command shows the differences between two versions of a patch series, " +"or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +msgid "" +"To that end, it first finds pairs of commits from both commit ranges that " +"correspond with each other. Two commits are said to correspond when the diff " +"between their patches (i.e. the author information, the commit message and " +"the commit diff) is reasonably small compared to the patches' size. See " +"``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +msgid "" +"Finally, the list of matching commits is shown in the order of the second " +"commit range, with unmatched commits being inserted just after all of their " +"ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +msgid "" +"` `: Either commit range can be of the form `..`, " +"`^!` or `^-`. See `SPECIFYING RANGES` in " +"linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +msgid "" +"` `: This is equivalent to `.. " +"..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, no-wrap +msgid "--no-dual-color" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:51 +msgid "" +"When the commit diffs differ, `git range-diff` recreates the original diffs' " +"coloring, and adds outer -/+ diff markers with the *background* being " +"red/green to make it easier to see e.g. when there was a change in what " +"exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +msgid "" +"Additionally, the commit diff lines that are only present in the first " +"commit range are shown \"dimmed\" (this can be overridden using the " +"`color.diff.` config setting where `` is one of `contextDimmed`, " +"`oldDimmed` and `newDimmed`), and the commit diff lines that are only " +"present in the second commit range are shown in bold (which can be " +"overridden using the config settings `color.diff.` with `` being " +"one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +msgid "" +"This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to " +"revert to color all lines according to the outer diff markers (and " +"completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +msgid "" +"Set the creation/deletion cost fudge factor to ``. Defaults to " +"60. Try a larger value if `git range-diff` erroneously considers a large " +"change a total rewrite (deletion of one commit and addition of another), and " +"a smaller one in the reverse case. See the ``Algorithm`` section below for " +"an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, no-wrap +msgid "--left-only" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:75 +msgid "" +"Suppress commits that are missing from the first specified range (or the " +"\"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, no-wrap +msgid "--right-only" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:79 +msgid "" +"Suppress commits that are missing from the second specified range (or the " +"\"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, no-wrap +msgid "--[no-]notes[=]" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:83 +msgid "" +"This flag is passed to the `git log` program (see linkgit:git-log[1]) that " +"generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +msgid "" +"Compare the commits specified by the two ranges, where `` is " +"considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, no-wrap +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +msgid "" +"Equivalent to passing `..` and `..`. Note that " +"`` does not need to be the exact branch point of the " +"branches. Example: after rebasing a branch `my-topic`, `git range-diff " +"my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by " +"the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +msgid "" +"`git range-diff` also accepts the regular diff options (see " +"linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` " +"options. These options are used when generating the \"diff between " +"patches\", i.e. to compare the author, commit message and diff of " +"corresponding old/new commits. There is currently no means to tweak most of " +"the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +msgid "" +"The output of the `range-diff` command is subject to change. It is intended " +"to be human-readable porcelain output, not something that can be used across " +"versions of Git to get a textually stable `range-diff` (as opposed to " +"something like the `--stable` option to linkgit:git-patch-id[1]). There's " +"also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is " +"not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +msgid "" +"This is particularly true when passing in diff options. Currently some " +"options like `--stat` can, as an emergent effect, produce output that's " +"quite useless in the context of `range-diff`. Future versions of " +"`range-diff` may learn to interpret such options in a manner specific to " +"`range-diff` (e.g. for `--stat` producing human-readable output which " +"summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +msgid "" +"This command uses the `diff.color.*` and `pager.range-diff` settings (the " +"latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +msgid "" +"When a rebase required merge conflicts to be resolved, compare the changes " +"introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +msgid "" +"In this example, there are 3 old and 3 new commits, where the developer " +"removed the 3rd, added a new one before the first two, and modified the " +"commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +msgid "" +"When the output goes to a terminal, it is color-coded by default, just like " +"regular `git diff`'s output. In addition, the first line (adding a commit) " +"is green, the last line (deleting a commit) is red, the second line (with a " +"perfect match) is yellow like the commit header of `git show`'s output, and " +"the third line colors the old commit red, the new one green and the rest " +"like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +msgid "" +"A naive color-coded diff of diffs is actually a bit hard to read, though, as " +"it colors the entire lines red or green. The line that added \"What is " +"unexpected\" in the old commit, for example, is completely red, even if the " +"intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +msgid "" +"To help with that, `range` uses the `--dual-color` mode by default. In this " +"mode, the diff of diffs will retain the original diff colors, and prefix the " +"lines with -/+ markers that have their *background* red or green, to make it " +"more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +msgid "" +"The general idea is this: we generate a cost matrix between the commits in " +"both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +msgid "" +"The cost matrix is populated thusly: for each pair of commits, both diffs " +"are generated and the \"diff of diffs\" is generated, with 3 context lines, " +"then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +msgid "" +"To avoid false positives (e.g. when a patch has been removed, and an " +"unrelated patch has been added between two iterations of the same patch " +"series), the cost matrix is extended to allow for that, by adding fixed-cost " +"entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +msgid "" +"Example: Let commits `1--2` be the first iteration of a patch series and " +"`A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` " +"and `C` is a cherry-pick of `1` but with a small modification (say, a fixed " +"typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +msgid "" +"We are looking for a \"best\" explanation of the new series in terms of the " +"old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +msgid "" +"This explanation comes for \"free\" because there was no change. Similarly " +"`C` could be explained using `1`, but that comes at some cost c>0 because of " +"the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +msgid "" +"In mathematical terms, what we are looking for is some sort of a minimum " +"cost bipartite matching; `1` is matched to `C` at some cost, etc. The " +"underlying graph is in fact a complete bipartite graph; the cost we " +"associate with every edge is the size of the diff between the two commits' " +"patches. To explain also new commits, we introduce dummy nodes on both " +"sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +msgid "" +"The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge " +"factor that should be smaller than 100%. The cost of an edge `o--o` is " +"free. The fudge factor is necessary because even if `1` and `C` have nothing " +"in common, they may still share a few empty lines and such, possibly making " +"the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if " +"`1` and `C` have nothing in common. With the fudge factor we require a much " +"larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +msgid "" +"The overall time needed to compute this algorithm is the time needed to " +"compute n+m commit diffs and then n*m diffs of patches, plus the time needed " +"to compute the least-cost assignment between n and m diffs. Git uses an " +"implementation of the Jonker-Volgenant algorithm to solve the assignment " +"problem, which has cubic runtime complexity. The matching found in this case " +"will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, no-wrap @@ -48613,11 +49335,6 @@ msgid "" "using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -msgid "linkgit:gitremote-helpers[7]" -msgstr "" - #. type: Title = #: en/git-remote-fd.txt:2 #, no-wrap @@ -65341,11 +66058,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -msgid "linkgit:gitnamespaces[7]" -msgstr "" - #. type: Title = #: en/git-var.txt:2 #, no-wrap @@ -68542,149 +69254,31 @@ msgid "" "'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -msgid "" -"If the file `.mailmap` exists at the toplevel of the repository, or at the " -"location pointed to by the mailmap.file or mailmap.blob configuration " -"options, it is used to map author and committer names and email addresses to " -"canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -msgid "" -"In the simple form, each line in the file consists of the canonical real " -"name of an author, whitespace, and an email address used in the commit " -"(enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -msgid "" -"which allows mailmap to replace both the name and the email of a commit " -"matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -msgid "" -"which allows mailmap to replace both the name and the email of a commit " -"matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -msgid "" -"Example 1: Your history contains commits by two authors, Jane and Joe, whose " -"names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -msgid "" -"Now suppose that Joe wants his middle name initial used, and Jane prefers " -"her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -msgid "" -"Note how there is no need for an entry for ``, because " -"the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 +#. type: Labeled list +#: en/line-range-options.txt:1 #, no-wrap -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -msgid "Then you might want a `.mailmap` file that looks like:" +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 +#. type: Labeled list +#: en/line-range-options.txt:2 #, no-wrap -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 +#: en/line-range-options.txt:14 msgid "" -"Use hash '#' for comments that are either on their own line, or after the " -"email address." +"Trace the evolution of the line range given by ',', or by the " +"function name regex '', within the ''. You may not give any " +"pathspec limiters. This is currently limited to a walk starting from a " +"single revision, i.e., you may only give zero or one positive revision " +"arguments, and '' and '' (or '') must exist in the " +"starting revision. You can specify this option more than once. Implies " +"`--patch`. Patch output can be suppressed using `--no-patch`, but other " +"diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, " +"`--summary`, `--name-only`, `--name-status`, `--check`) are not currently " +"implemented." msgstr "" #. type: Plain text @@ -69410,6 +70004,17 @@ msgstr "" msgid "xxdiff" msgstr "" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +msgid "" +"THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an " +"early stage. A SHA-256 repository will in general not be able to share work " +"with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git " +"internal file formats in relation to SHA-256 repositories may change in " +"backwards-incompatible ways. Only use `--object-format=sha256` for testing " +"purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap @@ -70985,6 +71590,22 @@ msgid "" "useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +msgid "" +"When combining multiple `--contains` and `--no-contains` filters, only " +"references that contain at least one of the `--contains` commits and contain " +"none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +msgid "" +"When combining multiple `--merged` and `--no-merged` filters, only " +"references that are reachable from at least one of the `--merged` commits " +"and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap @@ -71729,6 +72350,98 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +msgid "" +"List commits that are reachable by following the `parent` links from the " +"given commit(s), but exclude commits that are reachable from the one(s) " +"given with a '{caret}' in front of them. The output is given in reverse " +"chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +msgid "" +"You can think of this as a set operation. Commits reachable from any of the " +"commits given on the command line form a set, and then commits reachable " +"from any of the ones given with '{caret}' in front are subtracted from that " +"set. The remaining commits are what comes out in the command's output. " +"Various other options and paths parameters can be used to further limit the " +"result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, no-wrap +msgid "$ git rev-list foo bar ^baz\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +msgid "" +"means \"list all the commits which are reachable from 'foo' or 'bar', but " +"not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +msgid "" +"A special notation \"''..''\" can be used as a short-hand " +"for \"^'' ''\". For example, either of the following may " +"be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +msgid "" +"Another special notation is \"''...''\" which is useful " +"for merges. The resulting set of commits is the symmetric difference " +"between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, no-wrap +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, no-wrap +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap @@ -72259,18 +72972,6 @@ msgid "" "pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, no-wrap -msgid "--left-only" -msgstr "" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, no-wrap -msgid "--right-only" -msgstr "" - #. type: Plain text #: en/rev-list-options.txt:263 msgid "" @@ -73912,6 +74613,32 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, no-wrap +msgid "--no-signoff" +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:16 +msgid "" +"Add a `Signed-off-by` trailer by the committer at the end of the commit log " +"message. The meaning of a signoff depends on the project to which you're " +"committing. For example, it may certify that the committer has the rights " +"to submit the work under the project's license or agrees to some contributor " +"representation, such as a Developer Certificate of Origin. (See " +"http://developercertificate.org for the one used by the Linux kernel and Git " +"projects.) Consult the documentation or leadership of the project to which " +"you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +msgid "" +"The --no-signoff option can be used to countermand an earlier --signoff " +"option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 msgid "" diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po index e0eba5a1..63263373 100644 --- a/po/documentation.pt_BR.po +++ b/po/documentation.pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-01-19 16:32+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: none\n" @@ -731,6 +731,266 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Operação bidirecional entre um repositório do Subversion e do Git." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, fuzzy, priority:100 +#| msgid "Listing all attributes for a file:" +msgid "Defining attributes per path." +msgstr "Listando todos os atributos de um arquivo:" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, fuzzy, priority:100 +#| msgid "Munging the diff output" +msgid "Tweaking diff output." +msgstr "Arruinando a saída diff" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary - A Git Glossary" +msgid "A Git Glossary." +msgstr "gitglossary - Um Glossário do Git" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "whitespace" +msgid "Git namespaces." +msgstr "whitespace (espaço)" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, fuzzy, priority:100 +#| msgid "The URL to the remote repository." +msgid "Helper programs to interact with remote repositories." +msgstr "A URL para o repositório remoto." + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +#| msgid "The Git Repository" +msgid "Git Repository Layout." +msgstr "O Repositório Git" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +#| msgid "A portable graphical interface to Git." +msgid "A tutorial introduction to Git." +msgstr "Uma interface gráfica portátil para o Git." + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, fuzzy, priority:100 +#| msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows." +msgid "An overview of recommended workflows with Git." +msgstr "Para obter uma visão geral das recomendações do fluxo de trabalho, consulte linkgit:gitworkflows[7]." + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1231,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Cria um repositório vazio para o Git ou reinicializa um repositório já existente." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3735,7 +3995,7 @@ msgid "\tThis is the default.\n" msgstr "\tEsta é a predefinição.\n" #. 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -6081,7 +6341,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "NOME" @@ -6093,7 +6353,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Adicione o conteúdo do arquivo ao índice" #. 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-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-range-diff.txt:9 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 "RESUMO" @@ -6115,7 +6375,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "DESCRIÇÃO" @@ -6157,7 +6417,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "Consulte linkgit:git-commit[1] para ver as formas alternativas de adicionar um conteúdo a um commit." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "OPÇÕES" @@ -6439,7 +6699,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "Esta opção pode ser utilizada para separar as opções da linha de comandos da lista dos arquivos (útil quando os nomes do arquivo puderem ser confundidos com as opções da linha de comando)." #. 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "EXEMPLOS" @@ -6817,7 +7077,7 @@ msgid "modifying the contents of context or removal lines" msgstr "modificando o conteúdo do contexto ou as linhas de remoção" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "VEJA TAMBÉM" @@ -6829,13 +7089,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Parte do conjunto linkgit:git[1]" @@ -6893,7 +7153,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this msgstr "A lista dos arquivos da caixa de correio para leitura dos patches. Caso você não utilize este argumento, o comando lê na entrada padrão. Caso utilize os diretórios, eles serão tratados como caixas de correio." #. 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7802,7 +8062,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "Quando o comando `git apply` for utilizado como um \"better GNU patch\" (patch melhor do que o do GNU), o usuário pode encaminhar a opção `--unsafe-paths` para substituir esta verificação de segurança. Esta opção não tem efeito quando a opção `--index` ou `--cached` estiver em uso." #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "CONFIGURAÇÃO" @@ -8413,12 +8673,6 @@ msgstr "`git config tar.tar.xz.command \"xz -c\"`" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "Configure um formato \"tar.xz\" para criar arquivo tarfiles compactados com LZMA. Você pode utilizá-lo utilizando a opção `--format=tar.xz` ou criando um arquivo gerado com `-o foo.tar.xz`." -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -14254,12 +14508,6 @@ msgstr "ajuda" msgid "Show brief usage of interactive git-clean." msgstr "Exiba uma breve descrição de utilização do `git-clean` interativo." -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -26898,7 +27146,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "Observe que as opções diff passadas ao comando afetam como o produto primário do `format-patch` será gerado, não são passadas para o mecanismo subjacente do `range-diff` usado para gerar o material da carta de apresentação (isso pode mudar no futuro)." #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "--creation-factor=" @@ -39938,6 +40186,486 @@ msgstr "O arquivo da série colcha de retalhos \"quilt\"." msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "O padrão para o arquivo da série são /series ou o valor da variável de ambiente `$QUILT_SERIES`." +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +#| msgid "Compare two commit ranges (e.g. two versions of a branch)." +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Compara os dois intervalos de um commit (duas versões de um ramo por exemplo)." + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, fuzzy, priority:100 +#| msgid "There are two ways to specify which commits to operate on." +msgid "There are three ways to specify the commit ranges:" +msgstr "Existem duas maneiras de especificar em quais commits operar." + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--notes[=]" +msgid "--[no-]notes[=]" +msgstr "--notes[=]" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, fuzzy, priority:100 +#| msgid "This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply." +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "Esta opção é repassada para o comando 'git apply' que aplica o patch (consulte linkgit:git-apply[1]). Implica no uso da opção --apply." + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#| msgid "'\\...'" +msgid "..." +msgstr "'\\...'" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, fuzzy, no-wrap, priority:100 +#| msgid "'..'" +msgid " " +msgstr "'..'" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, fuzzy, no-wrap, priority:100 +#| msgid "OUTPUT FORMAT" +msgid "OUTPUT STABILITY" +msgstr "FORMATO DE SAÍDA" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, fuzzy, no-wrap, priority:100 +#| msgid "Skip algorithm" +msgid "Algorithm" +msgstr "Algoritmo de salto" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " B D\n" +#| " / /\n" +#| " ---X---A\n" +msgid " 1 A\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " B D\n" +#| " / /\n" +#| " ---X---A\n" +msgid " 2 B\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " .----W\n" +#| " / /\n" +#| " -----H----I\n" +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" +" .----W\n" +" / /\n" +" -----H----I\n" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " .----W\n" +#| " / /\n" +#| " -----H----I\n" +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" +" .----W\n" +" / /\n" +" -----H----I\n" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " G-H-I-J\n" +#| " / \\\n" +#| "A-B-C-D-E-F O\n" +#| " \\ /\n" +#| " K-L-M-N\n" +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" +" G-H-I-J\n" +" / \\\n" +"A-B-C-D-E-F O\n" +" \\ /\n" +" K-L-M-N\n" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " B D\n" +#| " / /\n" +#| " ---X---A\n" +msgid " o o\n" +msgstr "" +" B D\n" +" / /\n" +" ---X---A\n" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| " X\n" +#| " \\\n" +#| " A---M---B\n" +#| " /\n" +#| "---o---O---P---Q\n" +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" +" X\n" +" \\\n" +" A---M---B\n" +" /\n" +"---o---O---P---Q\n" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, fuzzy, no-wrap, priority:100 +#| msgid " E---H'---I'---J' topicA\n" +msgid " o ---------- o\n" +msgstr " E---H'---I'---J' topicA\n" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -43550,12 +44278,6 @@ msgstr "\"ext::git-ssl foo.examplo /bar\"" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "Representa um repositório acessado utilizando o programa auxiliar \"git-ssl foo.example /bar\". O tipo de solicitação pode ser determinado através do auxiliar utilizando as variáveis do ambiente (veja acima)." -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58712,12 +59434,6 @@ msgstr "Somente o anúncio da \"ref\" inicial é produzido e o programa encerra msgid "The repository to sync from." msgstr "O repositório de onde a sincronizaremos." -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -61496,161 +62212,26 @@ msgstr "Válido apenas para '' que definirá uma quantidade de linhas antes msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "Caso `:` seja informado no lugar do '' e '', é uma expressão regular que indica o intervalo da primeira `` que coincida com '' até a próxima linha funcname. `:` pesquisa no final do intervalo `-L` anterior, se houver, caso contrário, a pesquisa ocorrerá desde o início do arquivo. `^:` pesquisa desde o início do arquivo. Os nomes das funções são determinados da mesma maneira que o comando `git diff` lida com os pedaços dos cabeçalhos do patch (consulte 'Definindo um cabeçalho personalizado do hunk' em linkgit:gitattributes[5])." -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "Caso o arquivo `.mailmap` exista no topo do repositório ou no local apontado pelas opções da configuração `mailmap.file` ou `mailmap.blob`, ele será utilizado para mapear os nomes dos autores e os endereços de email para os seus respectivos nomes e endereços de email verdadeiros." - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "No formato simples, cada linha do arquivo consiste no nome real de um autor, espaço e um endereço de email utilizado no commit (delimitado por '<' and '>') mapeando para o nome. Por exemplo:" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "\tNome Próprio \n" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "Os formatos mais complexos são:" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "\t \n" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "o que permite que o mailmap substitua apenas a parte do email de um commit e:" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "\tNome Próprio \n" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "o que permite que o mailmap substitua ambos os nomes e o email de um commit correspondente ao endereço de email do commit especificado, e:" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "\tNome Próprio Nome de quem fez o Commit \n" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "o que permite que o mailmap substitua ambos os nomes e o email de um commit que corresponda a ambos os nomes de quem fez o commit e com o endereço de email." - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "Exemplo 1: O seu histórico contém confirmações de dois autores, Jane e Joe, cujos nomes aparecem no repositório de diferentes maneiras:" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "Agora, suponha que Joe queira que seu nome do meio seja utilizado no começo e Jane prefere que o nome de sua família seja escrito por extenso. Um arquivo `.mailmap` apropriado se pareceria com:" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" -"Jane Doe \n" -"Joe R. Developer \n" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "Observe como não há necessidade de uma entrada para `` porque o nome real deste autor já está correto." - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "Exemplo 2: O seu repositório contém commits dos seguintes autores:" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "Então você pode querer um arquivo `.mailmap` parecido com:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ,:" +msgid "-L,:" +msgstr "-L ,:" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" -msgstr "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ::" +msgid "-L::" +msgstr "-L ::" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." -msgstr "Utilize o sinal de jogo da velha '#' para comentários que estejam em sua própria linha ou após o endereço de email." +#: en/line-range-options.txt:14 +#, fuzzy, priority:100 +#| msgid "Trace the evolution of the line range given by \",\" (or the function name regex ) within the . You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and and (or ) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." +msgstr "Monitore a evolução do intervalo das linhas definidos em \",\" (ou o nome da função regex ) dentro do . Você não pode usar qualquer limitador com o `pathspec`. No momento, está limitado a um passo a partir de uma única revisão, ou seja, você pode utilizar zero apenas ou um argumento de revisão positivo, onde e (ou ) devam existir na revisão inicial. É possível utilizar esta opção amais de uma vez. Implica no uso da opção `--patch`. A geração do patch pode ser suprimida utilizando o comando `--no-patch`, porém outros formatos diff (nomeadamente `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`,` --name-status`, `--check`) ainda não foram implementados." #. type: Plain text #: en/merge-options.txt:5 @@ -62304,6 +62885,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -63779,6 +64366,18 @@ msgstr "Quando se sabe que o ramo remoto que você quer buscar é retrocedida e msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "Há uma diferença entre listar múltiplos diretamente na linha de comando com 'git pull' e ter várias entradas `remote..fetch` na sua configuração para um e executar um comando com 'git pull' sem qualquer parâmetros explícitos . Os s listados explicitamente na linha de comando são sempre mesclado no ramo atual após a busca. Em outras palavras, caso você liste mais de uma \"ref\" remota, o comando 'git pull' criará uma mesclagem \"Octopus\" (Polvo). Por outro lado, caso você não liste nenhum parâmetro de forma explícita na linha de comando, o comando 'git pull' buscará tudo o que encontrar na configuração `remote..fetch` e mesclará apenas o primeiro que for encontrado no ramo atual. Isso ocorre porque raramente é feito a criação de um \"polvo\" a partir das refs remotas, enquanto monitora os vários cabeçalhos remotos de uma só, isso geralmente é bastante útil." +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -64441,6 +65040,110 @@ msgstr "" "\t = B ^D ^E ^F B\n" " F^! D = F ^I ^J D G H D F\n" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "Liste os commits que podem ser acessadas seguindo os links `parent` de determinados commits, porém exclua os commits acessíveis das que receberam um '{caret}' na frente deles. Por predefinição, a saída é informada em ordem cronológica reversa." + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, fuzzy, priority:100 +#| msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "É possível pensar nisso como uma operação em conjunto. Os commits utilizados na linha de comando formam um conjunto de commits acessíveis a partir de qualquer uma delas e, em seguida, os commits acessíveis a partir de qualquer uma das que são informadas na frente com '{caret}' são subtraídas desse conjunto. Os commits restantes são o que são gerados pelo comando. Várias outras opções e parâmetros de caminho podem ser usados para limitar ainda mais o resultado." + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "Assim, o seguinte comando:" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "\t$ git rev-list foo bar ^baz\n" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "\t$ git rev-list foo bar ^baz\n" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, fuzzy, no-wrap, priority:100 +#| msgid "\t$ git rev-list foo bar ^baz\n" +msgid "$ git log foo bar ^baz\n" +msgstr "\t$ git rev-list foo bar ^baz\n" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "significa \"listar todos os commits acessíveis a partir do 'foo' ou 'bar', porém não de 'baz'\"." + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, fuzzy, priority:100 +#| msgid "A special notation \"''..''\" can be used as a short-hand for \"{caret}'' ''\". For example, either of the following may be used interchangeably:" +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "Uma notação especial \"''..''\" pode ser utilizada como uma abreviação para \"{caret}'' ''\". Qualquer um dos seguintes pode ser usado de forma intercambiável, por exemplo:" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "\t$ git rev-list origin..HEAD\n" +#| "\t$ git rev-list HEAD ^origin\n" +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" +"\t$ git rev-list origin..HEAD\n" +"\t$ git rev-list HEAD ^origin\n" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "\t$ git rev-list origin..HEAD\n" +#| "\t$ git rev-list HEAD ^origin\n" +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" +"\t$ git rev-list origin..HEAD\n" +"\t$ git rev-list HEAD ^origin\n" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "Outra notação especial é \"''...''\", útil para mesclagens. O conjunto resultante dos commits é a diferença simétrica entre dois operandos. Os dois comandos a seguir são equivalentes:" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#| msgid "" +#| "\t$ git rev-list A B --not $(git merge-base --all A B)\n" +#| "\t$ git rev-list A...B\n" +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" +"\t$ git rev-list A B --not $(git merge-base --all A B)\n" +"\t$ git rev-list A...B\n" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#| msgid "" +#| "\t$ git rev-list A B --not $(git merge-base --all A B)\n" +#| "\t$ git rev-list A...B\n" +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" +"\t$ git rev-list A B --not $(git merge-base --all A B)\n" +"\t$ git rev-list A...B\n" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -64903,18 +65606,6 @@ msgstr "Omitir qualquer commit que apresente a mesma alteração como em outro c msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "Como por exemplo, caso você tenha dois ramos, `A` e `B`, uma maneira comum de listar todos os commits em apenas um lado deles é com a opção `--left-right` (veja o exemplo abaixo na descrição da opção `--left-right`). No entanto, exibe os commits que foram selecionados de forma seletiva no outro ramo (por exemplo, ``3º no b'' pode ser a escolha seletiva do ramo `A`). Com esta opção, estes pares de commits são excluídos da saída." -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -66383,6 +67074,26 @@ msgstr "Esqueça a operação atual em andamento. Pode ser utilizado para limpa msgid "Cancel the operation and return to the pre-sequence state." msgstr "Cancele a operação e retorne a condição pré-sequência." +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, fuzzy, priority:100 +#| msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)." +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "Adicionar uma linha assinado pela pessoa que fez o commit no final do registro log do commit assinado. O significado de uma aprovação depende do projeto, porém normalmente certifica que a pessoa que fez o commit tem o direito de enviar este trabalho sob a mesma licença e concorda com um Certificado de Origem do Desenvolvedor (consulte http://developercertificate.org/ para obter mais informações)." + +#. type: Plain text +#: en/signoff-option.txt:18 +#, fuzzy, priority:100 +#| msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line." +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "Não assine o commit com GPG-sign que contrarie a opção na linha de comando `--gpg-sign` dada em momento anterior." + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -69003,6 +69714,110 @@ msgstr "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" +#~ msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." +#~ msgstr "Caso o arquivo `.mailmap` exista no topo do repositório ou no local apontado pelas opções da configuração `mailmap.file` ou `mailmap.blob`, ele será utilizado para mapear os nomes dos autores e os endereços de email para os seus respectivos nomes e endereços de email verdadeiros." + +#~ msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" +#~ msgstr "No formato simples, cada linha do arquivo consiste no nome real de um autor, espaço e um endereço de email utilizado no commit (delimitado por '<' and '>') mapeando para o nome. Por exemplo:" + +#, no-wrap +#~ msgid "\tProper Name \n" +#~ msgstr "\tNome Próprio \n" + +#~ msgid "The more complex forms are:" +#~ msgstr "Os formatos mais complexos são:" + +#, no-wrap +#~ msgid "\t \n" +#~ msgstr "\t \n" + +#~ msgid "which allows mailmap to replace only the email part of a commit, and:" +#~ msgstr "o que permite que o mailmap substitua apenas a parte do email de um commit e:" + +#, no-wrap +#~ msgid "\tProper Name \n" +#~ msgstr "\tNome Próprio \n" + +#~ msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" +#~ msgstr "o que permite que o mailmap substitua ambos os nomes e o email de um commit correspondente ao endereço de email do commit especificado, e:" + +#, no-wrap +#~ msgid "\tProper Name Commit Name \n" +#~ msgstr "\tNome Próprio Nome de quem fez o Commit \n" + +#~ msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." +#~ msgstr "o que permite que o mailmap substitua ambos os nomes e o email de um commit que corresponda a ambos os nomes de quem fez o commit e com o endereço de email." + +#~ msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" +#~ msgstr "Exemplo 1: O seu histórico contém confirmações de dois autores, Jane e Joe, cujos nomes aparecem no repositório de diferentes maneiras:" + +#, no-wrap +#~ msgid "" +#~ "Joe Developer \n" +#~ "Joe R. Developer \n" +#~ "Jane Doe \n" +#~ "Jane Doe \n" +#~ "Jane D. \n" +#~ msgstr "" +#~ "Joe Developer \n" +#~ "Joe R. Developer \n" +#~ "Jane Doe \n" +#~ "Jane Doe \n" +#~ "Jane D. \n" + +#~ msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" +#~ msgstr "Agora, suponha que Joe queira que seu nome do meio seja utilizado no começo e Jane prefere que o nome de sua família seja escrito por extenso. Um arquivo `.mailmap` apropriado se pareceria com:" + +#, no-wrap +#~ msgid "" +#~ "Jane Doe \n" +#~ "Joe R. Developer \n" +#~ msgstr "" +#~ "Jane Doe \n" +#~ "Joe R. Developer \n" + +#~ msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." +#~ msgstr "Observe como não há necessidade de uma entrada para `` porque o nome real deste autor já está correto." + +#~ msgid "Example 2: Your repository contains commits from the following authors:" +#~ msgstr "Exemplo 2: O seu repositório contém commits dos seguintes autores:" + +#, no-wrap +#~ msgid "" +#~ "nick1 \n" +#~ "nick2 \n" +#~ "nick2 \n" +#~ "santa \n" +#~ "claus \n" +#~ "CTO \n" +#~ msgstr "" +#~ "nick1 \n" +#~ "nick2 \n" +#~ "nick2 \n" +#~ "santa \n" +#~ "claus \n" +#~ "CTO \n" + +#~ msgid "Then you might want a `.mailmap` file that looks like:" +#~ msgstr "Então você pode querer um arquivo `.mailmap` parecido com:" + +#, no-wrap +#~ msgid "" +#~ " \n" +#~ "Some Dude nick1 \n" +#~ "Other Author nick2 \n" +#~ "Other Author \n" +#~ "Santa Claus \n" +#~ msgstr "" +#~ " \n" +#~ "Some Dude nick1 \n" +#~ "Other Author nick2 \n" +#~ "Other Author \n" +#~ "Santa Claus \n" + +#~ msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#~ msgstr "Utilize o sinal de jogo da velha '#' para comentários que estejam em sua própria linha ou após o endereço de email." + #, ignore-same, no-wrap #~ msgid "linkgit:git-parse-remote[1]" #~ msgstr "linkgit:git-parse-remote[1]" @@ -69261,28 +70076,12 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "Use `--no-guess` to disable this." #~ msgstr "Utilize a opção `--no-guess` para desativar." -#~ msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)." -#~ msgstr "Adicionar uma linha assinado pela pessoa que fez o commit no final do registro log do commit assinado. O significado de uma aprovação depende do projeto, porém normalmente certifica que a pessoa que fez o commit tem o direito de enviar este trabalho sob a mesma licença e concorda com um Certificado de Origem do Desenvolvedor (consulte http://developercertificate.org/ para obter mais informações)." - #~ msgid "Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information." #~ msgstr "Adicione a linha `Signed-off-by:` (Assinada por:) à mensagem do commit, utilizando a sua identidade. Para mais informações sobre a assinatura na saída da mensagem, consulte em linkgit:git-commit[1]." #~ msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found." #~ msgstr "Exibe o texto ao redor da linha anterior que contenha um nome da função até o nome anterior ao próximo, exibindo efetivamente toda a função em que a coincidência foi encontrada." -#~ msgid "-L ,:" -#~ msgstr "-L ,:" - -#~ msgid "-L ::" -#~ msgstr "-L ::" - -#~ msgid "Trace the evolution of the line range given by \",\" (or the function name regex ) within the . You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and and (or ) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." -#~ msgstr "Monitore a evolução do intervalo das linhas definidos em \",\" (ou o nome da função regex ) dentro do . Você não pode usar qualquer limitador com o `pathspec`. No momento, está limitado a um passo a partir de uma única revisão, ou seja, você pode utilizar zero apenas ou um argumento de revisão positivo, onde e (ou ) devam existir na revisão inicial. É possível utilizar esta opção amais de uma vez. Implica no uso da opção `--patch`. A geração do patch pode ser suprimida utilizando o comando `--no-patch`, porém outros formatos diff (nomeadamente `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`,` --name-status`, `--check`) ainda não foram implementados." - -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #~ msgid "With --no-signoff do not add a Signed-off-by line." #~ msgstr "A opção `--no-signoff` não adiciona a linha de assinatura \"Signed-off-by\"." @@ -69304,43 +70103,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])." #~ msgstr "Estas opções são passados para o comando 'git am' para alterar facilmente as datas dos commits onde o \"rebase\" foi feito (consulte linkgit:git-am[1])." -#~ msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." -#~ msgstr "Liste os commits que podem ser acessadas seguindo os links `parent` de determinados commits, porém exclua os commits acessíveis das que receberam um '{caret}' na frente deles. Por predefinição, a saída é informada em ordem cronológica reversa." - -#~ msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." -#~ msgstr "É possível pensar nisso como uma operação em conjunto. Os commits utilizados na linha de comando formam um conjunto de commits acessíveis a partir de qualquer uma delas e, em seguida, os commits acessíveis a partir de qualquer uma das que são informadas na frente com '{caret}' são subtraídas desse conjunto. Os commits restantes são o que são gerados pelo comando. Várias outras opções e parâmetros de caminho podem ser usados para limitar ainda mais o resultado." - -#~ msgid "Thus, the following command:" -#~ msgstr "Assim, o seguinte comando:" - -#~ msgid "\t$ git rev-list foo bar ^baz\n" -#~ msgstr "\t$ git rev-list foo bar ^baz\n" - -#~ msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." -#~ msgstr "significa \"listar todos os commits acessíveis a partir do 'foo' ou 'bar', porém não de 'baz'\"." - -#~ msgid "A special notation \"''..''\" can be used as a short-hand for \"{caret}'' ''\". For example, either of the following may be used interchangeably:" -#~ msgstr "Uma notação especial \"''..''\" pode ser utilizada como uma abreviação para \"{caret}'' ''\". Qualquer um dos seguintes pode ser usado de forma intercambiável, por exemplo:" - -#~ msgid "" -#~ "\t$ git rev-list origin..HEAD\n" -#~ "\t$ git rev-list HEAD ^origin\n" -#~ msgstr "" -#~ "\t$ git rev-list origin..HEAD\n" -#~ "\t$ git rev-list HEAD ^origin\n" - -#, ignore-ellipsis -#~ msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" -#~ msgstr "Outra notação especial é \"''...''\", útil para mesclagens. O conjunto resultante dos commits é a diferença simétrica entre dois operandos. Os dois comandos a seguir são equivalentes:" - -#, ignore-ellipsis -#~ msgid "" -#~ "\t$ git rev-list A B --not $(git merge-base --all A B)\n" -#~ "\t$ git rev-list A...B\n" -#~ msgstr "" -#~ "\t$ git rev-list A B --not $(git merge-base --all A B)\n" -#~ "\t$ git rev-list A...B\n" - #~ msgid "Collect and show committer identities instead of authors." #~ msgstr "Colete e exiba as identidades de quem realizou os commits em vez dos autores." @@ -69366,9 +70128,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "Show recursive diffs." #~ msgstr "Exibe os \"diffs\" recursivos." -#~ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line." -#~ msgstr "Não assine o commit com GPG-sign que contrarie a opção na linha de comando `--gpg-sign` dada em momento anterior." - #~ msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed." #~ msgstr "A revogação da variável de configuração `commit.gpgSign` que está definida para impor cada e todo commit que será assinado." diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po index b1087fb1..57408335 100644 --- a/po/documentation.pt_PT.po +++ b/po/documentation.pt_PT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-02-08 19:43+0100\n" "Last-Translator: Matthias Ahauer \n" "Language-Team: pt_PT\n" @@ -729,6 +729,259 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +msgid "Git namespaces." +msgstr "--whitespace" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -969,8 +1222,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3631,7 +3884,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5942,7 +6195,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "" @@ -5954,7 +6207,7 @@ 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-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-range-diff.txt:9 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 "" @@ -5971,7 +6224,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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "" @@ -6013,7 +6266,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" @@ -6295,7 +6548,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6649,7 +6902,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6661,13 +6914,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6717,7 +6970,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7616,7 +7869,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8221,12 +8474,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13754,12 +14001,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25848,7 +26089,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38341,6 +38582,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41753,12 +42408,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56142,12 +56791,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58857,142 +59500,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59650,6 +60173,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61102,6 +61631,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61715,6 +62256,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62177,18 +62799,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63589,6 +64199,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66064,10 +66692,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.ru.po b/po/documentation.ru.po index 08f76fe5..0c2c4ed3 100644 --- a/po/documentation.ru.po +++ b/po/documentation.ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-12-31 01:29+0000\n" "Last-Translator: Golubev Alexander \n" "Language-Team: LANGUAGE \n" @@ -731,6 +731,261 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Двухсторонние операции между репозиториями Subversion и Git." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary - A Git Glossary" +msgid "A Git Glossary." +msgstr "gitglossary - Глоссарий Git" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "whitespace" +msgid "Git namespaces." +msgstr "whitespace" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +#| msgid "The Git repository browser." +msgid "Git Repository Layout." +msgstr "Браузер репозитория Git." + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +msgid "A tutorial introduction to Git." +msgstr "Портативный графический интерфейс для Git" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1226,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Создание пустого репозитория Git или переинициализация существующего." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3889,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5947,7 +6202,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "НАЗВАНИЕ" @@ -5959,7 +6214,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Добавить содержимое файла в индекс" #. 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-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-range-diff.txt:9 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 "ОБЗОР" @@ -5981,7 +6236,7 @@ msgstr "" "\t [--] [<спецификатор-пути>...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "ОПИСАНИЕ" @@ -6023,7 +6278,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "По ссылке linkgit:git-commit[1] доступны альтернативные пути добавления файлов в коммит." #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "ПАРАМЕТРЫ" @@ -6305,7 +6560,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "ПРИМЕРЫ" @@ -6669,7 +6924,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "СМОТРИ ТАКЖЕ" @@ -6681,13 +6936,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Является частью пакета linkgit:git[1]" @@ -6754,7 +7009,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7653,7 +7908,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "КОНФИГУРАЦИЯ" @@ -8259,12 +8514,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13794,12 +14043,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25932,7 +26175,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38449,6 +38692,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, fuzzy, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "Сравнение двух диапазонов коммитов (например двух версий ветки)" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-notes[=]" +msgid "--[no-]notes[=]" +msgstr "--show-notes[=<ссылка>]" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41862,12 +42519,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56269,12 +56920,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58983,142 +59628,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59776,6 +60301,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61235,6 +61766,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61848,6 +62391,97 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "$ git fetch origin\n" +#| "$ git merge origin/next\n" +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" +"$ git fetch origin\n" +"$ git merge origin/next\n" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, fuzzy, no-wrap, priority:100 +#| msgid "" +#| "$ git fetch origin\n" +#| "$ git merge origin/next\n" +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" +"$ git fetch origin\n" +"$ git merge origin/next\n" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62310,18 +62944,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63722,6 +64344,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66234,10 +66874,6 @@ msgstr "" #~ msgid "reflog identity email (respecting .mailmap, see" #~ msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.tr.po b/po/documentation.tr.po index 5912ff20..a96cf28c 100644 --- a/po/documentation.tr.po +++ b/po/documentation.tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2020-10-11 09:26+0000\n" "Last-Translator: Oğuz Ersen \n" "Language-Team: LANGUAGE \n" @@ -731,6 +731,263 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Bir Subversion deposu ile Git arasında iki yönlü işlem." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, fuzzy, priority:100 +#| msgid "The URL to the remote repository." +msgid "Helper programs to interact with remote repositories." +msgstr "Uzak deponun URL'si." + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +#| msgid "The Git repository browser." +msgid "Git Repository Layout." +msgstr "Git deposu tarayıcısı." + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +#| msgid "A portable graphical interface to Git." +msgid "A tutorial introduction to Git." +msgstr "Git için taşınabilir bir grafiksel arayüz." + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1228,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Boş bir Git deposu oluştur veya var olan bir depoyu yeniden başlat." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3634,7 +3891,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5946,7 +6203,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "İSİM" @@ -5958,7 +6215,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Dosya içeriklerini indekse ekle" #. 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-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-range-diff.txt:9 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 "ÖZET" @@ -5980,7 +6237,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "AÇIKLAMA" @@ -6022,7 +6279,7 @@ 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "SEÇENEKLER" @@ -6304,7 +6561,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6658,7 +6915,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6670,13 +6927,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6726,7 +6983,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7624,7 +7881,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8229,12 +8486,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13759,12 +14010,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25849,7 +26094,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38337,6 +38582,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-notes[=]" +msgid "--[no-]notes[=]" +msgstr "--show-notes[=]" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41746,12 +42405,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56130,12 +56783,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58841,142 +59488,22 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, no-wrap, priority:100 +msgid "-L,:" msgstr "" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59631,6 +60158,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61080,6 +61613,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61693,6 +62238,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62155,18 +62781,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63567,6 +64181,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66044,10 +66676,6 @@ msgstr "" #~ msgid "or linkgit:git-blame[1])" #~ msgstr "linkgit:git-blame[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index d07120ad..ac1bacc4 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-02-05 02:41+0000\n" "Last-Translator: AIzero-01 \n" "Language-Team: LANGUAGE \n" @@ -731,6 +731,258 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "Bidirectional operation between a Subversion repository and Git." +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +msgid "A Git Glossary." +msgstr "gitglossary - A Git Glossary" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +msgid "Git namespaces." +msgstr "空白字符" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, fuzzy, priority:100 +msgid "Git Repository Layout." +msgstr "The Git Repository" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, fuzzy, priority:100 +msgid "A tutorial introduction to Git." +msgstr " Git " + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -971,8 +1223,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "Create an empty Git repository or reinitialize an existing one." -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3661,7 +3913,7 @@ msgid "\tThis is the default.\n" msgstr "\t这是默认设置。\n" #. 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5987,7 +6239,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "名称" @@ -5999,7 +6251,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - 添加文件内容到索引" #. 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-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-range-diff.txt:9 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 "概述" @@ -6021,7 +6273,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "描述" @@ -6063,7 +6315,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "请参阅 linkgit:git-commit[1] 了解将内容添加到提交的其他替代方法。" #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "选项" @@ -6345,7 +6597,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, fuzzy, no-wrap, priority:300 msgid "EXAMPLES" msgstr "实例" @@ -6724,7 +6976,7 @@ msgid "modifying the contents of context or removal lines" msgstr "修改上下文或删除行的内容" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, fuzzy, no-wrap, priority:300 msgid "SEE ALSO" msgstr "参见" @@ -6736,13 +6988,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, fuzzy, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, fuzzy, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "linkgit:git[1] 组件的一部分" @@ -6792,7 +7044,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7691,7 +7943,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8297,12 +8549,6 @@ msgstr "`git config tar.tar.xz.command \"xz -c\"`" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13939,12 +14185,6 @@ msgstr "帮助" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -26235,7 +26475,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38927,6 +39167,435 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +msgid "--[no-]notes[=]" +msgstr "--notes[=]" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "'..'" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, fuzzy, no-wrap, priority:100 +msgid " " +msgstr "'..'" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, fuzzy, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" +" X\n" +" \\\n" +" A---M---B\n" +" /\n" +"---o---O---P---Q\n" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, fuzzy, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" +"\t .-A---M--. N\n" +"\t / / \\ /\n" +"\tI B R\n" +"\t \\ / /\n" +"\t \\ / /\n" +"\t `---X--'\n" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, fuzzy, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" +" X\n" +" \\\n" +" A---M---B\n" +" /\n" +"---o---O---P---Q\n" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, fuzzy, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "1 --- 2 --- 3 --- 4 --- 5\n" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -42408,12 +43077,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -57022,12 +57685,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -59759,142 +60416,23 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ," +msgid "-L,:" +msgstr "-L ," -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, fuzzy, no-wrap, priority:100 +msgid "-L::" +msgstr "-L ::" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -60552,6 +61090,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -62014,6 +62558,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -62634,6 +63190,90 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, fuzzy, priority:100 +msgid "Thus, the following command:" +msgstr "支持以下日期格式：" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +msgid "$ git rev-list foo bar ^baz\n" +msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, fuzzy, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, fuzzy, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" +"$ git fetch origin\n" +"$ git merge origin/next\n" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, fuzzy, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" +"$ git fetch origin\n" +"$ git merge origin/next\n" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -63096,18 +63736,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -64566,6 +65194,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -67073,10 +67719,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "and the `--date` option" #~ msgstr "和 `--date` 选项" -#, fuzzy -#~ msgid "support the following date formats:" -#~ msgstr "支持以下日期格式：" - #, fuzzy, no-wrap #~ msgid "Configuration" #~ msgstr "配置" @@ -67131,14 +67773,6 @@ msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]" #~ msgid "to sign a signed commit" #~ msgstr "--origin " -#, fuzzy -#~ msgid "-L ::" -#~ msgstr "-L ::" - -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po index 6513cedd..eb945928 100644 --- a/po/documentation.zh_HANT.po +++ b/po/documentation.zh_HANT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 13:35+0100\n" +"POT-Creation-Date: 2021-02-27 18:16+0100\n" "PO-Revision-Date: 2021-01-19 16:32+0000\n" "Last-Translator: Lilian Wang \n" "Language-Team: French\n" @@ -732,6 +732,260 @@ msgstr "linkgit:git-svn[1]" msgid "Bidirectional operation between a Subversion repository and Git." msgstr "" +#. type: Plain text +#: en/cmds-guide.txt:1 en/git-archive.txt:200 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-guide.txt:3 +#, priority:100 +msgid "Defining attributes per path." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:4 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-guide.txt:6 +#, priority:100 +msgid "Git command-line interface and conventions." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:7 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcore-tutorial[7]" +msgstr "linkgit:gitcore-tutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:9 +#, priority:100 +msgid "A Git core tutorial for developers." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:10 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcredentials[7]" +msgstr "linkgit:gitcredentials[7]" + +#. type: Plain text +#: en/cmds-guide.txt:12 +#, priority:100 +msgid "Providing usernames and passwords to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:13 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitcvs-migration[7]" +msgstr "linkgit:gitcvs-migration[7]" + +#. type: Plain text +#: en/cmds-guide.txt:15 +#, priority:100 +msgid "Git for CVS users." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:16 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitdiffcore[7]" +msgstr "linkgit:gitdiffcore[7]" + +#. type: Plain text +#: en/cmds-guide.txt:18 +#, priority:100 +msgid "Tweaking diff output." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:19 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:giteveryday[7]" +msgstr "linkgit:giteveryday[7]" + +#. type: Plain text +#: en/cmds-guide.txt:21 +#, priority:100 +msgid "A useful minimum set of commands for Everyday Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:22 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitfaq[7]" +msgstr "linkgit:gitfaq[7]" + +#. type: Plain text +#: en/cmds-guide.txt:24 +#, priority:100 +msgid "Frequently asked questions about using Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:25 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitglossary[7]" +msgstr "linkgit:gitglossary[7]" + +#. type: Plain text +#: en/cmds-guide.txt:27 +#, fuzzy, priority:100 +#| msgid "gitglossary(7)" +msgid "A Git Glossary." +msgstr "gitglossary(7)" + +#. type: Labeled list +#: en/cmds-guide.txt:28 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-guide.txt:30 +#, priority:100 +msgid "Hooks used by Git." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 +#, ignore-same, no-wrap, priority:280 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-guide.txt:33 +#, priority:100 +msgid "Specifies intentionally untracked files to ignore." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:34 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-guide.txt:36 +#, priority:100 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:37 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-guide.txt:39 +#, priority:100 +msgid "Defining submodule properties." +msgstr "" + +#. type: Plain text +#: en/cmds-guide.txt:40 en/git-upload-pack.txt:50 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitnamespaces[7]" +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:42 +#, fuzzy, priority:100 +#| msgid "linkgit:gitnamespaces[7]" +msgid "Git namespaces." +msgstr "linkgit:gitnamespaces[7]" + +#. type: Plain text +#: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitremote-helpers[7]" +msgstr "linkgit:gitremote-helpers[7]" + +#. type: Plain text +#: en/cmds-guide.txt:45 +#, priority:100 +msgid "Helper programs to interact with remote repositories." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-guide.txt:48 +#, priority:100 +msgid "Git Repository Layout." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:49 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-guide.txt:51 +#, priority:100 +msgid "Specifying revisions and ranges for Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:52 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitsubmodules[7]" +msgstr "linkgit:gitsubmodules[7]" + +#. type: Plain text +#: en/cmds-guide.txt:54 +#, priority:100 +msgid "Mounting one repository inside another." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:55 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial[7]" +msgstr "linkgit:gittutorial[7]" + +#. type: Plain text +#: en/cmds-guide.txt:57 +#, priority:100 +msgid "A tutorial introduction to Git." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:58 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gittutorial-2[7]" +msgstr "linkgit:gittutorial-2[7]" + +#. type: Plain text +#: en/cmds-guide.txt:60 +#, priority:100 +msgid "A tutorial introduction to Git: part two." +msgstr "" + +#. type: Labeled list +#: en/cmds-guide.txt:61 +#, ignore-same, no-wrap, priority:100 +msgid "linkgit:gitworkflows[7]" +msgstr "linkgit:gitworkflows[7]" + +#. type: Plain text +#: en/cmds-guide.txt:63 +#, priority:100 +msgid "An overview of recommended workflows with Git." +msgstr "" + #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 #, ignore-same, no-wrap, priority:280 @@ -972,8 +1226,8 @@ msgstr "linkgit:git-init[1]" msgid "Create an empty Git repository or reinitialize an existing one." msgstr "" -#. type: Labeled list -#: en/cmds-mainporcelain.txt:61 +#. type: Plain text +#: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:290 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" @@ -3635,7 +3889,7 @@ msgid "\tThis is the default.\n" 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:71 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 +#: 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:71 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 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -5948,7 +6202,7 @@ msgid "git-add(1)" 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-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-range-diff.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 "名稱" @@ -5960,7 +6214,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - 在索引中加入檔案" #. 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-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-range-diff.txt:9 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 "格式" @@ -5982,7 +6236,7 @@ msgstr "" "\t [--] [...]\n" #. 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:26 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:23 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 +#: 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:26 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:23 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-range-diff.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 "說明" @@ -6024,7 +6278,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "linkgit:git-commit[1] 為另一種將內容加入到提交中的做法。" #. 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:27 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-mktag.txt:15 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:43 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:158 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:27 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-mktag.txt:15 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-range-diff.txt:45 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:43 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:158 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "選項" @@ -6306,7 +6560,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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 +#: 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:320 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:368 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:124 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-range-diff.txt:131 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-list.txt:35 en/git-rev-parse.txt:456 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:61 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:356 en/git-var.txt:27 en/git-worktree.txt:465 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "範例" @@ -6660,7 +6914,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 +#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:145 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:155 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:253 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:415 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-range-diff.txt:288 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:189 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:525 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:450 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1023 en/git-update-index.txt:568 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6672,13 +6926,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git- 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 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:53 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:358 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:524 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:156 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:166 en/git-gc.txt:162 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:125 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:243 en/git-ls-files.txt:257 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:52 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:65 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:421 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-range-diff.txt:292 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:194 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:128 en/git-rev-parse.txt:481 en/git-rm.txt:195 en/git-send-email.txt:529 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:89 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:454 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:1031 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:574 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:491 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "GIT" #. 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 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:54 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:359 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:525 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:157 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:167 en/git-gc.txt:163 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:126 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:244 en/git-ls-files.txt:258 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:53 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:66 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:422 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-range-diff.txt:293 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:195 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:129 en/git-rev-parse.txt:482 en/git-rm.txt:196 en/git-send-email.txt:530 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:90 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:455 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:1032 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:575 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:492 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -6728,7 +6982,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this 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 +#: 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 en/signoff-option.txt:4 #, ignore-same, no-wrap, priority:100 msgid "--signoff" msgstr "--signoff" @@ -7627,7 +7881,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the msgstr "" #. type: Title - -#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 +#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-check-mailmap.txt:40 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:186 en/git-merge.txt:358 en/git-notes.txt:311 en/git-pack-objects.txt:405 en/git-range-diff.txt:124 en/git-rebase.txt:204 en/git-repack.txt:169 en/git-send-email.txt:444 en/git-status.txt:414 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:524 #, no-wrap, priority:280 msgid "CONFIGURATION" msgstr "" @@ -8233,12 +8487,6 @@ msgstr "" msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "" -#. type: Plain text -#: en/git-archive.txt:200 -#, ignore-same, priority:100 -msgid "linkgit:gitattributes[5]" -msgstr "linkgit:gitattributes[5]" - #. type: Title = #: en/git-bisect.txt:2 #, ignore-same, no-wrap, priority:100 @@ -13768,12 +14016,6 @@ msgstr "" msgid "Show brief usage of interactive git-clean." msgstr "" -#. type: Plain text -#: en/git-clean.txt:139 en/git-status.txt:452 -#, ignore-same, priority:280 -msgid "linkgit:gitignore[5]" -msgstr "linkgit:gitignore[5]" - #. type: Title = #: en/git-clone.txt:2 #, ignore-same, no-wrap, priority:300 @@ -25864,7 +26106,7 @@ msgid "Note that diff options passed to the command affect how the primary produ msgstr "" #. type: Labeled list -#: en/git-format-patch.txt:298 +#: en/git-format-patch.txt:298 en/git-range-diff.txt:64 #, no-wrap, priority:100 msgid "--creation-factor=" msgstr "" @@ -38368,6 +38610,420 @@ msgstr "" msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" +#. type: Title = +#: en/git-range-diff.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "git-range-diff(1)" +msgstr "git-range-diff(1)" + +#. type: Plain text +#: en/git-range-diff.txt:7 +#, priority:100 +msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:15 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"'git range-diff' [--color=[]] [--no-color] []\n" +"\t[--no-dual-color] [--creation-factor=]\n" +"\t[--left-only | --right-only]\n" +"\t( | ... | )\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:21 +#, priority:100 +msgid "This command shows the differences between two versions of a patch series, or more generally, two commit ranges (ignoring merge commits)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:27 +#, priority:100 +msgid "To that end, it first finds pairs of commits from both commit ranges that correspond with each other. Two commits are said to correspond when the diff between their patches (i.e. the author information, the commit message and the commit diff) is reasonably small compared to the patches' size. See ``Algorithm`` below for details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:31 +#, priority:100 +msgid "Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:33 +#, priority:100 +msgid "There are three ways to specify the commit ranges:" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:37 +#, priority:100 +msgid "` `: Either commit range can be of the form `..`, `^!` or `^-`. See `SPECIFYING RANGES` in linkgit:gitrevisions[7] for more details." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:40 +#, ignore-ellipsis, priority:100 +msgid "`...`. This is equivalent to `.. ..`." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:43 +#, priority:100 +msgid "` `: This is equivalent to `.. ..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:46 +#, ignore-same, no-wrap, priority:100 +msgid "--no-dual-color" +msgstr "--no-dual-color" + +#. type: Plain text +#: en/git-range-diff.txt:51 +#, priority:100 +msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:59 +#, priority:100 +msgid "Additionally, the commit diff lines that are only present in the first commit range are shown \"dimmed\" (this can be overridden using the `color.diff.` config setting where `` is one of `contextDimmed`, `oldDimmed` and `newDimmed`), and the commit diff lines that are only present in the second commit range are shown in bold (which can be overridden using the config settings `color.diff.` with `` being one of `contextBold`, `oldBold` or `newBold`)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:63 +#, priority:100 +msgid "This is known to `range-diff` as \"dual coloring\". Use `--no-dual-color` to revert to color all lines according to the outer diff markers (and completely ignore the inner diff when it comes to color)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:71 +#, priority:100 +msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation why this is needed." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:72 en/rev-list-options.txt:258 +#, ignore-same, no-wrap, priority:260 +msgid "--left-only" +msgstr "--left-only" + +#. type: Plain text +#: en/git-range-diff.txt:75 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the first specified range (or the \"left range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:76 en/rev-list-options.txt:259 +#, ignore-same, no-wrap, priority:260 +msgid "--right-only" +msgstr "--right-only" + +#. type: Plain text +#: en/git-range-diff.txt:79 +#, ignore-ellipsis, priority:100 +msgid "Suppress commits that are missing from the second specified range (or the \"right range\" when using the `...` format)." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:80 +#, fuzzy, no-wrap, priority:100 +#| msgid "--show-signature" +msgid "--[no-]notes[=]" +msgstr "--show-signature" + +#. type: Plain text +#: en/git-range-diff.txt:83 +#, priority:100 +msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:84 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:87 +#, priority:100 +msgid "Compare the commits specified by the two ranges, where `` is considered an older version of ``." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:88 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "..." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:90 +#, priority:100 +msgid "Equivalent to passing `..` and `..`." +msgstr "" + +#. type: Labeled list +#: en/git-range-diff.txt:91 +#, no-wrap, priority:100 +msgid " " +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:97 +#, priority:100 +msgid "Equivalent to passing `..` and `..`. Note that `` does not need to be the exact branch point of the branches. Example: after rebasing a branch `my-topic`, `git range-diff my-topic@{u} my-topic@{1} my-topic` would show the differences introduced by the rebase." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:104 +#, priority:100 +msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:106 +#, no-wrap, priority:100 +msgid "OUTPUT STABILITY" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:115 +#, priority:100 +msgid "The output of the `range-diff` command is subject to change. It is intended to be human-readable porcelain output, not something that can be used across versions of Git to get a textually stable `range-diff` (as opposed to something like the `--stable` option to linkgit:git-patch-id[1]). There's also no equivalent of linkgit:git-apply[1] for `range-diff`, the output is not intended to be machine-readable." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:122 +#, priority:100 +msgid "This is particularly true when passing in diff options. Currently some options like `--stat` can, as an emergent effect, produce output that's quite useless in the context of `range-diff`. Future versions of `range-diff` may learn to interpret such options in a manner specific to `range-diff` (e.g. for `--stat` producing human-readable output which summarizes how the diffstat changed)." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:128 +#, priority:100 +msgid "This command uses the `diff.color.*` and `pager.range-diff` settings (the latter is on by default). See linkgit:git-config[1]." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:135 +#, priority:100 +msgid "When a rebase required merge conflicts to be resolved, compare the changes introduced by the rebase directly afterwards using:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:138 +#, no-wrap, priority:100 +msgid "$ git range-diff @{u} @{1} @\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:142 +#, priority:100 +msgid "A typical output of `git range-diff` would look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:149 +#, no-wrap, priority:100 +msgid "" +"-: ------- > 1: 0ddba11 Prepare for the inevitable!\n" +"1: c0debee = 2: cab005e Add a helpful message at the start\n" +"2: f00dbal ! 3: decafe1 Describe a bug\n" +" @@ -1,3 +1,3 @@\n" +" Author: A U Thor \n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:154 +#, no-wrap, priority:100 +msgid "" +" -TODO: Describe a bug\n" +" +Describe a bug\n" +" @@ -324,5 +324,6\n" +" This is expected.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:158 +#, no-wrap, priority:100 +msgid "" +" -+What is unexpected is that it will also crash.\n" +" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n" +" ++still out there how to fix it best. See ticket #314 for details.\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:161 +#, no-wrap, priority:100 +msgid "" +" Contact\n" +"3: bedead < -: ------- TO-UNDO\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:166 +#, priority:100 +msgid "In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the commit message of the 2nd commit as well its diff." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:173 +#, priority:100 +msgid "When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second line (with a perfect match) is yellow like the commit header of `git show`'s output, and the third line colors the old commit red, the new one green and the rest like `git show`'s commit header." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:178 +#, priority:100 +msgid "A naive color-coded diff of diffs is actually a bit hard to read, though, as it colors the entire lines red or green. The line that added \"What is unexpected\" in the old commit, for example, is completely red, even if the intent of the old commit was to add something." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:184 +#, priority:100 +msgid "To help with that, `range` uses the `--dual-color` mode by default. In this mode, the diff of diffs will retain the original diff colors, and prefix the lines with -/+ markers that have their *background* red or green, to make it more obvious that they describe how the diff itself changed." +msgstr "" + +#. type: Title - +#: en/git-range-diff.txt:187 +#, no-wrap, priority:100 +msgid "Algorithm" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:191 +#, priority:100 +msgid "The general idea is this: we generate a cost matrix between the commits in both commit ranges, then solve the least-cost assignment." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:195 +#, priority:100 +msgid "The cost matrix is populated thusly: for each pair of commits, both diffs are generated and the \"diff of diffs\" is generated, with 3 context lines, then the number of lines in that diff is used as cost." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:200 +#, priority:100 +msgid "To avoid false positives (e.g. when a patch has been removed, and an unrelated patch has been added between two iterations of the same patch series), the cost matrix is extended to allow for that, by adding fixed-cost entries for wholesale deletes/adds." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:205 +#, priority:100 +msgid "Example: Let commits `1--2` be the first iteration of a patch series and `A--C` the second iteration. Let's assume that `A` is a cherry-pick of `2,` and `C` is a cherry-pick of `1` but with a small modification (say, a fixed typo). Visualize the commits as a bipartite graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:208 +#, no-wrap, priority:100 +msgid " 1 A\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:210 +#, no-wrap, priority:100 +msgid " 2 B\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:212 en/git-range-diff.txt:224 +#, no-wrap, priority:100 +msgid "\t\t C\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:216 +#, priority:100 +msgid "We are looking for a \"best\" explanation of the new series in terms of the old one. We can represent an \"explanation\" as an edge in the graph:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:222 +#, no-wrap, priority:100 +msgid "" +" 1 A\n" +"\t /\n" +" 2 --------' B\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:229 +#, priority:100 +msgid "This explanation comes for \"free\" because there was no change. Similarly `C` could be explained using `1`, but that comes at some cost c>0 because of the modification:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:237 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +"\t `----- C\n" +"\t c>0\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:245 +#, priority:100 +msgid "In mathematical terms, what we are looking for is some sort of a minimum cost bipartite matching; `1` is matched to `C` at some cost, etc. The underlying graph is in fact a complete bipartite graph; the cost we associate with every edge is the size of the diff between the two commits' patches. To explain also new commits, we introduce dummy nodes on both sides:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:254 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +"\t |\n" +" o `----- C\n" +"\t c>0\n" +" o o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:256 +#, no-wrap, priority:100 +msgid " o o\n" +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:266 +#, priority:100 +msgid "The cost of an edge `o--C` is the size of `C`'s diff, modified by a fudge factor that should be smaller than 100%. The cost of an edge `o--o` is free. The fudge factor is necessary because even if `1` and `C` have nothing in common, they may still share a few empty lines and such, possibly making the assignment `1--C`, `o--o` slightly cheaper than `1--o`, `o--C` even if `1` and `C` have nothing in common. With the fudge factor we require a much larger common part to consider patches as corresponding." +msgstr "" + +#. type: Plain text +#: en/git-range-diff.txt:273 +#, priority:100 +msgid "The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time needed to compute the least-cost assignment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this:" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:282 +#, no-wrap, priority:100 +msgid "" +" 1 ----. A\n" +"\t | /\n" +" 2 ----+---' B\n" +" .--+-----'\n" +" o -' `----- C\n" +"\t c>0\n" +" o ---------- o\n" +msgstr "" + +#. type: delimited block - +#: en/git-range-diff.txt:284 +#, no-wrap, priority:100 +msgid " o ---------- o\n" +msgstr "" + #. type: Title = #: en/git-read-tree.txt:2 #, ignore-same, no-wrap, priority:100 @@ -41782,12 +42438,6 @@ msgstr "" msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\". The type of request can be determined by the helper using environment variables (see above)." msgstr "" -#. type: Plain text -#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, priority:100 -msgid "linkgit:gitremote-helpers[7]" -msgstr "linkgit:gitremote-helpers[7]" - #. type: Title = #: en/git-remote-fd.txt:2 #, ignore-same, no-wrap, priority:100 @@ -56181,12 +56831,6 @@ msgstr "" msgid "The repository to sync from." msgstr "" -#. type: Plain text -#: en/git-upload-pack.txt:50 -#, ignore-same, priority:100 -msgid "linkgit:gitnamespaces[7]" -msgstr "linkgit:gitnamespaces[7]" - #. type: Title = #: en/git-var.txt:2 #, ignore-same, no-wrap, priority:100 @@ -58896,142 +59540,23 @@ msgstr "" msgid "If `:` is given in place of '' and '', it is a regular expression that denotes the range from the first funcname line that matches '', up to the next funcname line. `:` searches from the end of the previous `-L` range, if any, otherwise from the start of file. `^:` searches from the start of file. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" -#. type: Plain text -#: en/mailmap.txt:6 -#, priority:260 -msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:10 -#, priority:260 -msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:12 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:15 -#, priority:260 -msgid "The more complex forms are:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:17 -#, no-wrap, priority:260 -msgid "\t \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:19 -#, priority:260 -msgid "which allows mailmap to replace only the email part of a commit, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:21 -#, no-wrap, priority:260 -msgid "\tProper Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:24 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:26 -#, no-wrap, priority:260 -msgid "\tProper Name Commit Name \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:29 -#, priority:260 -msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:32 -#, priority:260 -msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:39 -#, no-wrap, priority:260 -msgid "" -"Joe Developer \n" -"Joe R. Developer \n" -"Jane Doe \n" -"Jane Doe \n" -"Jane D. \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:44 -#, priority:260 -msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:48 -#, no-wrap, priority:260 -msgid "" -"Jane Doe \n" -"Joe R. Developer \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:52 -#, priority:260 -msgid "Note how there is no need for an entry for ``, because the real name of that author is already correct." -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:55 -#, priority:260 -msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" - -#. type: delimited block - -#: en/mailmap.txt:63 -#, no-wrap, priority:260 -msgid "" -"nick1 \n" -"nick2 \n" -"nick2 \n" -"santa \n" -"claus \n" -"CTO \n" -msgstr "" - -#. type: Plain text -#: en/mailmap.txt:66 -#, priority:260 -msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "" +#. type: Labeled list +#: en/line-range-options.txt:1 +#, fuzzy, no-wrap, priority:100 +#| msgid "-L ," +msgid "-L,:" +msgstr "-L <起點>,<終點>" -#. type: delimited block - -#: en/mailmap.txt:72 -#, no-wrap, priority:260 -msgid "" -" \n" -"Some Dude nick1 \n" -"Other Author nick2 \n" -"Other Author \n" -"Santa Claus \n" +#. type: Labeled list +#: en/line-range-options.txt:2 +#, no-wrap, priority:100 +msgid "-L::" msgstr "" #. type: Plain text -#: en/mailmap.txt:75 -#, priority:260 -msgid "Use hash '#' for comments that are either on their own line, or after the email address." +#: en/line-range-options.txt:14 +#, priority:100 +msgid "Trace the evolution of the line range given by ',', or by the function name regex '', within the ''. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and '' and '' (or '') must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgstr "" #. type: Plain text @@ -59689,6 +60214,12 @@ msgstr "winmerge" msgid "xxdiff" msgstr "xxdiff" +#. type: Plain text +#: en/object-format-disclaimer.txt:6 +#, priority:100 +msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes." +msgstr "" + #. type: Title - #: en/pretty-formats.txt:2 #, no-wrap, priority:260 @@ -61155,6 +61686,18 @@ msgstr "" msgid "There is a difference between listing multiple directly on 'git pull' command line and having multiple `remote..fetch` entries in your configuration for a and running a 'git pull' command without any explicit parameters. s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit parameter on the command line, 'git pull' will fetch all the s it finds in the `remote..fetch` configuration and merge only the first found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful." msgstr "" +#. type: Plain text +#: en/ref-reachability-filters.txt:4 +#, priority:100 +msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown." +msgstr "" + +#. type: Plain text +#: en/ref-reachability-filters.txt:7 +#, priority:100 +msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown." +msgstr "" + #. type: Title - #: en/revisions.txt:2 #, no-wrap, priority:100 @@ -61768,6 +62311,87 @@ msgid "" " F^! D = F ^I ^J D G H D F\n" msgstr "" +#. type: Plain text +#: en/rev-list-description.txt:5 +#, priority:100 +msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:12 +#, priority:100 +msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:14 +#, priority:100 +msgid "Thus, the following command:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:18 +#, fuzzy, no-wrap, priority:100 +#| msgid "git-rev-list(1)" +msgid "$ git rev-list foo bar ^baz\n" +msgstr "git-rev-list(1)" + +#. type: delimited block - +#: en/rev-list-description.txt:23 +#, no-wrap, priority:100 +msgid "$ git log foo bar ^baz\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:28 +#, priority:100 +msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"." +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:32 +#, priority:100 +msgid "A special notation \"''..''\" can be used as a short-hand for \"^'' ''\". For example, either of the following may be used interchangeably:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:37 +#, no-wrap, priority:100 +msgid "" +"$ git rev-list origin..HEAD\n" +"$ git rev-list HEAD ^origin\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:43 +#, no-wrap, priority:100 +msgid "" +"$ git log origin..HEAD\n" +"$ git log HEAD ^origin\n" +msgstr "" + +#. type: Plain text +#: en/rev-list-description.txt:49 +#, ignore-ellipsis, priority:100 +msgid "Another special notation is \"''...''\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:54 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git rev-list A B --not $(git merge-base --all A B)\n" +"$ git rev-list A...B\n" +msgstr "" + +#. type: delimited block - +#: en/rev-list-description.txt:60 +#, ignore-ellipsis, no-wrap, priority:100 +msgid "" +"$ git log A B --not $(git merge-base --all A B)\n" +"$ git log A...B\n" +msgstr "" + #. type: Title ~ #: en/rev-list-options.txt:2 #, no-wrap, priority:260 @@ -62230,18 +62854,6 @@ msgstr "" msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output." msgstr "" -#. type: Labeled list -#: en/rev-list-options.txt:258 -#, ignore-same, no-wrap, priority:260 -msgid "--left-only" -msgstr "--left-only" - -#. type: Labeled list -#: en/rev-list-options.txt:259 -#, ignore-same, no-wrap, priority:260 -msgid "--right-only" -msgstr "--right-only" - #. type: Plain text #: en/rev-list-options.txt:263 #, priority:260 @@ -63642,6 +64254,24 @@ msgstr "" msgid "Cancel the operation and return to the pre-sequence state." msgstr "" +#. type: Labeled list +#: en/signoff-option.txt:5 +#, ignore-same, no-wrap, priority:100 +msgid "--no-signoff" +msgstr "--no-signoff" + +#. type: Plain text +#: en/signoff-option.txt:16 +#, priority:100 +msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project." +msgstr "" + +#. type: Plain text +#: en/signoff-option.txt:18 +#, priority:100 +msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line." +msgstr "" + #. type: Plain text #: en/transfer-data-leaks.txt:11 #, priority:220 @@ -66141,10 +66771,6 @@ msgstr "" #~ msgid "reflog identity email (respecting .mailmap, see" #~ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]" -#, ignore-same -#~ msgid "--no-signoff" -#~ msgstr "--no-signoff" - #, fuzzy #~ msgid "'git show-index'\n" #~ msgstr "git-show-index(1)" diff --git a/sources.txt b/sources.txt index eea65da4..5990ee89 100644 --- a/sources.txt +++ b/sources.txt @@ -2,6 +2,7 @@ blame-options.txt cmds-ancillaryinterrogators.txt cmds-ancillarymanipulators.txt cmds-foreignscminterface.txt +cmds-guide.txt cmds-mainporcelain.txt cmds-plumbinginterrogators.txt cmds-plumbingmanipulators.txt @@ -170,15 +171,20 @@ gitglossary.txt glossary-content.txt i18n.txt line-range-format.txt +line-range-options.txt merge-options.txt merge-strategies.txt mergetools-merge.txt +object-format-disclaimer.txt pretty-formats.txt pretty-options.txt pull-fetch-param.txt +ref-reachability-filters.txt revisions.txt +rev-list-description.txt rev-list-options.txt sequencer.txt +signoff-option.txt transfer-data-leaks.txt urls-remotes.txt urls.txt