Newer
Older
# French translations for Git Manual Pages.
# Copyright (C) 2017 Jean-Noël Avila <jn.avila@free.fr>
# This file is distributed under the same license as the Git package.
# Jean-Noël Avila <jn.avila@free.fr>, 2019.
msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"POT-Creation-Date: 2019-02-13 20:53+0100\n"
"Last-Translator: Adrien Ollier <adr.ollier@hotmail.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:646 en/git-instaweb.txt:45
#: en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126
#: en/git-status.txt:31 en/git-submodule.txt:258
#: en/blame-options.txt:4
msgid ""
"Show blank SHA-1 for boundary commits. This can also be controlled via the "
"`blame.blankboundary` config option."
#. type: Labeled list
#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:314
#: en/git-fsck.txt:38 en/git-rebase.txt:465
msgstr "--root"
#: en/blame-options.txt:8
msgid ""
"Do not treat root commits as boundaries. This can also be controlled via "
"the `blame.showRoot` config option."
#. type: Labeled list
#: en/blame-options.txt:9
msgstr "--show-stats"
#: en/blame-options.txt:11
msgid "Include additional statistics at the end of blame output."
#. type: Labeled list
#: en/blame-options.txt:12
#, no-wrap
msgid "-L <start>,<end>"
#. type: Labeled list
#: en/blame-options.txt:13
#, no-wrap
msgid "-L :<funcname>"
#: en/blame-options.txt:16
msgid ""
"Annotate only the given line range. May be specified multiple times. "
"Overlapping ranges are allowed."
#. type: Plain text
#: en/blame-options.txt:19
"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from"
" <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
#. type: Labeled list
#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:157
#: en/git-checkout.txt:185 en/git-clone.txt:44 en/git-config.txt:164
#: en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51
#: en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:92 en/git-var.txt:20
#. type: Plain text
#: en/blame-options.txt:24
msgid "Show long rev (Default: off)."
#. type: Labeled list
#: en/blame-options.txt:25 en/fetch-options.txt:137 en/git-branch.txt:185
#: en/git-cat-file.txt:36 en/git-checkout.txt:166 en/git-diff-tree.txt:39
#: en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47
#: en/git-svn.txt:312 en/rev-list-options.txt:974
#. type: Plain text
#: en/blame-options.txt:27
msgid "Show raw timestamp (Default: off)."
#. type: Labeled list
#: en/blame-options.txt:28
#, no-wrap
msgid "-S <revs-file>"
#. type: Plain text
#: en/blame-options.txt:30
msgid ""
"Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
#. type: Labeled list
#: en/blame-options.txt:31
#, no-wrap
msgid "--reverse <rev>..<rev>"
#. type: Plain text
#: en/blame-options.txt:38
"Walk history forward instead of backward. Instead of showing the revision in"
" which a line appeared, this shows the last revision in which a line has "
"existed. This requires a range of revision like START..END where the path to"
" blame exists in START. `git blame --reverse START` is taken as `git blame "
"--reverse START..HEAD` for convenience."
#. type: Labeled list
#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22
#: en/fetch-options.txt:91 en/git-add.txt:88 en/git-cat-file.txt:49
#: en/git-checkout.txt:253 en/git-commit.txt:70 en/git-cvsexportcommit.txt:41
#: en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63
#: en/git-rebase.txt:428 en/git-request-pull.txt:29 en/git-svn.txt:535
#: en/git-svn.txt:679 en/git.txt:99
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:113 en/git-push.txt:176
#: en/git-worktree.txt:179
#. type: Plain text
#: en/blame-options.txt:42
msgid "Show in a format designed for machine consumption."
#. type: Labeled list
#: en/blame-options.txt:43
msgid "--line-porcelain"
msgstr "--line-porcelain"
#. type: Plain text
#: en/blame-options.txt:47
msgid ""
"Show the porcelain format, but output commit information for each line, not "
"just the first time a commit is referenced. Implies --porcelain."
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
msgid "--incremental"
msgstr "--incremental"
#. type: Plain text
#: en/blame-options.txt:51
msgid ""
"Show the result incrementally in a format designed for machine consumption."
#. type: Labeled list
#: en/blame-options.txt:52 en/git-mailinfo.txt:62 en/pretty-options.txt:35
#, no-wrap
msgid "--encoding=<encoding>"
#. type: Plain text
#: en/blame-options.txt:58
msgid ""
"Specifies the encoding used to output author names and commit summaries. "
"Setting it to `none` makes blame output unconverted data. For more "
"information see the discussion about encoding in the linkgit:git-log[1] "
"manual page."
#. type: Labeled list
#: en/blame-options.txt:59
#, no-wrap
msgid "--contents <file>"
#. type: Plain text
#: en/blame-options.txt:65
msgid ""
"When <rev> is not specified, the command annotates the changes starting "
"backwards from the working tree copy. This flag makes the command pretend "
"as if the working tree copy has the contents of the named file (specify `-` "
"to make the command read from the standard input)."
#. type: Labeled list
#: en/blame-options.txt:66
msgid "--date <format>"
#. type: Plain text
#: en/blame-options.txt:72
msgid ""
"Specifies the format used to output dates. If --date is not provided, the "
"value of the blame.date config variable is used. If the blame.date config "
"variable is also not set, the iso format is used. For supported values, see "
"the discussion of the --date option at linkgit:git-log[1]."
#. type: Labeled list
#: en/blame-options.txt:73 en/git-checkout.txt:121 en/git-fsck.txt:92
msgid "--[no-]progress"
msgstr "--[no-]progress"
#. type: Plain text
#: en/blame-options.txt:79
msgid ""
"Progress status is reported on the standard error stream by default when it "
"is attached to a terminal. This flag enables progress reporting even if not "
"attached to a terminal. Can't use `--progress` together with `--porcelain` "
"or `--incremental`."
#. type: Labeled list
#: en/blame-options.txt:80
#, no-wrap
msgid "-M[<num>]"
#. type: Plain text
#: en/blame-options.txt:90
msgid ""
"Detect moved or copied lines within a file. When a commit moves or copies a "
"block of lines (e.g. the original file has A and then B, and the commit "
"changes it to B and then A), the traditional 'blame' algorithm notices only "
"half of the movement and typically blames the lines that were moved up (i.e."
" B) to the parent and assigns blame to the lines that were moved down (i.e. "
"A) to the child commit. With this option, both groups of lines are blamed "
"on the parent by running extra passes of inspection."
#. type: Plain text
#: en/blame-options.txt:95
msgid ""
"<num> is optional but it is the lower bound on the number of alphanumeric "
"characters that Git must detect as moving/copying within a file for it to "
"associate those lines with the parent commit. The default value is 20."
#. type: Labeled list
#: en/blame-options.txt:96
#, no-wrap
msgid "-C[<num>]"
#. type: Plain text
#: en/blame-options.txt:105
"In addition to `-M`, detect lines moved or copied from other files that were"
" modified in the same commit. This is useful when you reorganize your "
"program and move code around across files. When this option is given twice,"
" the command additionally looks for copies from other files in the commit "
"that creates the file. When this option is given three times, the command "
"additionally looks for copies from other files in any commit."
#. type: Plain text
#: en/blame-options.txt:112
msgid ""
"<num> is optional but it is the lower bound on the number of alphanumeric "
"characters that Git must detect as moving/copying between files for it to "
"associate those lines with the parent commit. And the default value is 40. "
"If there are more than one `-C` options given, the <num> argument of the "
"last `-C` will take effect."
#. type: Labeled list
#: en/blame-options.txt:113 en/git-archimport.txt:71 en/git-cvsimport.txt:184
#: en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
#. type: Plain text
#: en/blame-options.txt:114
msgid "Show help message."
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:232
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:3
msgid "Annotate file lines with commit information."
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:6
msgid "Show what revision and author last modified each line of a file."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#: en/cmds-ancillaryinterrogators.txt:9
msgid "Count unpacked number of objects and their disk consumption."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#: en/cmds-ancillaryinterrogators.txt:12
msgid "Show changes using common diff tools."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "Vérifie la connectivité et la validité des objets en base de données."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#: en/cmds-ancillaryinterrogators.txt:18
msgid "Display help information about Git."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#: en/cmds-ancillaryinterrogators.txt:21
msgid "Instantly browse your working repository in gitweb."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#: en/cmds-ancillaryinterrogators.txt:24
msgid "Show three-way merge without touching index."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#: en/cmds-ancillaryinterrogators.txt:27
msgid "Reuse recorded resolution of conflicted merges."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#: en/cmds-ancillaryinterrogators.txt:30
msgid "Show branches and their commits."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#: en/cmds-ancillaryinterrogators.txt:33
msgid "Check the GPG signature of commits."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#: en/cmds-ancillaryinterrogators.txt:36
msgid "Check the GPG signature of tags."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#: en/cmds-ancillaryinterrogators.txt:39
msgid "Show logs with difference each commit introduces."
#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#: en/cmds-ancillaryinterrogators.txt:42
msgid "Git web interface (web frontend to Git repositories)."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:3
msgid "Get and set repository or global options."
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1489
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:6
msgid "Git data exporter."
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:236
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:9
msgid "Backend for fast Git data importers."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:12
msgid "Rewrite branches."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:15
msgid "Run merge conflict resolution tools to resolve merge conflicts."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:18
msgid "Pack heads and tags for efficient repository access."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:21
msgid "Prune all unreachable objects from the object database."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:24
msgid "Manage reflog information."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:27
msgid "Manage set of tracked repositories."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:30
msgid "Pack unpacked objects in a repository."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:33
msgid "Create, list, delete refs to replace objects."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:3
msgid "Import a GNU Arch repository into Git."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
#. type: Plain text
#: en/cmds-foreignscminterface.txt:6
msgid "Export a single commit to a CVS checkout."
#: en/cmds-foreignscminterface.txt:7
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
#: en/cmds-foreignscminterface.txt:9
msgid "Salvage your data out of another SCM people love to hate."
#: en/cmds-foreignscminterface.txt:10
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
#: en/cmds-foreignscminterface.txt:12
msgid "A CVS server emulator for Git."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
#: en/cmds-foreignscminterface.txt:15
msgid "Send a collection of patches from stdin to an IMAP folder."
#: en/cmds-foreignscminterface.txt:16
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
#: en/cmds-foreignscminterface.txt:18
msgid "Import from and submit to Perforce repositories."
msgstr "Importer depuis et soumettre vers des dépôts Perforce."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
#: en/cmds-foreignscminterface.txt:21
msgid "Applies a quilt patchset onto the current branch."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
#: en/cmds-foreignscminterface.txt:24
msgid "Generates a summary of pending changes."
#: en/cmds-foreignscminterface.txt:25
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
#: en/cmds-foreignscminterface.txt:27
msgid "Send a collection of patches as emails."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
#: en/cmds-foreignscminterface.txt:30
msgid "Bidirectional operation between a Subversion repository and Git."
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
#: en/cmds-mainporcelain.txt:3
msgid "Add file contents to the index."
#: en/cmds-mainporcelain.txt:4
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
#: en/cmds-mainporcelain.txt:6
msgid "Apply a series of patches from a mailbox."
#: en/cmds-mainporcelain.txt:7
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
#: en/cmds-mainporcelain.txt:9
msgid "Create an archive of files from a named tree."
#: en/cmds-mainporcelain.txt:10
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
#: en/cmds-mainporcelain.txt:12
msgid "Use binary search to find the commit that introduced a bug."
#: en/cmds-mainporcelain.txt:13
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:15
msgid "List, create, or delete branches."
#: en/cmds-mainporcelain.txt:16
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
#: en/cmds-mainporcelain.txt:18
msgid "Move objects and refs by archive."
#: en/cmds-mainporcelain.txt:19
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
#: en/cmds-mainporcelain.txt:21
msgid "Switch branches or restore working tree files."
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
#: en/cmds-mainporcelain.txt:24
msgid "Apply the changes introduced by some existing commits."
#: en/cmds-mainporcelain.txt:25
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
#: en/cmds-mainporcelain.txt:27
msgid "Graphical alternative to git-commit."
#: en/cmds-mainporcelain.txt:28
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
#: en/cmds-mainporcelain.txt:30
msgid "Remove untracked files from the working tree."
msgstr "Supprimer des fichiers non-suivis depuis un arbre de travail."
#: en/cmds-mainporcelain.txt:31
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
#: en/cmds-mainporcelain.txt:33
msgid "Clone a repository into a new directory."
#: en/cmds-mainporcelain.txt:34
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
#: en/cmds-mainporcelain.txt:36
msgid "Record changes to the repository."
msgstr "Enregistrer les modifications dans le dépôt."
#: en/cmds-mainporcelain.txt:37
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
#: en/cmds-mainporcelain.txt:39
msgid "Give an object a human readable name based on an available ref."
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
#: en/cmds-mainporcelain.txt:42
msgid "Show changes between commits, commit and working tree, etc."
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
#: en/cmds-mainporcelain.txt:45
msgid "Download objects and refs from another repository."
msgstr "Télécharger les objets et références depuis un autre dépôt."
#: en/cmds-mainporcelain.txt:46
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
#: en/cmds-mainporcelain.txt:48
msgid "Prepare patches for e-mail submission."
#: en/cmds-mainporcelain.txt:49
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
#: en/cmds-mainporcelain.txt:51
msgid "Cleanup unnecessary files and optimize the local repository."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
#: en/cmds-mainporcelain.txt:54
msgid "Print lines matching a pattern."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
#: en/cmds-mainporcelain.txt:57
msgid "A portable graphical interface to Git."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
#: en/cmds-mainporcelain.txt:60
msgid "Create an empty Git repository or reinitialize an existing one."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
#: en/cmds-mainporcelain.txt:63
msgid "Show commit logs."
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
#: en/cmds-mainporcelain.txt:66
msgid "Join two or more development histories together."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
#: en/cmds-mainporcelain.txt:69
msgid "Move or rename a file, a directory, or a symlink."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
#: en/cmds-mainporcelain.txt:72
msgid "Add or inspect object notes."
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
#: en/cmds-mainporcelain.txt:75
msgid "Fetch from and integrate with another repository or a local branch."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
#: en/cmds-mainporcelain.txt:78
msgid "Update remote refs along with associated objects."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:79
#, ignore-same, no-wrap
msgid "linkgit:git-range-diff[1]"
msgstr "linkgit:git-range-diff[1]"
#: en/cmds-mainporcelain.txt:81
msgid "Compare two commit ranges (e.g. two versions of a branch)."
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"