diff --git a/en/gitglossary.txt b/en/gitglossary.txt new file mode 100644 index 00000000..571f640f --- /dev/null +++ b/en/gitglossary.txt @@ -0,0 +1,27 @@ +gitglossary(7) +============== + +NAME +---- +gitglossary - A Git Glossary + +SYNOPSIS +-------- +* + +DESCRIPTION +----------- + +include::glossary-content.txt[] + +SEE ALSO +-------- +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +linkgit:giteveryday[7], +link:user-manual.html[The Git User's Manual] + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/en/glossary-content.txt b/en/glossary-content.txt new file mode 100644 index 00000000..090c8883 --- /dev/null +++ b/en/glossary-content.txt @@ -0,0 +1,671 @@ +[[def_alternate_object_database]]alternate object database:: + Via the alternates mechanism, a <> + can inherit part of its <> + from another object database, which is called an "alternate". + +[[def_bare_repository]]bare repository:: + A bare repository is normally an appropriately + named <> with a `.git` suffix that does not + have a locally checked-out copy of any of the files under + revision control. That is, all of the Git + administrative and control files that would normally be present in the + hidden `.git` sub-directory are directly present in the + `repository.git` directory instead, + and no other files are present and checked out. Usually publishers of + public repositories make bare repositories available. + +[[def_blob_object]]blob object:: + Untyped <>, e.g. the contents of a file. + +[[def_branch]]branch:: + A "branch" is an active line of development. The most recent + <> on a branch is referred to as the tip of + that branch. The tip of the branch is referenced by a branch + <>, which moves forward as additional development + is done on the branch. A single Git + <> can track an arbitrary number of + branches, but your <> is + associated with just one of them (the "current" or "checked out" + branch), and <> points to that branch. + +[[def_cache]]cache:: + Obsolete for: <>. + +[[def_chain]]chain:: + A list of objects, where each <> in the list contains + a reference to its successor (for example, the successor of a + <> could be one of its <>). + +[[def_changeset]]changeset:: + BitKeeper/cvsps speak for "<>". Since Git does not + store changes, but states, it really does not make sense to use the term + "changesets" with Git. + +[[def_checkout]]checkout:: + The action of updating all or part of the + <> with a <> + or <> from the + <>, and updating the + <> and <> if the whole working tree has + been pointed at a new <>. + +[[def_cherry-picking]]cherry-picking:: + In <> jargon, "cherry pick" means to choose a subset of + changes out of a series of changes (typically commits) and record them + as a new series of changes on top of a different codebase. In Git, this is + performed by the "git cherry-pick" command to extract the change introduced + by an existing <> and to record it based on the tip + of the current <> as a new commit. + +[[def_clean]]clean:: + A <> is clean, if it + corresponds to the <> referenced by the current + <>. Also see "<>". + +[[def_commit]]commit:: + As a noun: A single point in the + Git history; the entire history of a project is represented as a + set of interrelated commits. The word "commit" is often + used by Git in the same places other revision control systems + use the words "revision" or "version". Also used as a short + hand for <>. ++ +As a verb: The action of storing a new snapshot of the project's +state in the Git history, by creating a new commit representing the current +state of the <> and advancing <> +to point at the new commit. + +[[def_commit_object]]commit object:: + An <> which contains the information about a + particular <>, such as <>, committer, + author, date and the <> which corresponds + to the top <> of the stored + revision. + +[[def_commit-ish]]commit-ish (also committish):: + A <> or an + <> that can be recursively dereferenced to + a commit object. + The following are all commit-ishes: + a commit object, + a <> that points to a commit + object, + a tag object that points to a tag object that points to a + commit object, + etc. + +[[def_core_git]]core Git:: + Fundamental data structures and utilities of Git. Exposes only limited + source code management tools. + +[[def_DAG]]DAG:: + Directed acyclic graph. The <> form a + directed acyclic graph, because they have parents (directed), and the + graph of commit objects is acyclic (there is no <> + which begins and ends with the same <>). + +[[def_dangling_object]]dangling object:: + An <> which is not + <> even from other unreachable objects; a + dangling object has no references to it from any + reference or <> in the <>. + +[[def_detached_HEAD]]detached HEAD:: + Normally the <> stores the name of a + <>, and commands that operate on the + history HEAD represents operate on the history leading to the + tip of the branch the HEAD points at. However, Git also + allows you to <> an arbitrary + <> that isn't necessarily the tip of any + particular branch. The HEAD in such a state is called + "detached". ++ +Note that commands that operate on the history of the current branch +(e.g. `git commit` to build a new history on top of it) still work +while the HEAD is detached. They update the HEAD to point at the tip +of the updated history without affecting any branch. Commands that +update or inquire information _about_ the current branch (e.g. `git +branch --set-upstream-to` that sets what remote-tracking branch the +current branch integrates with) obviously do not work, as there is no +(real) current branch to ask about in this state. + +[[def_directory]]directory:: + The list you get with "ls" :-) + +[[def_dirty]]dirty:: + A <> is said to be "dirty" if + it contains modifications which have not been <> to the current + <>. + +[[def_evil_merge]]evil merge:: + An evil merge is a <> that introduces changes that + do not appear in any <>. + +[[def_fast_forward]]fast-forward:: + A fast-forward is a special type of <> where you have a + <> and you are "merging" another + <>'s changes that happen to be a descendant of what + you have. In such a case, you do not make a new <> + <> but instead just update to his + revision. This will happen frequently on a + <> of a remote + <>. + +[[def_fetch]]fetch:: + Fetching a <> means to get the + branch's <> from a remote + <>, to find out which objects are + missing from the local <>, + and to get them, too. See also linkgit:git-fetch[1]. + +[[def_file_system]]file system:: + Linus Torvalds originally designed Git to be a user space file system, + i.e. the infrastructure to hold files and directories. That ensured the + efficiency and speed of Git. + +[[def_git_archive]]Git archive:: + Synonym for <> (for arch people). + +[[def_gitfile]]gitfile:: + A plain file `.git` at the root of a working tree that + points at the directory that is the real repository. + +[[def_grafts]]grafts:: + Grafts enables two otherwise different lines of development to be joined + together by recording fake ancestry information for commits. This way + you can make Git pretend the set of <> a <> has + is different from what was recorded when the commit was + created. Configured via the `.git/info/grafts` file. ++ +Note that the grafts mechanism is outdated and can lead to problems +transferring objects between repositories; see linkgit:git-replace[1] +for a more flexible and robust system to do the same thing. + +[[def_hash]]hash:: + In Git's context, synonym for <>. + +[[def_head]]head:: + A <> to the <> at the tip of a + <>. Heads are stored in a file in + `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See + linkgit:git-pack-refs[1].) + +[[def_HEAD]]HEAD:: + The current <>. In more detail: Your <> is normally derived from the state of the tree + referred to by HEAD. HEAD is a reference to one of the + <> in your repository, except when using a + <>, in which case it directly + references an arbitrary commit. + +[[def_head_ref]]head ref:: + A synonym for <>. + +[[def_hook]]hook:: + During the normal execution of several Git commands, call-outs are made + to optional scripts that allow a developer to add functionality or + checking. Typically, the hooks allow for a command to be pre-verified + and potentially aborted, and allow for a post-notification after the + operation is done. The hook scripts are found in the + `$GIT_DIR/hooks/` directory, and are enabled by simply + removing the `.sample` suffix from the filename. In earlier versions + of Git you had to make them executable. + +[[def_index]]index:: + A collection of files with stat information, whose contents are stored + as objects. The index is a stored version of your + <>. Truth be told, it can also contain a second, and even + a third version of a working tree, which are used + when <>. + +[[def_index_entry]]index entry:: + The information regarding a particular file, stored in the + <>. An index entry can be unmerged, if a + <> was started, but not yet finished (i.e. if + the index contains multiple versions of that file). + +[[def_master]]master:: + The default development <>. Whenever you + create a Git <>, a branch named + "master" is created, and becomes the active branch. In most + cases, this contains the local development, though that is + purely by convention and is not required. + +[[def_merge]]merge:: + As a verb: To bring the contents of another + <> (possibly from an external + <>) into the current branch. In the + case where the merged-in branch is from a different repository, + this is done by first <> the remote branch + and then merging the result into the current branch. This + combination of fetch and merge operations is called a + <>. Merging is performed by an automatic process + that identifies changes made since the branches diverged, and + then applies all those changes together. In cases where changes + conflict, manual intervention may be required to complete the + merge. ++ +As a noun: unless it is a <>, a +successful merge results in the creation of a new <> +representing the result of the merge, and having as +<> the tips of the merged <>. +This commit is referred to as a "merge commit", or sometimes just a +"merge". + +[[def_object]]object:: + The unit of storage in Git. It is uniquely identified by the + <> of its contents. Consequently, an + object cannot be changed. + +[[def_object_database]]object database:: + Stores a set of "objects", and an individual <> is + identified by its <>. The objects usually + live in `$GIT_DIR/objects/`. + +[[def_object_identifier]]object identifier:: + Synonym for <>. + +[[def_object_name]]object name:: + The unique identifier of an <>. The + object name is usually represented by a 40 character + hexadecimal string. Also colloquially called <>. + +[[def_object_type]]object type:: + One of the identifiers "<>", + "<>", "<>" or + "<>" describing the type of an + <>. + +[[def_octopus]]octopus:: + To <> more than two <>. + +[[def_origin]]origin:: + The default upstream <>. Most projects have + at least one upstream project which they track. By default + 'origin' is used for that purpose. New upstream updates + will be fetched into <> named + origin/name-of-upstream-branch, which you can see using + `git branch -r`. + +[[def_overlay]]overlay:: + Only update and add files to the working directory, but don't + delete them, similar to how 'cp -R' would update the contents + in the destination directory. This is the default mode in a + <> when checking out files from the + <> or a <>. In + contrast, no-overlay mode also deletes tracked files not + present in the source, similar to 'rsync --delete'. + +[[def_pack]]pack:: + A set of objects which have been compressed into one file (to save space + or to transmit them efficiently). + +[[def_pack_index]]pack index:: + The list of identifiers, and other information, of the objects in a + <>, to assist in efficiently accessing the contents of a + pack. + +[[def_pathspec]]pathspec:: + Pattern used to limit paths in Git commands. ++ +Pathspecs are used on the command line of "git ls-files", "git +ls-tree", "git add", "git grep", "git diff", "git checkout", +and many other commands to +limit the scope of operations to some subset of the tree or +worktree. See the documentation of each command for whether +paths are relative to the current directory or toplevel. The +pathspec syntax is as follows: ++ +-- + +* any path matches itself +* the pathspec up to the last slash represents a + directory prefix. The scope of that pathspec is + limited to that subtree. +* the rest of the pathspec is a pattern for the remainder + of the pathname. Paths relative to the directory + prefix will be matched against that pattern using fnmatch(3); + in particular, '*' and '?' _can_ match directory separators. + +-- ++ +For example, Documentation/*.jpg will match all .jpg files +in the Documentation subtree, +including Documentation/chapter_1/figure_1.jpg. ++ +A pathspec that begins with a colon `:` has special meaning. In the +short form, the leading colon `:` is followed by zero or more "magic +signature" letters (which optionally is terminated by another colon `:`), +and the remainder is the pattern to match against the path. +The "magic signature" consists of ASCII symbols that are neither +alphanumeric, glob, regex special characters nor colon. +The optional colon that terminates the "magic signature" can be +omitted if the pattern begins with a character that does not belong to +"magic signature" symbol set and is not a colon. ++ +In the long form, the leading colon `:` is followed by an open +parenthesis `(`, a comma-separated list of zero or more "magic words", +and a close parentheses `)`, and the remainder is the pattern to match +against the path. ++ +A pathspec with only a colon means "there is no pathspec". This form +should not be combined with other pathspec. ++ +-- +top;; + The magic word `top` (magic signature: `/`) makes the pattern + match from the root of the working tree, even when you are + running the command from inside a subdirectory. + +literal;; + Wildcards in the pattern such as `*` or `?` are treated + as literal characters. + +icase;; + Case insensitive match. + +glob;; + Git treats the pattern as a shell glob suitable for + consumption by fnmatch(3) with the FNM_PATHNAME flag: + wildcards in the pattern will not match a / in the pathname. + For example, "Documentation/{asterisk}.html" matches + "Documentation/git.html" but not "Documentation/ppc/ppc.html" + or "tools/perf/Documentation/perf.html". ++ +Two consecutive asterisks ("`**`") in patterns matched against +full pathname may have special meaning: + + - A leading "`**`" followed by a slash means match in all + directories. For example, "`**/foo`" matches file or directory + "`foo`" anywhere, the same as pattern "`foo`". "`**/foo/bar`" + matches file or directory "`bar`" anywhere that is directly + under directory "`foo`". + + - A trailing "`/**`" matches everything inside. For example, + "`abc/**`" matches all files inside directory "abc", relative + to the location of the `.gitignore` file, with infinite depth. + + - A slash followed by two consecutive asterisks then a slash + matches zero or more directories. For example, "`a/**/b`" + matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on. + + - Other consecutive asterisks are considered invalid. ++ +Glob magic is incompatible with literal magic. + +attr;; +After `attr:` comes a space separated list of "attribute +requirements", all of which must be met in order for the +path to be considered a match; this is in addition to the +usual non-magic pathspec pattern matching. +See linkgit:gitattributes[5]. ++ +Each of the attribute requirements for the path takes one of +these forms: + +- "`ATTR`" requires that the attribute `ATTR` be set. + +- "`-ATTR`" requires that the attribute `ATTR` be unset. + +- "`ATTR=VALUE`" requires that the attribute `ATTR` be + set to the string `VALUE`. + +- "`!ATTR`" requires that the attribute `ATTR` be + unspecified. ++ +Note that when matching against a tree object, attributes are still +obtained from working tree, not from the given tree object. + +exclude;; + After a path matches any non-exclude pathspec, it will be run + through all exclude pathspecs (magic signature: `!` or its + synonym `^`). If it matches, the path is ignored. When there + is no non-exclude pathspec, the exclusion is applied to the + result set as if invoked without any pathspec. +-- + +[[def_parent]]parent:: + A <> contains a (possibly empty) list + of the logical predecessor(s) in the line of development, i.e. its + parents. + +[[def_pickaxe]]pickaxe:: + The term <> refers to an option to the diffcore + routines that help select changes that add or delete a given text + string. With the `--pickaxe-all` option, it can be used to view the full + <> that introduced or removed, say, a + particular line of text. See linkgit:git-diff[1]. + +[[def_plumbing]]plumbing:: + Cute name for <>. + +[[def_porcelain]]porcelain:: + Cute name for programs and program suites depending on + <>, presenting a high level access to + core Git. Porcelains expose more of a <> + interface than the <>. + +[[def_per_worktree_ref]]per-worktree ref:: + Refs that are per-<>, rather than + global. This is presently only <> and any refs + that start with `refs/bisect/`, but might later include other + unusual refs. + +[[def_pseudoref]]pseudoref:: + Pseudorefs are a class of files under `$GIT_DIR` which behave + like refs for the purposes of rev-parse, but which are treated + specially by git. Pseudorefs both have names that are all-caps, + and always start with a line consisting of a + <> followed by whitespace. So, HEAD is not a + pseudoref, because it is sometimes a symbolic ref. They might + optionally contain some additional data. `MERGE_HEAD` and + `CHERRY_PICK_HEAD` are examples. Unlike + <>, these files cannot + be symbolic refs, and never have reflogs. They also cannot be + updated through the normal ref update machinery. Instead, + they are updated by directly writing to the files. However, + they can be read as if they were refs, so `git rev-parse + MERGE_HEAD` will work. + +[[def_pull]]pull:: + Pulling a <> means to <> it and + <> it. See also linkgit:git-pull[1]. + +[[def_push]]push:: + Pushing a <> means to get the branch's + <> from a remote <>, + find out if it is an ancestor to the branch's local + head ref, and in that case, putting all + objects, which are <> from the local + head ref, and which are missing from the remote + repository, into the remote + <>, and updating the remote + head ref. If the remote <> is not an + ancestor to the local head, the push fails. + +[[def_reachable]]reachable:: + All of the ancestors of a given <> are said to be + "reachable" from that commit. More + generally, one <> is reachable from + another if we can reach the one from the other by a <> + that follows <> to whatever they tag, + <> to their parents or trees, and + <> to the trees or <> + that they contain. + +[[def_rebase]]rebase:: + To reapply a series of changes from a <> to a + different base, and reset the <> of that branch + to the result. + +[[def_ref]]ref:: + A name that begins with `refs/` (e.g. `refs/heads/master`) + that points to an <> or another + ref (the latter is called a <>). + For convenience, a ref can sometimes be abbreviated when used + as an argument to a Git command; see linkgit:gitrevisions[7] + for details. + Refs are stored in the <>. ++ +The ref namespace is hierarchical. +Different subhierarchies are used for different purposes (e.g. the +`refs/heads/` hierarchy is used to represent local branches). ++ +There are a few special-purpose refs that do not begin with `refs/`. +The most notable example is `HEAD`. + +[[def_reflog]]reflog:: + A reflog shows the local "history" of a ref. In other words, + it can tell you what the 3rd last revision in _this_ repository + was, and what was the current state in _this_ repository, + yesterday 9:14pm. See linkgit:git-reflog[1] for details. + +[[def_refspec]]refspec:: + A "refspec" is used by <> and + <> to describe the mapping between remote + <> and local ref. + +[[def_remote]]remote repository:: + A <> which is used to track the same + project but resides somewhere else. To communicate with remotes, + see <> or <>. + +[[def_remote_tracking_branch]]remote-tracking branch:: + A <> that is used to follow changes from another + <>. It typically looks like + 'refs/remotes/foo/bar' (indicating that it tracks a branch named + 'bar' in a remote named 'foo'), and matches the right-hand-side of + a configured fetch <>. A remote-tracking + branch should not contain direct modifications or have local + commits made to it. + +[[def_repository]]repository:: + A collection of <> together with an + <> containing all objects + which are <> from the refs, possibly + accompanied by meta data from one or more <>. A + repository can share an object database with other repositories + via <>. + +[[def_resolve]]resolve:: + The action of fixing up manually what a failed automatic + <> left behind. + +[[def_revision]]revision:: + Synonym for <> (the noun). + +[[def_rewind]]rewind:: + To throw away part of the development, i.e. to assign the + <> to an earlier <>. + +[[def_SCM]]SCM:: + Source code management (tool). + +[[def_SHA1]]SHA-1:: + "Secure Hash Algorithm 1"; a cryptographic hash function. + In the context of Git used as a synonym for <>. + +[[def_shallow_clone]]shallow clone:: + Mostly a synonym to <> + but the phrase makes it more explicit that it was created by + running `git clone --depth=...` command. + +[[def_shallow_repository]]shallow repository:: + A shallow <> has an incomplete + history some of whose <> have <> cauterized away (in other + words, Git is told to pretend that these commits do not have the + parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the + recent history of a project even though the real history recorded in the + upstream is much larger. A shallow repository + is created by giving the `--depth` option to linkgit:git-clone[1], and + its history can be later deepened with linkgit:git-fetch[1]. + +[[def_stash]]stash entry:: + An <> used to temporarily store the contents of a + <> working directory and the index for future reuse. + +[[def_submodule]]submodule:: + A <> that holds the history of a + separate project inside another repository (the latter of + which is called <>). + +[[def_superproject]]superproject:: + A <> that references repositories + of other projects in its working tree as <>. + The superproject knows about the names of (but does not hold + copies of) commit objects of the contained submodules. + +[[def_symref]]symref:: + Symbolic reference: instead of containing the <> + id itself, it is of the format 'ref: refs/some/thing' and when + referenced, it recursively dereferences to this reference. + '<>' is a prime example of a symref. Symbolic + references are manipulated with the linkgit:git-symbolic-ref[1] + command. + +[[def_tag]]tag:: + A <> under `refs/tags/` namespace that points to an + object of an arbitrary type (typically a tag points to either a + <> or a <>). + In contrast to a <>, a tag is not updated by + the `commit` command. A Git tag has nothing to do with a Lisp + tag (which would be called an <> + in Git's context). A tag is most typically used to mark a particular + point in the commit ancestry <>. + +[[def_tag_object]]tag object:: + An <> containing a <> pointing to + another object, which can contain a message just like a + <>. It can also contain a (PGP) + signature, in which case it is called a "signed tag object". + +[[def_topic_branch]]topic branch:: + A regular Git <> that is used by a developer to + identify a conceptual line of development. Since branches are very easy + and inexpensive, it is often desirable to have several small branches + that each contain very well defined concepts or small incremental yet + related changes. + +[[def_tree]]tree:: + Either a <>, or a <> together with the dependent <> and tree objects + (i.e. a stored representation of a working tree). + +[[def_tree_object]]tree object:: + An <> containing a list of file names and modes along + with refs to the associated blob and/or tree objects. A + <> is equivalent to a <>. + +[[def_tree-ish]]tree-ish (also treeish):: + A <> or an <> + that can be recursively dereferenced to a tree object. + Dereferencing a <> yields the + tree object corresponding to the <>'s + top <>. + The following are all tree-ishes: + a <>, + a tree object, + a <> that points to a tree object, + a tag object that points to a tag object that points to a tree + object, + etc. + +[[def_unmerged_index]]unmerged index:: + An <> which contains unmerged + <>. + +[[def_unreachable_object]]unreachable object:: + An <> which is not <> from a + <>, <>, or any other reference. + +[[def_upstream_branch]]upstream branch:: + The default <> that is merged into the branch in + question (or the branch in question is rebased onto). It is configured + via branch..remote and branch..merge. If the upstream branch + of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'". + +[[def_working_tree]]working tree:: + The tree of actual checked out files. The working tree normally + contains the contents of the <> commit's tree, + plus any local changes that you have made but not yet committed. diff --git a/po/documentation.de.po b/po/documentation.de.po index 267b2c2b..7f53eaab 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -10,14 +10,14 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-10-22 09:53+0000\n" "Last-Translator: villabunterkunt \n" "Language-Team: Matthias Aßhauer \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.9.1-dev\n" @@ -5676,7 +5676,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "NAME" @@ -5688,7 +5688,7 @@ msgid "git-add - Add file contents to the index" msgstr "git-add - Füge Dateiinhalte 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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "ÜBERSICHT" @@ -5714,7 +5714,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "BESCHREIBUNG" @@ -6416,7 +6416,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 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" @@ -6428,13 +6428,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 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" @@ -56357,6 +56357,1264 @@ msgstr "Normalerweise stellt 'git write-tree' sicher, dass die durch das Verzeic msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "Erzeugt ein Baumobjekt, welches das Unterverzeichnis `` darstellt. Das kann verwendet werden, um das Baumobjekt für ein Unterprojekt in jenem Unterverzeichnis zu schreiben." +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, fuzzy, priority:100 +#| msgid "gitglossary - A GIT Glossary" +msgid "gitglossary - A Git Glossary" +msgstr "gitglossary - Ein GIT-Glossar" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, fuzzy, no-wrap, priority:100 +#| msgid "*\n" +msgid "*\n" +msgstr "*\n" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], link:everyday.html[Tägliches git], link:user-manual.html[The Git User's Manual]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, fuzzy, no-wrap, priority:100 +#| msgid "--branch " +msgid "[[def_branch]]branch" +msgstr "--branch " + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, fuzzy, no-wrap, priority:100 +#| msgid "--subdirectory-filter " +msgid "[[def_directory]]directory" +msgstr "--subdirectory-filter " + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +msgid "glob" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "Includes" +msgid "exclude" +msgstr "Dateieinbettungen" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, fuzzy, no-wrap, priority:100 +#| msgid "List references in a remote repository." +msgid "[[def_remote]]remote repository" +msgstr "Referenzen in einem Remote-Repository auflisten." + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, fuzzy, no-wrap, priority:100 +#| msgid "List or delete (if used with -d) the remote-tracking branches." +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "Auflisten oder Löschen (wenn die '-d' Option gleichzeitig verwendet wird) der Referenzen auf fernen Entwicklungszweige (remote-tracking branches)." + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -61459,6 +62717,7 @@ msgstr "" #~ msgid "create " #~ msgstr "create " +#, ignore-ellipsis #~ msgid "'git checkout' [] [--] ..." #~ msgstr "'git checkout' [] [--] ..." @@ -61479,6 +62738,7 @@ msgstr "" #~ msgid "$ git config --global gc.auto 0\n" #~ msgstr "% git config --get-all core.gitproxy\n" +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" @@ -61497,144 +62757,190 @@ msgstr "" #~ msgid "detachedHead" #~ msgstr "Detached HEAD" +#, ignore-same #~ msgid "core.fileMode" #~ msgstr "core.fileMode" +#, ignore-same #~ msgid "core.hideDotFiles" #~ msgstr "core.hideDotFiles" +#, ignore-same #~ msgid "core.ignoreCase" #~ msgstr "core.ignoreCase" +#, ignore-same #~ msgid "core.precomposeUnicode" #~ msgstr "core.precomposeUnicode" +#, ignore-same #~ msgid "core.protectHFS" #~ msgstr "core.protectHFS" +#, ignore-same #~ msgid "core.protectNTFS" #~ msgstr "core.protectNTFS" +#, ignore-same #~ msgid "core.trustctime" #~ msgstr "core.trustctime" +#, ignore-same #~ msgid "core.splitIndex" #~ msgstr "core.splitIndex" +#, ignore-same #~ msgid "core.checkStat" #~ msgstr "core.checkStat" +#, ignore-same #~ msgid "core.quotePath" #~ msgstr "core.quotePath" +#, ignore-same #~ msgid "core.eol" #~ msgstr "core.eol" +#, ignore-same #~ msgid "core.safecrlf" #~ msgstr "core.safecrlf" +#, ignore-same #~ msgid "core.autocrlf" #~ msgstr "core.autocrlf" +#, ignore-same #~ msgid "core.symlinks" #~ msgstr "core.symlinks" +#, ignore-same #~ msgid "core.gitProxy" #~ msgstr "core.gitProxy" +#, ignore-same #~ msgid "core.sshCommand" #~ msgstr "core.sshCommand" +#, ignore-same #~ msgid "core.ignoreStat" #~ msgstr "core.ignoreStat" +#, ignore-same #~ msgid "core.preferSymlinkRefs" #~ msgstr "core.preferSymlinkRefs" +#, ignore-same #~ msgid "core.bare" #~ msgstr "core.bare" +#, ignore-same #~ msgid "core.worktree" #~ msgstr "core.worktree" +#, ignore-same #~ msgid "core.logAllRefUpdates" #~ msgstr "core.logAllRefUpdates" +#, ignore-same #~ msgid "core.repositoryFormatVersion" #~ msgstr "core.repositoryFormatVersion" +#, ignore-same #~ msgid "core.sharedRepository" #~ msgstr "core.sharedRepository" +#, ignore-same #~ msgid "core.warnAmbiguousRefs" #~ msgstr "core.warnAmbiguousRefs" +#, ignore-same #~ msgid "core.compression" #~ msgstr "core.compression" +#, ignore-same #~ msgid "core.looseCompression" #~ msgstr "core.looseCompression" +#, ignore-same #~ msgid "core.packedGitWindowSize" #~ msgstr "core.packedGitWindowSize" +#, ignore-same #~ msgid "core.packedGitLimit" #~ msgstr "core.packedGitLimit" +#, ignore-same #~ msgid "core.deltaBaseCacheLimit" #~ msgstr "core.deltaBaseCacheLimit" +#, ignore-same #~ msgid "core.bigFileThreshold" #~ msgstr "core.bigFileThreshold" +#, ignore-same #~ msgid "core.excludesFile" #~ msgstr "core.excludesFile" +#, ignore-same #~ msgid "core.askPass" #~ msgstr "core.askPass" +#, ignore-same #~ msgid "core.attributesFile" #~ msgstr "core.attributesFile" +#, ignore-same #~ msgid "core.hooksPath" #~ msgstr "core.hooksPath" +#, ignore-same #~ msgid "core.editor" #~ msgstr "core.editor" +#, ignore-same #~ msgid "core.commentChar" #~ msgstr "core.commentChar" +#, ignore-same #~ msgid "core.packedRefsTimeout" #~ msgstr "core.packedRefsTimeout" +#, ignore-same #~ msgid "core.pager" #~ msgstr "core.pager" +#, ignore-same #~ msgid "core.whitespace" #~ msgstr "core.whitespace" +#, ignore-same #~ msgid "core.fsyncObjectFiles" #~ msgstr "core.fsyncObjectFiles" +#, ignore-same #~ msgid "core.preloadIndex" #~ msgstr "core.preloadIndex" +#, ignore-same #~ msgid "core.createObject" #~ msgstr "core.createObject" +#, ignore-same #~ msgid "core.sparseCheckout" #~ msgstr "core.sparseCheckout" +#, ignore-same #~ msgid "core.abbrev" #~ msgstr "core.abbrev" #~ msgid "add.ignoreErrors" #~ msgstr "--ignore-errors" +#, ignore-same #~ msgid "branch.autoSetupMerge" #~ msgstr "branch.autoSetupMerge" +#, ignore-same #~ msgid "branch.autoSetupRebase" #~ msgstr "branch.autoSetupRebase" @@ -61650,474 +62956,630 @@ msgstr "" #~ msgid "branch..rebase" #~ msgstr "" +#, ignore-same #~ msgid "color.branch" #~ msgstr "color.branch" #~ msgid "color.branch." #~ msgstr "" +#, ignore-same #~ msgid "color.diff" #~ msgstr "color.diff" +#, ignore-same #~ msgid "color.grep" #~ msgstr "color.grep" +#, ignore-same #~ msgid "`context`" #~ msgstr "`context`" +#, ignore-same #~ msgid "`filename`" #~ msgstr "`filename`" +#, ignore-same #~ msgid "`function`" #~ msgstr "`function`" +#, ignore-same #~ msgid "`linenumber`" #~ msgstr "`linenumber`" +#, ignore-same #~ msgid "`match`" #~ msgstr "`match`" +#, ignore-same #~ msgid "`matchContext`" #~ msgstr "`matchContext`" +#, ignore-same #~ msgid "`matchSelected`" #~ msgstr "`matchSelected`" +#, ignore-same #~ msgid "`selected`" #~ msgstr "`selected`" +#, ignore-same #~ msgid "`separator`" #~ msgstr "`separator`" +#, ignore-same #~ msgid "color.interactive" #~ msgstr "color.interactive" +#, ignore-same #~ msgid "color.pager" #~ msgstr "color.pager" +#, ignore-same #~ msgid "color.showBranch" #~ msgstr "color.showBranch" +#, ignore-same #~ msgid "color.status" #~ msgstr "color.status" +#, ignore-same #~ msgid "color.ui" #~ msgstr "color.ui" +#, ignore-same #~ msgid "column.ui" #~ msgstr "column.ui" +#, ignore-same #~ msgid "`always`" #~ msgstr "`always`" +#, ignore-same #~ msgid "`never`" #~ msgstr "`never`" +#, ignore-same #~ msgid "`auto`" #~ msgstr "`auto`" +#, ignore-same #~ msgid "`row`" #~ msgstr "`row`" +#, ignore-same #~ msgid "`plain`" #~ msgstr "`plain`" +#, ignore-same #~ msgid "`dense`" #~ msgstr "`dense`" +#, ignore-same #~ msgid "`nodense`" #~ msgstr "`nodense`" +#, ignore-same #~ msgid "column.clean" #~ msgstr "column.clean" +#, ignore-same #~ msgid "column.status" #~ msgstr "column.status" +#, ignore-same #~ msgid "column.tag" #~ msgstr "column.tag" +#, ignore-same #~ msgid "commit.cleanup" #~ msgstr "commit.cleanup" +#, ignore-same #~ msgid "commit.gpgSign" #~ msgstr "commit.gpgSign" +#, ignore-same #~ msgid "commit.status" #~ msgstr "commit.status" +#, ignore-same #~ msgid "commit.template" #~ msgstr "commit.template" +#, ignore-same #~ msgid "commit.verbose" #~ msgstr "commit.verbose" +#, ignore-same #~ msgid "credential.helper" #~ msgstr "credential.helper" +#, ignore-same #~ msgid "credential.useHttpPath" #~ msgstr "credential.useHttpPath" +#, ignore-same #~ msgid "credential.username" #~ msgstr "credential.username" +#, ignore-same #~ msgid "fetch.recurseSubmodules" #~ msgstr "fetch.recurseSubmodules" +#, ignore-same #~ msgid "fetch.fsckObjects" #~ msgstr "fetch.fsckObjects" +#, ignore-same #~ msgid "fetch.unpackLimit" #~ msgstr "fetch.unpackLimit" +#, ignore-same #~ msgid "fetch.prune" #~ msgstr "fetch.prune" +#, ignore-same #~ msgid "fetch.output" #~ msgstr "fetch.output" +#, ignore-same #~ msgid "format.attach" #~ msgstr "format.attach" +#, ignore-same #~ msgid "format.from" #~ msgstr "format.from" +#, ignore-same #~ msgid "format.numbered" #~ msgstr "format.numbered" +#, ignore-same #~ msgid "format.to" #~ msgstr "format.to" +#, ignore-same #~ msgid "format.cc" #~ msgstr "format.cc" +#, ignore-same #~ msgid "format.subjectPrefix" #~ msgstr "format.subjectPrefix" +#, ignore-same #~ msgid "format.signature" #~ msgstr "format.signature" +#, ignore-same #~ msgid "format.signatureFile" #~ msgstr "format.signatureFile" +#, ignore-same #~ msgid "format.suffix" #~ msgstr "format.suffix" +#, ignore-same #~ msgid "format.thread" #~ msgstr "format.thread" +#, ignore-same #~ msgid "format.signOff" #~ msgstr "format.signOff" +#, ignore-same #~ msgid "format.coverLetter" #~ msgstr "format.coverLetter" +#, ignore-same #~ msgid "format.outputDirectory" #~ msgstr "format.outputDirectory" +#, ignore-same #~ msgid "format.useAutoBase" #~ msgstr "format.useAutoBase" +#, ignore-same #~ msgid "gitweb.category" #~ msgstr "gitweb.category" +#, ignore-same #~ msgid "gitweb.description" #~ msgstr "gitweb.description" +#, ignore-same #~ msgid "gitweb.owner" #~ msgstr "gitweb.owner" +#, ignore-same #~ msgid "gitweb.url" #~ msgstr "gitweb.url" +#, ignore-same #~ msgid "gitweb.avatar" #~ msgstr "gitweb.avatar" +#, ignore-same #~ msgid "gitweb.blame" #~ msgstr "gitweb.blame" +#, ignore-same #~ msgid "gitweb.grep" #~ msgstr "gitweb.grep" +#, ignore-same #~ msgid "gitweb.highlight" #~ msgstr "gitweb.highlight" +#, ignore-same #~ msgid "gitweb.patches" #~ msgstr "gitweb.patches" +#, ignore-same #~ msgid "gitweb.pickaxe" #~ msgstr "gitweb.pickaxe" +#, ignore-same #~ msgid "gitweb.remote_heads" #~ msgstr "gitweb.remote_heads" +#, ignore-same #~ msgid "gitweb.showSizes" #~ msgstr "gitweb.showSizes" +#, ignore-same #~ msgid "gitweb.snapshot" #~ msgstr "gitweb.snapshot" +#, ignore-same #~ msgid "gui.commitMsgWidth" #~ msgstr "gui.commitMsgWidth" +#, ignore-same #~ msgid "gui.diffContext" #~ msgstr "gui.diffContext" +#, ignore-same #~ msgid "gui.displayUntracked" #~ msgstr "gui.displayUntracked" +#, ignore-same #~ msgid "gui.matchTrackingBranch" #~ msgstr "gui.matchTrackingBranch" +#, ignore-same #~ msgid "gui.newBranchTemplate" #~ msgstr "gui.newBranchTemplate" +#, ignore-same #~ msgid "gui.pruneDuringFetch" #~ msgstr "gui.pruneDuringFetch" +#, ignore-same #~ msgid "gui.trustmtime" #~ msgstr "gui.trustmtime" +#, ignore-same #~ msgid "gui.spellingDictionary" #~ msgstr "gui.spellingDictionary" +#, ignore-same #~ msgid "gui.fastCopyBlame" #~ msgstr "gui.fastCopyBlame" +#, ignore-same #~ msgid "gui.copyBlameThreshold" #~ msgstr "gui.copyBlameThreshold" +#, ignore-same #~ msgid "gui.blamehistoryctx" #~ msgstr "gui.blamehistoryctx" +#, ignore-same #~ msgid "help.browser" #~ msgstr "help.browser" +#, ignore-same #~ msgid "help.autoCorrect" #~ msgstr "help.autoCorrect" +#, ignore-same #~ msgid "help.htmlPath" #~ msgstr "help.htmlPath" +#, ignore-same #~ msgid "instaweb.browser" #~ msgstr "instaweb.browser" +#, ignore-same #~ msgid "instaweb.httpd" #~ msgstr "instaweb.httpd" +#, ignore-same #~ msgid "instaweb.local" #~ msgstr "instaweb.local" +#, ignore-same #~ msgid "instaweb.modulePath" #~ msgstr "instaweb.modulePath" +#, ignore-same #~ msgid "instaweb.port" #~ msgstr "instaweb.port" +#, ignore-same #~ msgid "interactive.singleKey" #~ msgstr "interactive.singleKey" +#, ignore-same #~ msgid "interactive.diffFilter" #~ msgstr "interactive.diffFilter" +#, ignore-same #~ msgid "log.abbrevCommit" #~ msgstr "log.abbrevCommit" +#, ignore-same #~ msgid "log.decorate" #~ msgstr "log.decorate" +#, ignore-same #~ msgid "log.graphColors" #~ msgstr "log.graphColors" +#, ignore-same #~ msgid "log.mailmap" #~ msgstr "log.mailmap" +#, ignore-same #~ msgid "mailinfo.scissors" #~ msgstr "mailinfo.scissors" +#, ignore-same #~ msgid "mergetool.meld.hasOutput" #~ msgstr "mergetool.meld.hasOutput" +#, ignore-same #~ msgid "mergetool.keepBackup" #~ msgstr "mergetool.keepBackup" +#, ignore-same #~ msgid "mergetool.keepTemporaries" #~ msgstr "mergetool.keepTemporaries" +#, ignore-same #~ msgid "mergetool.writeToTemp" #~ msgstr "mergetool.writeToTemp" +#, ignore-same #~ msgid "mergetool.prompt" #~ msgstr "mergetool.prompt" +#, ignore-same #~ msgid "push.default" #~ msgstr "push.default" +#, ignore-same #~ msgid "push.followTags" #~ msgstr "push.followTags" +#, ignore-same #~ msgid "push.gpgSign" #~ msgstr "push.gpgSign" +#, ignore-same #~ msgid "push.recurseSubmodules" #~ msgstr "push.recurseSubmodules" +#, ignore-same #~ msgid "receive.advertiseAtomic" #~ msgstr "receive.advertiseAtomic" +#, ignore-same #~ msgid "receive.advertisePushOptions" #~ msgstr "receive.advertisePushOptions" +#, ignore-same #~ msgid "receive.autogc" #~ msgstr "receive.autogc" +#, ignore-same #~ msgid "receive.certNonceSeed" #~ msgstr "receive.certNonceSeed" +#, ignore-same #~ msgid "receive.certNonceSlop" #~ msgstr "receive.certNonceSlop" +#, ignore-same #~ msgid "receive.fsckObjects" #~ msgstr "receive.fsckObjects" +#, ignore-same #~ msgid "receive.fsck.skipList" #~ msgstr "receive.fsck.skipList" +#, ignore-same #~ msgid "receive.keepAlive" #~ msgstr "receive.keepAlive" +#, ignore-same #~ msgid "receive.unpackLimit" #~ msgstr "receive.unpackLimit" +#, ignore-same #~ msgid "receive.maxInputSize" #~ msgstr "receive.maxInputSize" +#, ignore-same #~ msgid "receive.denyDeletes" #~ msgstr "receive.denyDeletes" +#, ignore-same #~ msgid "receive.denyDeleteCurrent" #~ msgstr "receive.denyDeleteCurrent" +#, ignore-same #~ msgid "receive.denyCurrentBranch" #~ msgstr "receive.denyCurrentBranch" +#, ignore-same #~ msgid "receive.denyNonFastForwards" #~ msgstr "receive.denyNonFastForwards" +#, ignore-same #~ msgid "receive.hideRefs" #~ msgstr "receive.hideRefs" +#, ignore-same #~ msgid "receive.updateServerInfo" #~ msgstr "receive.updateServerInfo" +#, ignore-same #~ msgid "receive.shallowUpdate" #~ msgstr "receive.shallowUpdate" +#, ignore-same #~ msgid "remote.pushDefault" #~ msgstr "remote.pushDefault" +#, ignore-same #~ msgid "repack.useDeltaBaseOffset" #~ msgstr "repack.useDeltaBaseOffset" +#, ignore-same #~ msgid "repack.packKeptObjects" #~ msgstr "repack.packKeptObjects" +#, ignore-same #~ msgid "repack.writeBitmaps" #~ msgstr "repack.writeBitmaps" +#, ignore-same #~ msgid "sendemail.identity" #~ msgstr "sendemail.identity" +#, ignore-same #~ msgid "sendemail.smtpEncryption" #~ msgstr "sendemail.smtpEncryption" +#, ignore-same #~ msgid "sendemail.smtpsslcertpath" #~ msgstr "sendemail.smtpsslcertpath" +#, ignore-same #~ msgid "sendemail.annotate" #~ msgstr "sendemail.annotate" +#, ignore-same #~ msgid "sendemail.bcc" #~ msgstr "sendemail.bcc" +#, ignore-same #~ msgid "sendemail.cc" #~ msgstr "sendemail.cc" +#, ignore-same #~ msgid "sendemail.ccCmd" #~ msgstr "sendemail.ccCmd" +#, ignore-same #~ msgid "sendemail.chainReplyTo" #~ msgstr "sendemail.chainReplyTo" +#, ignore-same #~ msgid "sendemail.envelopeSender" #~ msgstr "sendemail.envelopeSender" +#, ignore-same #~ msgid "sendemail.from" #~ msgstr "sendemail.from" +#, ignore-same #~ msgid "sendemail.signedoffbycc" #~ msgstr "sendemail.signedoffbycc" +#, ignore-same #~ msgid "sendemail.smtpPass" #~ msgstr "sendemail.smtpPass" +#, ignore-same #~ msgid "sendemail.suppresscc" #~ msgstr "sendemail.suppresscc" +#, ignore-same #~ msgid "sendemail.suppressFrom" #~ msgstr "sendemail.suppressFrom" +#, ignore-same #~ msgid "sendemail.to" #~ msgstr "sendemail.to" +#, ignore-same #~ msgid "sendemail.smtpDomain" #~ msgstr "sendemail.smtpDomain" +#, ignore-same #~ msgid "sendemail.smtpServer" #~ msgstr "sendemail.smtpServer" +#, ignore-same #~ msgid "sendemail.smtpServerPort" #~ msgstr "sendemail.smtpServerPort" +#, ignore-same #~ msgid "sendemail.smtpServerOption" #~ msgstr "sendemail.smtpServerOption" +#, ignore-same #~ msgid "sendemail.smtpUser" #~ msgstr "sendemail.smtpUser" +#, ignore-same #~ msgid "sendemail.thread" #~ msgstr "sendemail.thread" +#, ignore-same #~ msgid "sendemail.transferEncoding" #~ msgstr "sendemail.transferEncoding" +#, ignore-same #~ msgid "sendemail.validate" #~ msgstr "sendemail.validate" +#, ignore-same #~ msgid "sendemail.xmailer" #~ msgstr "sendemail.xmailer" +#, ignore-same #~ msgid "showbranch.default" #~ msgstr "showbranch.default" +#, ignore-same #~ msgid "splitIndex.maxPercentChange" #~ msgstr "splitIndex.maxPercentChange" +#, ignore-same #~ msgid "splitIndex.sharedIndexExpire" #~ msgstr "splitIndex.sharedIndexExpire" +#, ignore-same #~ msgid "status.relativePaths" #~ msgstr "status.relativePaths" +#, ignore-same #~ msgid "status.short" #~ msgstr "status.short" +#, ignore-same #~ msgid "status.branch" #~ msgstr "status.branch" +#, ignore-same #~ msgid "status.displayCommentPrefix" #~ msgstr "status.displayCommentPrefix" +#, ignore-same #~ msgid "status.showUntrackedFiles" #~ msgstr "status.showUntrackedFiles" @@ -62130,63 +63592,83 @@ msgstr "" #~ msgid "`all` - Show also individual files in untracked directories." #~ msgstr "'all' - zeige zusätzlich die einzelnen Dateien in den unverwalteten Verzeichnissen\n" +#, ignore-same #~ msgid "status.submoduleSummary" #~ msgstr "status.submoduleSummary" +#, ignore-same #~ msgid "stash.showPatch" #~ msgstr "stash.showPatch" +#, ignore-same #~ msgid "stash.showStat" #~ msgstr "stash.showStat" +#, ignore-same #~ msgid "submodule.fetchJobs" #~ msgstr "submodule.fetchJobs" +#, ignore-same #~ msgid "submodule.alternateLocation" #~ msgstr "submodule.alternateLocation" +#, ignore-same #~ msgid "submodule.alternateErrorStrategy" #~ msgstr "submodule.alternateErrorStrategy" +#, ignore-same #~ msgid "transfer.fsckObjects" #~ msgstr "transfer.fsckObjects" +#, ignore-same #~ msgid "transfer.hideRefs" #~ msgstr "transfer.hideRefs" +#, ignore-same #~ msgid "transfer.unpackLimit" #~ msgstr "transfer.unpackLimit" +#, ignore-same #~ msgid "user.name" #~ msgstr "user.name" +#, ignore-same #~ msgid "user.useConfigOnly" #~ msgstr "user.useConfigOnly" +#, ignore-same #~ msgid "user.signingKey" #~ msgstr "user.signingKey" +#, ignore-same #~ msgid "diff.autoRefreshIndex" #~ msgstr "diff.autoRefreshIndex" +#, ignore-same #~ msgid "diff.dirstat" #~ msgstr "diff.dirstat" +#, ignore-same #~ msgid "diff.statGraphWidth" #~ msgstr "diff.statGraphWidth" +#, ignore-same #~ msgid "diff.context" #~ msgstr "diff.context" +#, ignore-same #~ msgid "diff.interHunkContext" #~ msgstr "diff.interHunkContext" +#, ignore-same #~ msgid "diff.external" #~ msgstr "diff.external" +#, ignore-same #~ msgid "diff.ignoreSubmodules" #~ msgstr "diff.ignoreSubmodules" +#, ignore-same #~ msgid "diff.mnemonicPrefix" #~ msgstr "diff.mnemonicPrefix" @@ -62202,30 +63684,39 @@ msgstr "" #~ msgid "`git diff HEAD:file1 file2`" #~ msgstr "$ git add file1 file2 file3\n" +#, ignore-same #~ msgid "diff.noprefix" #~ msgstr "diff.noprefix" +#, ignore-same #~ msgid "diff.orderFile" #~ msgstr "diff.orderFile" +#, ignore-same #~ msgid "diff.renameLimit" #~ msgstr "diff.renameLimit" +#, ignore-same #~ msgid "diff.renames" #~ msgstr "diff.renames" +#, ignore-same #~ msgid "diff.suppressBlankEmpty" #~ msgstr "diff.suppressBlankEmpty" +#, ignore-same #~ msgid "diff.submodule" #~ msgstr "diff.submodule" +#, ignore-same #~ msgid "diff.wordRegex" #~ msgstr "diff.wordRegex" +#, ignore-same #~ msgid "diff.algorithm" #~ msgstr "diff.algorithm" +#, ignore-same #~ msgid "diff.wsErrorHighlight" #~ msgstr "diff.wsErrorHighlight" @@ -62253,6 +63744,7 @@ msgstr "" #~ msgid "Limiting Output" #~ msgstr "Ausgabe von 'diff' einschränken" +#, ignore-ellipsis #~ msgid "'git diff' --no-index [--options] [--] [...]" #~ msgstr "'git diff' [--options] [--] [...]" @@ -62413,6 +63905,7 @@ msgstr "" #~ msgid "Written by Linus Torvalds and Junio C Hamano " #~ msgstr "Geschrieben von Linus Torvalds und Junio C Hamano " +#, ignore-ellipsis #~ msgid "" #~ "'git checkout' [-q] [-f] [[--track | --no-track] -b [-l]] [-m] []\n" #~ "'git checkout' [] [--] ...\n" @@ -62462,6 +63955,7 @@ msgstr "" #~ msgid "Create a repository on the kernel.org machine that borrows from Linus" #~ msgstr "Erzeuge auf dem Rechner kernel.org ein Projektarchiv das Objekte von Linus borgt" +#, ignore-ellipsis #~ msgid "" #~ "$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n" #~ " /pub/scm/.../me/subsys-2.6.git\n" @@ -62508,12 +64002,6 @@ msgstr "" #~ msgid "If exactly two paths are given, and at least one is untracked, compare the two files / directories. This behavior can be forced by --no-index." #~ msgstr "Werden exakt zwei Dateipfade angegeben und wird zumindest einer davon noch nicht mit git verwaltet, dann werden diese beiten Dateien/Verzeichnisse verglichen. Dieses Verhalten kann auch mit --no-index erzwungen werden." -#~ msgid "gitglossary(7)" -#~ msgstr "gitglossary(7)" - -#~ msgid "gitglossary - A GIT Glossary" -#~ msgstr "gitglossary - Ein GIT-Glossar" - #~ msgid "Part of the linkgit:git[1] suite." #~ msgstr "" #~ "#-#-#-#-# gitglossary-de.po (PACKAGE VERSION) #-#-#-#-#\n" @@ -62565,6 +64053,7 @@ msgstr "" #~ "'git remote prune' [-n | --dry-run] \n" #~ "'git remote update' [group]\n" +#, ignore-ellipsis #~ msgid "" #~ "$ git remote\n" #~ "origin\n" @@ -62611,12 +64100,14 @@ msgstr "" #~ msgid "git-repo-config - Get and set repository or global options" #~ msgstr "git-repo-config - Repositoryeigene/Globale Optionen auslesen und setzen" +#, ignore-ellipsis #~ msgid "'git repo-config' ..." #~ msgstr "'git repo-config' ..." #~ msgid "This is a synonym for linkgit:git-config[1]. Please refer to the documentation of that command." #~ msgstr "Dies ist ein Synonym für linkgit:git-config[1]. Bitt lesen Sie die Dokumentation dieses Kommandos." +#, ignore-same #~ msgid "gittutorial(7)" #~ msgstr "gittutorial(7)" @@ -62680,6 +64171,7 @@ msgstr "" #~ msgid "(Without --cached, 'git-diff' will show you any changes that you've made but not yet added to the index.) You can also get a brief summary of the situation with 'git-status':" #~ msgstr "(Ohne --cached zeigt 'git-diff' alle Änderungen, die Sie durchgeführt, aber noch nicht zum Index hinzugefügt haben.) Sie können auch eine kurze Zusammenfassung der momentanen Situation mit 'git-status' erhalten:" +#, ignore-ellipsis #~ msgid "" #~ "$ git status\n" #~ "# On branch master\n" @@ -63111,8 +64603,5 @@ msgstr "" #~ msgid "linkgit:gitcvs-migration[7]: Git for CVS users." #~ msgstr "linkgit:gitcvs-migration[7]: Git für CVS-Benutzer." -#~ msgid "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual]" -#~ msgstr "linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], link:everyday.html[Tägliches git], link:user-manual.html[The Git User's Manual]" - #~ msgid "Written by Jan Harkes and Eric W. Biederman " #~ msgstr "Geschrieben von Jan Harkes und Eric W. Biederman " diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po index 1eb3e6b3..e8393a43 100644 --- a/po/documentation.es_MX.po +++ b/po/documentation.es_MX.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-10-05 21:56+0000\n" "Last-Translator: Farándula \n" "Language-Team: LANGUAGE \n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.9-dev\n" @@ -5657,7 +5657,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5669,7 +5669,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "SINOPSIS" @@ -5695,7 +5695,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "DESCRIPCIÓN" @@ -6374,7 +6374,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6386,13 +6386,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55637,6 +55637,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "Lista referencias en un repositorio remoto" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "actuar en ramas de traqueo remoto" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -60721,6 +61974,7 @@ msgstr "" msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL." msgstr "" +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" diff --git a/po/documentation.fr.po b/po/documentation.fr.po index f3cd18df..03316d46 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: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-02-05 13:50+0000\n" "Last-Translator: Jean-Noël Avila \n" "Language-Team: Jean-Noël Avila \n" @@ -2607,15 +2607,7 @@ msgstr "merge.renormalize" #: en/config/merge.txt:68 #, priority:240 msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]." -msgstr "" -"Indiquer à Git que la représentation canonique des fichiers dans le dépôt a " -"changé au fil du temps (par exemple, les premiers commits enregistrent les " -"fichiers avec des fins de ligne CRLF, mais les plus récents utilisent des " -"fins de ligne LF). Dans un tel dépôt, Git peut convertir les données " -"enregistrées dans les commits en une forme canonique avant d'effectuer une " -"fusion pour réduire les conflits inutiles. Pour plus d'informations, voir " -"la section \"Fusionner des branches avec des attributs d'entrée/de sortie " -"différents\" dans linkgit:gitattributes[5]." +msgstr "Indiquer à Git que la représentation canonique des fichiers dans le dépôt a changé au fil du temps (par exemple, les premiers commits enregistrent les fichiers avec des fins de ligne CRLF, mais les plus récents utilisent des fins de ligne LF). Dans un tel dépôt, Git peut convertir les données enregistrées dans les commits en une forme canonique avant d'effectuer une fusion pour réduire les conflits inutiles. Pour plus d'informations, voir la section \"Fusionner des branches avec des attributs d'entrée/de sortie différents\" dans linkgit:gitattributes[5]." #. type: Labeled list #: en/config/merge.txt:69 @@ -2627,9 +2619,7 @@ msgstr "merge.stat" #: en/config/merge.txt:72 #, priority:240 msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default." -msgstr "" -"Indiquer s'il faut afficher le diffstat entre ORIG_HEAD et le résultat de la " -"fusion à la fin de la fusion. Vrai par défaut." +msgstr "Indiquer s'il faut afficher le diffstat entre ORIG_HEAD et le résultat de la fusion à la fin de la fusion. Vrai par défaut." #. type: Labeled list #: en/config/merge.txt:73 @@ -2641,11 +2631,7 @@ msgstr "merge.tool" #: en/config/merge.txt:78 #, priority:240 msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." -msgstr "" -"Contrôle quel outil de fusion est utilisé par linkgit:git-mergetool[1]. La " -"liste ci-dessous indique les valeurs pré-intégrées valides. Toute autre " -"valeur est traitée comme un outil de fusion personnalisé et nécessite qu'une " -"variable mergetool..cmd correspondante soit définie." +msgstr "Contrôle quel outil de fusion est utilisé par linkgit:git-mergetool[1]. La liste ci-dessous indique les valeurs pré-intégrées valides. Toute autre valeur est traitée comme un outil de fusion personnalisé et nécessite qu'une variable mergetool..cmd correspondante soit définie." #. type: Labeled list #: en/config/merge.txt:79 @@ -2657,12 +2643,7 @@ msgstr "merge.guitool" #: en/config/merge.txt:84 #, priority:240 msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." -msgstr "" -"Contrôle quel outil de fusion est utilisé par linkgit:git-mergetool[1] " -"lorsque le drapeau -g/--gui est spécifié. La liste ci-dessous indique les " -"valeurs pré-intégrées valides. Toute autre valeur est traitée comme un " -"outil de fusion personnalisé et nécessite qu'une variable " -"mergetool..cmd correspondante soit définie." +msgstr "Contrôle quel outil de fusion est utilisé par linkgit:git-mergetool[1] lorsque le drapeau -g/--gui est spécifié. La liste ci-dessous indique les valeurs pré-intégrées valides. Toute autre valeur est traitée comme un outil de fusion personnalisé et nécessite qu'une variable mergetool..cmd correspondante soit définie." #. type: Labeled list #: en/config/merge.txt:87 @@ -2674,14 +2655,7 @@ msgstr "merge.verbosity" #: en/config/merge.txt:94 #, priority:240 msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable." -msgstr "" -"Contrôle la quantité de production affichée par la stratégie de fusion " -"récursive. Le niveau 0 ne produit rien, sauf un message d'erreur final si " -"des conflits ont été détectés. Le niveau 1 ne produit que des conflits, le " -"niveau 2 produit des conflits et des changements de fichiers. Les niveaux 5 " -"et plus produisent des informations de débogage. La valeur par défaut est " -"le niveau 2. Peut être écrasée par la variable d'environnement " -"`GIT_MERGE_VERBOSITY`." +msgstr "Contrôle la quantité de production affichée par la stratégie de fusion récursive. Le niveau 0 ne produit rien, sauf un message d'erreur final si des conflits ont été détectés. Le niveau 1 ne produit que des conflits, le niveau 2 produit des conflits et des changements de fichiers. Les niveaux 5 et plus produisent des informations de débogage. La valeur par défaut est le niveau 2. Peut être écrasée par la variable d'environnement `GIT_MERGE_VERBOSITY`." #. type: Labeled list #: en/config/merge.txt:95 @@ -2693,9 +2667,7 @@ msgstr "merge..name" #: en/config/merge.txt:98 #, priority:240 msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details." -msgstr "" -"Définit un nom lisible par l'homme pour un pilote de fusion personnalisé de " -"bas niveau. Voir linkgit:gitattributes[5] pour plus de détails." +msgstr "Définit un nom lisible par l'homme pour un pilote de fusion personnalisé de bas niveau. Voir linkgit:gitattributes[5] pour plus de détails." #. type: Labeled list #: en/config/merge.txt:99 @@ -2707,9 +2679,7 @@ msgstr "merge..driver" #: en/config/merge.txt:102 #, priority:240 msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details." -msgstr "" -"Définit la commande qui met en œuvre un pilote de fusion de bas niveau " -"personnalisé. Voir linkgit:gitattributes[5] pour plus de détails." +msgstr "Définit la commande qui met en œuvre un pilote de fusion de bas niveau personnalisé. Voir linkgit:gitattributes[5] pour plus de détails." #. type: Labeled list #: en/config/merge.txt:103 @@ -2721,10 +2691,7 @@ msgstr "merge..recursive" #: en/config/merge.txt:106 #, priority:240 msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details." -msgstr "" -"Nomme un pilote de fusion de bas niveau à utiliser lors d'une fusion interne " -"entre des ancêtres communs. Voir linkgit:gitattributes[5] pour plus de " -"détails." +msgstr "Nomme un pilote de fusion de bas niveau à utiliser lors d'une fusion interne entre des ancêtres communs. Voir linkgit:gitattributes[5] pour plus de détails." #. type: Labeled list #: en/config/fmt-merge-msg.txt:1 @@ -2736,10 +2703,7 @@ msgstr "merge.branchdesc" #: en/config/fmt-merge-msg.txt:5 #, priority:240 msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false." -msgstr "" -"En plus des noms des branches, remplir le message de validation avec le " -"texte de description des branches qui leur est associé. Désactivé par " -"défaut (valeur false)." +msgstr "En plus des noms des branches, remplir le message de validation avec le texte de description des branches qui leur est associé. Désactivé par défaut (valeur false)." #. type: Labeled list #: en/config/fmt-merge-msg.txt:6 @@ -2751,10 +2715,7 @@ msgstr "merge.log" #: en/config/fmt-merge-msg.txt:10 #, priority:240 msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20." -msgstr "" -"En plus des noms de branches, remplir le message de validation avec au " -"maximum le nombre spécifié de descriptions d'une ligne des commits réels " -"fusionnés. Désactivé par défaut (valeur false), et vaut 20 si `true`." +msgstr "En plus des noms de branches, remplir le message de validation avec au maximum le nombre spécifié de descriptions d'une ligne des commits réels fusionnés. Désactivé par défaut (valeur false), et vaut 20 si `true`." #. type: Title - #: en/date-formats.txt:2 @@ -4648,17 +4609,7 @@ msgstr "Casser les modifications de réécriture complète en paires de suppress #: en/diff-options.txt:463 #, priority:280 msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)." -msgstr "" -"Cela affecte la façon dont un changement qui équivaut à une réécriture " -"totale d'un fichier apparaît non pas comme une série de suppressions et " -"d'insertions mélangées avec quelques lignes qui (par hasard) correspondent " -"entre les deux versions comme contexte, mais comme une simple suppression de " -"tout ce qui est ancien suivi d'une simple insertion de tout ce qui est " -"nouveau, et le nombre `m` contrôle cet aspect de l'option -B (par défaut 60 " -"%). `-B/70%` spécifie que moins de 30 % de l'original doit rester dans le " -"résultat pour que Git le considère comme une réécriture totale (autrement, " -"la rustine résultante sera une série de suppressions et d'insertions " -"mélangées avec des lignes de contexte)." +msgstr "Cela affecte la façon dont un changement qui équivaut à une réécriture totale d'un fichier apparaît non pas comme une série de suppressions et d'insertions mélangées avec quelques lignes qui (par hasard) correspondent entre les deux versions comme contexte, mais comme une simple suppression de tout ce qui est ancien suivi d'une simple insertion de tout ce qui est nouveau, et le nombre `m` contrôle cet aspect de l'option -B (par défaut 60 %). `-B/70%` spécifie que moins de 30 % de l'original doit rester dans le résultat pour que Git le considère comme une réécriture totale (autrement, la rustine résultante sera une série de suppressions et d'insertions mélangées avec des lignes de contexte)." #. type: Plain text #: en/diff-options.txt:471 @@ -5797,7 +5748,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "NOM" @@ -5809,7 +5760,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "SYNOPSIS" @@ -5824,16 +5775,14 @@ msgid "" "\t [--chmod=(+|-)x] [--pathspec-from-file= [--pathspec-file-nul]]\n" "\t [--] [...]\n" msgstr "" -"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | " -"-i] [--patch | -p]\n" +"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n" "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n" -"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] " -"[--renormalize]\n" +"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n" "\t [--chmod=(+|-)x] [--pathspec-from-file= [--pathspec-file-nul]]\n" "\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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "DESCRIPTION" @@ -6130,14 +6079,7 @@ msgstr "--pathspec-from-file=" #: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 #, priority:300 msgid "Pathspec is passed in `` instead of commandline args. If `` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`." -msgstr "" -"Le spécificateur de chemin est passé dans `` au lieu des arguments " -"de la ligne de commande. Si `` vaut `-` alors l'entrée standard est " -"utilisée. Les éléments du spécificateur de chemin sont séparés par LF ou CR/" -"LF. Les éléments du spécificateur de chemin peuvent être cités comme " -"expliqué pour la variable de configuration `core.quotePath` (voir linkgit" -":git-config[1]). Voir aussi l'option `--pathspec-file-nul` et l'option " -"globale `--literal-pathspecs`." +msgstr "Le spécificateur de chemin est passé dans `` au lieu des arguments de la ligne de commande. Si `` vaut `-` alors l'entrée standard est utilisée. Les éléments du spécificateur de chemin sont séparés par LF ou CR/LF. Les éléments du spécificateur de chemin peuvent être cités comme expliqué pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1]). Voir aussi l'option `--pathspec-file-nul` et l'option globale `--literal-pathspecs`." #. type: Labeled list #: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 @@ -6149,11 +6091,7 @@ msgstr "--pathspec-file-nul" #: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 #, priority:300 msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)." -msgstr "" -"Uniquement significatif avec `--pathspec-from-file`. Les éléments du " -"spécificateur de chemin sont séparés par le caractère NUL et tous les autres " -"caractères sont utilisés littéralement (y compris les retours à la ligne et " -"les guillemets)." +msgstr "Uniquement significatif avec `--pathspec-from-file`. Les éléments du spécificateur de chemin sont séparés par le caractère NUL et tous les autres caractères sont utilisés littéralement (y compris les retours à la ligne et les guillemets)." #. type: Labeled list #: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36 @@ -6546,7 +6484,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:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 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" @@ -6558,13 +6496,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 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]" @@ -6803,9 +6741,7 @@ msgstr "--no-rerere-autoupdate" #: en/git-am.txt:106 en/git-cherry-pick.txt:160 en/git-merge.txt:89 en/git-rebase.txt:325 en/git-revert.txt:116 #, priority:240 msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible." -msgstr "" -"Permettre au mécanisme rerere de mettre à jour l'index avec le résultat de " -"la résolution automatique des conflits si possible." +msgstr "Permettre au mécanisme rerere de mettre à jour l'index avec le résultat de la résolution automatique des conflits si possible." #. type: Plain text #: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546 @@ -9314,100 +9250,55 @@ msgstr "" #: en/git-branch.txt:36 #, priority:240 msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches." -msgstr "" -"Si `--list` est donné, ou s'il n'y a pas d'arguments sans option, les " -"branches existantes sont listées ; la branche actuelle sera surlignée en " -"vert et marquée d'un astérisque. Toutes les branches extraites dans les " -"arbres de travail liés seront mis en évidence en cyan et marqués d'un signe " -"plus. L'option `-r` ajoute la liste des branches de suivi à distance et " -"l'option` -a` affiche les branches locales et distantes." +msgstr "Si `--list` est donné, ou s'il n'y a pas d'arguments sans option, les branches existantes sont listées ; la branche actuelle sera surlignée en vert et marquée d'un astérisque. Toutes les branches extraites dans les arbres de travail liés seront mis en évidence en cyan et marqués d'un signe plus. L'option `-r` ajoute la liste des branches de suivi à distance et l'option` -a` affiche les branches locales et distantes." #. type: Plain text #: en/git-branch.txt:41 #, priority:240 msgid "If a `` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns." -msgstr "" -"Si un `` est donné, il est utilisé comme joker du shell pour " -"restreindre la sortie aux branches correspondantes. Si plusieurs motifs sont " -"donnés, une branche est affichée si elle correspond à l'un des motifs." +msgstr "Si un `` est donné, il est utilisé comme joker du shell pour restreindre la sortie aux branches correspondantes. Si plusieurs motifs sont donnés, une branche est affichée si elle correspond à l'un des motifs." #. type: Plain text #: en/git-branch.txt:45 #, priority:240 msgid "Note that when providing a ``, you must use `--list`; otherwise the command may be interpreted as branch creation." -msgstr "" -"Notez que lorsque vous fournissez un ` `, vous devez utiliser `--list`" -" ; sinon, la commande peut être interprétée comme une création de branche." +msgstr "Notez que lorsque vous fournissez un ` `, vous devez utiliser `--list` ; sinon, la commande peut être interprétée comme une création de branche." #. type: Plain text #: en/git-branch.txt:54 #, priority:240 msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)." -msgstr "" -"Avec `--contains`, montrer seulement les branches qui contiennent le commit " -"indiqué (en d'autres termes, les branches dont les commits sommets sont des " -"descendants du commit indiqué), avec `--no-contains` inverser. Avec " -"`--merged`, seules les branches fusionnées dans le commit indiqué (c'est-à-" -"dire les branches dont les commits sommets sont accessibles depuis le commit " -"indiqué) seront listées. Avec `--no-merged`, seules les branches non " -"fusionnées dans le commit indiqué seront listées. Si l'argument " -"est manquant, il prend par défaut la valeur \"HEAD\" (c'est-à-dire le sommet " -"de la branche courante)." +msgstr "Avec `--contains`, montrer seulement les branches qui contiennent le commit indiqué (en d'autres termes, les branches dont les commits sommets sont des descendants du commit indiqué), avec `--no-contains` inverser. Avec `--merged`, seules les branches fusionnées dans le commit indiqué (c'est-à-dire les branches dont les commits sommets sont accessibles depuis le commit indiqué) seront listées. Avec `--no-merged`, seules les branches non fusionnées dans le commit indiqué seront listées. Si l'argument est manquant, il prend par défaut la valeur \"HEAD\" (c'est-à-dire le sommet de la branche courante)." #. type: Plain text #: en/git-branch.txt:61 #, ignore-ellipsis, priority:240 msgid "The command's second form creates a new branch head named which points to the current `HEAD`, or if given. As a special case, for , you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." -msgstr "" -"La deuxième forme de la commande crée une nouvelle tête de branche nommée " -" qui pointe vers la `HEAD` actuelle, ou si " -"elle est fournie. Dans un cas particulier, pour le , vous " -"pouvez utiliser `\"A...B\"` comme raccourci pour la base de fusion de `A` et " -"`B` s'il y a exactement une base de fusion. Vous pouvez omettre tout au plus " -"un des `A` et `B`, auquel cas il s'agit par défaut de `HEAD`." +msgstr "La deuxième forme de la commande crée une nouvelle tête de branche nommée qui pointe vers la `HEAD` actuelle, ou si elle est fournie. Dans un cas particulier, pour le , vous pouvez utiliser `\"A...B\"` comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une base de fusion. Vous pouvez omettre tout au plus un des `A` et `B`, auquel cas il s'agit par défaut de `HEAD`." #. type: Plain text #: en/git-branch.txt:65 #, priority:240 msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch \" to switch to the new branch." -msgstr "" -"Notez que cela créera la nouvelle branche, mais ne fera pas passer l'arbre " -"de travail sur celle-ci ; utilisez \"git switch \" pour " -"passer sur la nouvelle branche." +msgstr "Notez que cela créera la nouvelle branche, mais ne fera pas passer l'arbre de travail sur celle-ci ; utilisez \"git switch \" pour passer sur la nouvelle branche." #. type: Plain text #: en/git-branch.txt:73 #, priority:240 msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch..remote` and `branch..merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`." -msgstr "" -"Lorsqu'une branche locale est démarrée à partir d'une branche de suivi à " -"distance, Git configure la branche (plus précisément les entrées de " -"configuration `branch..remote` et `branch..merge`) de façon à ce " -"que 'git pull' fusionne correctement avec la branche de suivi à distance. Ce " -"comportement peut être modifié via le drapeau de configuration global " -"`branch.autoSetupMerge`. Ce paramètre peut être modifié en utilisant les " -"options `---track` et `--no-track`, et changé plus tard en utilisant `git " -"branch --set-upstream-to`." +msgstr "Lorsqu'une branche locale est démarrée à partir d'une branche de suivi à distance, Git configure la branche (plus précisément les entrées de configuration `branch..remote` et `branch..merge`) de façon à ce que 'git pull' fusionne correctement avec la branche de suivi à distance. Ce comportement peut être modifié via le drapeau de configuration global `branch.autoSetupMerge`. Ce paramètre peut être modifié en utilisant les options `---track` et `--no-track`, et changé plus tard en utilisant `git branch --set-upstream-to`." #. type: Plain text #: en/git-branch.txt:79 #, priority:240 msgid "With a `-m` or `-M` option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, -M must be used to force the rename to happen." -msgstr "" -"Avec une option `-m` ou `-M`, sera renommée en . Si avait un reflog correspondant, il est " -"renommé pour correspondre à , et une entrée de reflog est " -"créée pour se souvenir du renommage de la branche. Si " -"existe déjà, -M doit être utilisé pour forcer le changement de nom." +msgstr "Avec une option `-m` ou `-M`, sera renommée en . Si avait un reflog correspondant, il est renommé pour correspondre à , et une entrée de reflog est créée pour se souvenir du renommage de la branche. Si existe déjà, -M doit être utilisé pour forcer le changement de nom." #. type: Plain text #: en/git-branch.txt:83 #, priority:240 msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed it along with its config and reflog will be copied to a new name." -msgstr "" -"Les options `-c` et `-C` ont exactement la même sémantique que `-m` et `-M`, " -"sauf qu'au lieu de renommer la branche, on la copie sous un nouveau nom avec " -"sa configuration et son reflog." +msgstr "Les options `-c` et `-C` ont exactement la même sémantique que `-m` et `-M`, sauf qu'au lieu de renommer la branche, on la copie sous un nouveau nom avec sa configuration et son reflog." #. type: Plain text #: en/git-branch.txt:87 @@ -9422,13 +9313,7 @@ msgstr "" #: en/git-branch.txt:93 #, priority:240 msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches." -msgstr "" -"Utilisez `-r` avec `-d` pour supprimer les branches de suivi à distance. " -"Notez qu'il est logique de supprimer les branches de suivi à distance " -"uniquement si elles n'existent plus dans le dépôt distant ou si \"git fetch\"" -" a été configuré pour ne pas les récupérer à nouveau. Voir aussi la sous-" -"commande « prune » de linkgit:git-remote[1] pour une méthode de nettoyage " -"toutes les branches obsolètes de suivi à distance." +msgstr "Utilisez `-r` avec `-d` pour supprimer les branches de suivi à distance. Notez qu'il est logique de supprimer les branches de suivi à distance uniquement si elles n'existent plus dans le dépôt distant ou si \"git fetch\" a été configuré pour ne pas les récupérer à nouveau. Voir aussi la sous-commande « prune » de linkgit:git-remote[1] pour une méthode de nettoyage toutes les branches obsolètes de suivi à distance." #. type: Labeled list #: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 @@ -9446,10 +9331,7 @@ msgstr "--delete" #: en/git-branch.txt:102 #, priority:240 msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`." -msgstr "" -"Supprimer une branche. La branche doit être entièrement fusionnée dans sa " -"branche amont, ou dans `HEAD` si aucune branche amont n'a été fixée avec " -"`--track` ou `--set-upstream-to`." +msgstr "Supprimer une branche. La branche doit être entièrement fusionnée dans sa branche amont, ou dans `HEAD` si aucune branche amont n'a été fixée avec `--track` ou `--set-upstream-to`." #. type: Plain text #: en/git-branch.txt:105 @@ -12218,9 +12100,7 @@ msgstr "Limite les chemins affectés par l'opération." #: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 #, priority:280 msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]." -msgstr "" -"Pour plus de détail, voir l'entrée 'spécificateur de chemin' dans " -"linkgit:gitglossary[7]." +msgstr "Pour plus de détail, voir l'entrée 'spécificateur de chemin' dans linkgit:gitglossary[7]." #. type: Title - #: en/git-checkout.txt:363 @@ -13895,11 +13775,7 @@ msgstr "--sparse" #: en/git-clone.txt:164 #, priority:300 msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed." -msgstr "" -"Initialiser le fichier d'extraction partielle pour que le répertoire de " -"travail ne commence qu'avec les fichiers de la racine du dépôt. Le fichier " -"d'extraction partielle peut être modifié pour agrandir le répertoire de " -"travail selon les besoins." +msgstr "Initialiser le fichier d'extraction partielle pour que le répertoire de travail ne commence qu'avec les fichiers de la racine du dépôt. Le fichier d'extraction partielle peut être modifié pour agrandir le répertoire de travail selon les besoins." #. type: Labeled list #: en/git-clone.txt:165 en/git-push.txt:161 @@ -15182,11 +15058,7 @@ msgstr "Annuler la variable de configuration `commit.gpgSign` qui force tous les #: en/git-commit.txt:367 #, priority:280 msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before." -msgstr "" -"Quand un spécifcateur de chemins est fourni sur la ligne de commande, " -"valider le contenu des fichiers correspondants, sans enregistrer les " -"modifications déjà indexées. Le contenu de ces fichiers est aussi indexé " -"pour le commit suivant par-dessus ce qui a été indexé auparavant." +msgstr "Quand un spécifcateur de chemins est fourni sur la ligne de commande, valider le contenu des fichiers correspondants, sans enregistrer les modifications déjà indexées. Le contenu de ces fichiers est aussi indexé pour le commit suivant par-dessus ce qui a été indexé auparavant." #. type: Plain text #: en/git-commit.txt:386 @@ -19868,12 +19740,7 @@ msgstr "'git diff' [] --no-index [--] " #: en/git-diff.txt:40 #, priority:280 msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`." -msgstr "" -"Cette forme sert à comparer les deux chemins indiqués sur le système de " -"fichiers. Vous pouvez omettre l'option `--no-index` si la commande est " -"lancée dans un arbre de travail contrôlé par Git et qu'au moins un des " -"chemins pointe hors de l'arbre de travail ou si la commande est lancée hors " -"d'un arbre de travail contrôlé par Git. Cette forme implique `--exit-code`." +msgstr "Cette forme sert à comparer les deux chemins indiqués sur le système de fichiers. Vous pouvez omettre l'option `--no-index` si la commande est lancée dans un arbre de travail contrôlé par Git et qu'au moins un des chemins pointe hors de l'arbre de travail ou si la commande est lancée hors d'un arbre de travail contrôlé par Git. Cette forme implique `--exit-code`." #. type: Labeled list #: en/git-diff.txt:41 @@ -30503,18 +30370,7 @@ msgstr "-L ::" #: en/git-log.txt:85 #, priority:260 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." +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: Labeled list #: en/git-log.txt:88 en/git-shortlog.txt:63 @@ -42392,22 +42248,15 @@ msgid "" "'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] []\n" msgstr "" "'git reset' [-q] [] [--] ...\n" -"'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] " -"[]\n" +"'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] []\n" "'git reset' (--patch | -p) [] [--] [...]\n" -"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] " -"[]\n" +"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] []\n" #. type: Plain text #: en/git-reset.txt:22 #, priority:280 msgid "In the first three forms, copy entries from `` to the index. In the last form, set the current branch head (`HEAD`) to ``, optionally modifying index and working tree to match. The ``/`` defaults to `HEAD` in all forms." -msgstr "" -"Dans la première et la troisième forme, cette commande copie les entrées " -"depuis `` vers l'index. Dans la dernière forme, elle amène le " -"sommet de la branche actuelle (`HEAD`) à ``, optionnellement en " -"modifiant l'index et l'arbre de travail en correspondance. L'``/`` vaut par défaut `HEAD` dans toutes les formes." +msgstr "Dans la première et la troisième forme, cette commande copie les entrées depuis `` vers l'index. Dans la dernière forme, elle amène le sommet de la branche actuelle (`HEAD`) à ``, optionnellement en modifiant l'index et l'arbre de travail en correspondance. L'``/`` vaut par défaut `HEAD` dans toutes les formes." #. type: Labeled list #: en/git-reset.txt:23 @@ -42419,39 +42268,25 @@ msgstr "'git reset' [-q] [] [--] ..." #: en/git-reset.txt:24 #, no-wrap, priority:280 msgid "'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] []" -msgstr "" -"'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] " -"[]" +msgstr "'git reset' [-q] [--pathspec-from-file= [--pathspec-file-nul]] []" #. type: Plain text #: en/git-reset.txt:28 #, priority:280 msgid "These forms reset the index entries for all paths that match the `` to their state at ``. (It does not affect the working tree or the current branch.)" -msgstr "" -"Ces formes réinitialisent les entrées d'index pour tous fichiers " -"correspondant à à leur état de `` (ceci " -"n'affecte pas l'arbre de travail ou la branche actuelle.)" +msgstr "Ces formes réinitialisent les entrées d'index pour tous fichiers correspondant à à leur état de `` (ceci n'affecte pas l'arbre de travail ou la branche actuelle.)" #. type: Plain text #: en/git-reset.txt:32 #, ignore-ellipsis, priority:280 msgid "This means that `git reset ` is the opposite of `git add `. This command is equivalent to `git restore [--source=] --staged ...`." -msgstr "" -"Cela signifie que `git reset ` est l'opposé de `git add " -"`. Cette commande est équivalent à `git restore [--source" -"=] --staged ...`." +msgstr "Cela signifie que `git reset ` est l'opposé de `git add `. Cette commande est équivalent à `git restore [--source=] --staged ...`." #. type: Plain text #: en/git-reset.txt:39 #, priority:280 msgid "After running `git reset ` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go." -msgstr "" -"Après avoir lancé `git reset ` pour mettre à jour l'entrée " -"d'index, vous pouvez linkgit:git-restore[1] pour extraire le contenu de " -"l'index dans l'arbre de travail. Alternativement, en utilisant linkgit:git-" -"restore[1] et en spécifiant un commit avec `--source`, vous pouvez copier le " -"contenu d'un chemin d'un commit vers l'index et l'arbre de travail d'une " -"seule traite." +msgstr "Après avoir lancé `git reset ` pour mettre à jour l'entrée d'index, vous pouvez linkgit:git-restore[1] pour extraire le contenu de l'index dans l'arbre de travail. Alternativement, en utilisant linkgit:git-restore[1] et en spécifiant un commit avec `--source`, vous pouvez copier le contenu d'un chemin d'un commit vers l'index et l'arbre de travail d'une seule traite." #. type: Labeled list #: en/git-reset.txt:40 @@ -56484,6 +56319,1262 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, fuzzy, no-wrap, priority:100 +#| msgid "--branch " +msgid "[[def_branch]]branch" +msgstr "--branch " + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, fuzzy, no-wrap, priority:100 +#| msgid "--subdirectory-filter " +msgid "[[def_directory]]directory" +msgstr "--subdirectory-filter " + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, fuzzy, no-wrap, priority:100 +#| msgid "The URL to the remote repository." +msgid "[[def_remote]]remote repository" +msgstr "L'URL du dépôt distant." + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "agir sur les branches de suivi distantes" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -56586,9 +57677,7 @@ msgstr "nombre" #: en/line-range-format.txt:7 #, priority:260 msgid "If or is a number, it specifies an absolute line number (lines count from 1)." -msgstr "" -"Si ou est un nombre, il spécifie un numéro de ligne absolu (" -"les lignes comptent à partir de 1)." +msgstr "Si ou est un nombre, il spécifie un numéro de ligne absolu (les lignes comptent à partir de 1)." #. type: Plain text #: en/line-range-format.txt:10 @@ -56600,13 +57689,7 @@ msgstr "/regex/" #: en/line-range-format.txt:17 #, priority:260 msgid "This form will use the first line matching the given POSIX regex. If is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If is ``^/regex/'', it will search from the start of file. If is a regex, it will search starting at the line given by ." -msgstr "" -"Cette forme utilisera la première ligne correspondant à la regex POSIX " -"donnée. Si est une regex, la recherche se fera à partir de la fin de " -"la plage `-L` précédente, le cas échéant, sinon à partir du début du " -"fichier. Si est \"^/regex/\", la recherche se fera à partir du " -"début du fichier. Si est une regex, la recherche débutera à partir de " -"la ligne donnée par ." +msgstr "Cette forme utilisera la première ligne correspondant à la regex POSIX donnée. Si est une regex, la recherche se fera à partir de la fin de la plage `-L` précédente, le cas échéant, sinon à partir du début du fichier. Si est \"^/regex/\", la recherche se fera à partir du début du fichier. Si est une regex, la recherche débutera à partir de la ligne donnée par ." #. type: Plain text #: en/line-range-format.txt:20 @@ -56618,22 +57701,13 @@ msgstr "+ offset ou -offset" #: en/line-range-format.txt:23 #, priority:260 msgid "This is only valid for and will specify a number of lines before or after the line given by ." -msgstr "" -"Ceci n'est valable que pour et spécifiera un nombre de lignes avant ou " -"après la ligne donnée par ." +msgstr "Ceci n'est valable que pour et spécifiera un nombre de lignes avant ou après la ligne donnée par ." #. type: Plain text #: en/line-range-format.txt:30 #, priority:260 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." -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." +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." #. type: Plain text #: en/mailmap.txt:6 @@ -57414,15 +58488,7 @@ msgstr "FORMATS AUTOMATIQUES" #: en/pretty-formats.txt:13 #, priority:260 msgid "If the commit is a merge, and if the pretty-format is not 'oneline', 'email' or 'raw', an additional line is inserted before the 'Author:' line. This line begins with \"Merge: \" and the hashes of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the *direct* parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file." -msgstr "" -"Si le commit est une fusion, et si la mise en forme n'est pas 'oneline', " -"'email' ou 'raw', une ligne supplémentaire est insérée avant la ligne " -"'Author:'. Cette ligne commence par \"Merge:\" et les empreintes des " -"commits ancêtres sont affichées, séparées par des espaces. Notez que les " -"commits énumérés ne sont pas nécessairement la liste des commits parents " -"*directs* si vous avez limité votre vue de l'histoire : par exemple, si vous " -"n'êtes intéressé que par les modifications liées à un certain répertoire ou " -"fichier." +msgstr "Si le commit est une fusion, et si la mise en forme n'est pas 'oneline', 'email' ou 'raw', une ligne supplémentaire est insérée avant la ligne 'Author:'. Cette ligne commence par \"Merge:\" et les empreintes des commits ancêtres sont affichées, séparées par des espaces. Notez que les commits énumérés ne sont pas nécessairement la liste des commits parents *directs* si vous avez limité votre vue de l'histoire : par exemple, si vous n'êtes intéressé que par les modifications liées à un certain répertoire ou fichier." #. type: Plain text #: en/pretty-formats.txt:20 @@ -57550,13 +58616,7 @@ msgstr " (, )\n" #: en/pretty-formats.txt:76 #, priority:260 msgid "This format is used to refer to another commit in a commit message and is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, the date is formatted with `--date=short` unless another `--date` option is explicitly specified. As with any `format:` with format placeholders, its output is not affected by other options like `--decorate` and `--walk-reflogs`." -msgstr "" -"Ce format est utilisé pour faire référence à un autre commit dans un message " -"de validation et est le même que `--pretty='format:%C(auto)%h (%s, %ad)'`. " -"Par défaut, la date est formatée avec `--date=short` à moins qu'une autre " -"option `--date` ne soit explicitement spécifiée. Comme pour tout `format:` " -"avec des espaces réservés de format, sa sortie n'est pas affectée par " -"d'autres options comme `--decorate` et `--walk-reflogs`." +msgstr "Ce format est utilisé pour faire référence à un autre commit dans un message de validation et est le même que `--pretty='format:%C(auto)%h (%s, %ad)'`. Par défaut, la date est formatée avec `--date=short` à moins qu'une autre option `--date` ne soit explicitement spécifiée. Comme pour tout `format:` avec des espaces réservés de format, sa sortie n'est pas affectée par d'autres options comme `--decorate` et `--walk-reflogs`." #. type: Plain text #: en/pretty-formats.txt:78 @@ -57588,15 +58648,7 @@ msgstr "'raw'" #: en/pretty-formats.txt:97 #, priority:260 msgid "The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the hashes are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the true parent commits, without taking grafts or history simplification into account. Note that this format affects the way commits are displayed, but not the way the diff is shown e.g. with `git log --raw`. To get full object names in a raw diff format, use `--no-abbrev`." -msgstr "" -"Le format'raw' montre le commit entier telle qu'elle est stockée dans " -"l'objet commit. Notamment, les empreintes sont affichées dans leur " -"intégralité, que --abbrev ou --no-abbrev soient utilisés ou non, et " -"l'information 'parents' indiquent le véritable commit parent, sans tenir " -"compte des greffes ou de la simplification d'historique. Notez que ce format " -"affecte la façon dont les commits sont affichés, mais pas la façon dont la " -"différence est affichée, par exemple avec `git log --raw`. Pour obtenir les " -"noms complets des objets dans un format de diff brut, utilisez `--no-abbrev`." +msgstr "Le format'raw' montre le commit entier telle qu'elle est stockée dans l'objet commit. Notamment, les empreintes sont affichées dans leur intégralité, que --abbrev ou --no-abbrev soient utilisés ou non, et l'information 'parents' indiquent le véritable commit parent, sans tenir compte des greffes ou de la simplification d'historique. Notez que ce format affecte la façon dont les commits sont affichés, mais pas la façon dont la différence est affichée, par exemple avec `git log --raw`. Pour obtenir les noms complets des objets dans un format de diff brut, utilisez `--no-abbrev`." #. type: Plain text #: en/pretty-formats.txt:99 @@ -58014,9 +59066,7 @@ msgstr "'%aL'" #: en/pretty-formats.txt:179 #, priority:260 msgid "author local-part (see '%al') respecting .mailmap, see" -msgstr "" -"partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, " -"voir" +msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir" #. type: Plain text #: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243 @@ -58678,12 +59728,7 @@ msgstr "--pretty[=]" #: en/pretty-options.txt:10 #, priority:260 msgid "Pretty-print the contents of the commit logs in a given format, where '' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw', 'format:' and 'tformat:'. When '' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:' were given." -msgstr "" -"Formater le contenu des journaux de commits dans un format donné, où " -"'' peut être au choix parmi 'oneline', 'short', 'medium', 'full', " -"'fuller', 'reference', 'email', 'raw', 'format:' et 'tformat:" -"'. Lorsque '' n'est rien de ce qui précède, et qu'il contient'%" -"format', il agit comme si '--pretty=tformat:' était donné." +msgstr "Formater le contenu des journaux de commits dans un format donné, où '' peut être au choix parmi 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw', 'format:' et 'tformat:'. Lorsque '' n'est rien de ce qui précède, et qu'il contient'%format', il agit comme si '--pretty=tformat:' était donné." #. type: Plain text #: en/pretty-options.txt:13 @@ -58785,12 +59830,7 @@ msgstr "Par défaut, les notes affichées proviennent des références de notes #: en/pretty-options.txt:75 #, priority:260 msgid "With an optional '' argument, use the ref to find the notes to display. The ref can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref." -msgstr "" -"Avec un argument optionnel'', utiliser la référence pour trouver les " -"notes à afficher. La référence peut spécifier le nom complet de référence " -"quand elle commence par `refs/notes/` ; quand elle commence par `notes/`, `" -"refs/` et sinon `refs/notes/` est préfixé pour former un nom complet de la " -"référence." +msgstr "Avec un argument optionnel'', utiliser la référence pour trouver les notes à afficher. La référence peut spécifier le nom complet de référence quand elle commence par `refs/notes/` ; quand elle commence par `notes/`, `refs/` et sinon `refs/notes/` est préfixé pour former un nom complet de la référence." #. type: Plain text #: en/pretty-options.txt:80 @@ -59703,9 +60743,7 @@ msgstr "Limiter la sortie des commits à ceux dont le message de validation corr #: en/rev-list-options.txt:63 #, priority:260 msgid "When `--notes` is in effect, the message from the notes is matched as if it were part of the log message." -msgstr "" -"Lorsque `notes' est en vigueur, le message des notes est vérifié comme s'il " -"faisait partie du message du journal." +msgstr "Lorsque `notes' est en vigueur, le message des notes est vérifié comme s'il faisait partie du message du journal." #. type: Plain text #: en/rev-list-options.txt:68 @@ -60041,13 +61079,7 @@ msgstr "Au lieu de marcher dans la chaîne des commits ancêtres, parcourir les #: en/rev-list-options.txt:278 #, priority:260 msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:" -msgstr "" -"Avec le format `--pretty` autre que `online` et `reference` (pour des " -"raisons évidentes), cela fait que la sortie a deux lignes supplémentaires " -"d'informations tirées du reflog. L'indicateur de reflog dans la sortie peut " -"être affiché comme `ref@{Nième}` (où `Nième` est l'index chronologique " -"inverse dans le reflog) ou comme `ref@{horodatage}` (avec l'horodatage pour " -"cette entrée), selon quelques règles :" +msgstr "Avec le format `--pretty` autre que `online` et `reference` (pour des raisons évidentes), cela fait que la sortie a deux lignes supplémentaires d'informations tirées du reflog. L'indicateur de reflog dans la sortie peut être affiché comme `ref@{Nième}` (où `Nième` est l'index chronologique inverse dans le reflog) ou comme `ref@{horodatage}` (avec l'horodatage pour cette entrée), selon quelques règles :" #. type: Plain text #: en/rev-list-options.txt:282 @@ -60083,9 +61115,7 @@ msgstr "Sous `--pretty=oneline`, le message de commit est préfixé avec cette i #: en/rev-list-options.txt:298 #, priority:260 msgid "Under `--pretty=reference`, this information will not be shown at all." -msgstr "" -"Sous l'option `--pretty = reference`, ces informations ne seront pas " -"affichées du tout." +msgstr "Sous l'option `--pretty = reference`, ces informations ne seront pas affichées du tout." #. type: Plain text #: en/rev-list-options.txt:302 @@ -61627,9 +62657,7 @@ msgstr "Ces deux syntaxes sont à peu près équivalentes, à part que la premi #: en/urls.txt:58 #, priority:300 msgid "'git clone', 'git fetch' and 'git pull', but not 'git push', will also accept a suitable bundle file. See linkgit:git-bundle[1]." -msgstr "" -"« git clone », « git fetch » et « git pull », mais pas « git push », " -"acceptent également un fichier paquet approprié. Voir linkgit:git-bundle[1]." +msgstr "« git clone », « git fetch » et « git pull », mais pas « git push », acceptent également un fichier paquet approprié. Voir linkgit:git-bundle[1]." #. type: Plain text #: en/urls.txt:63 @@ -61721,6 +62749,7 @@ msgstr "" msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL." msgstr "une URL telle que « git://exemple.org/chemin/vers/le/depot.git » sera réécrite en « ssh://exemple.org/chemin/vers/le/depot.git » pour les poussées, mais les tirages utiliseront encore l'URL originale." +#, ignore-ellipsis #~ msgid "'git checkout' [] [--] ..." #~ msgstr "'git checkout' [] [--] ..." @@ -61739,6 +62768,7 @@ msgstr "une URL telle que « git://exemple.org/chemin/vers/le/depot.git » ser #~ msgid "The optional configuration variable `core.excludesFile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to those in info/exclude. See linkgit:gitignore[5]." #~ msgstr "Le paramètre de configuration optionnel `core.excludesFile` indique un chemin vers un fichier contenant les patrons des noms de fichier à exclure de git-add, similaire à $GIT_DIR/info/exclude. Les patrons dans le fichier d'exclusion sont additionnés à ceux de info/exclude. Référez-vous à linkgit:gitignore[5]." +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" diff --git a/po/documentation.hu.po b/po/documentation.hu.po index 06c7da0e..10da99b3 100644 --- a/po/documentation.hu.po +++ b/po/documentation.hu.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-12-10 22:56+0100\n" "Last-Translator: Matthias Ahauer \n" "Language-Team: LANGUAGE \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -5654,7 +5654,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5666,7 +5666,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5683,7 +5683,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6373,13 +6373,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55605,6 +55605,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.id.po b/po/documentation.id.po index f9ddd842..ed7b0921 100644 --- a/po/documentation.id.po +++ b/po/documentation.id.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -5654,7 +5654,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5666,7 +5666,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5683,7 +5683,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6373,13 +6373,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55605,6 +55605,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.it.po b/po/documentation.it.po index b7c727e2..0bfc54bc 100644 --- a/po/documentation.it.po +++ b/po/documentation.it.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-11-22 20:04+0000\n" "Last-Translator: Francesco Zannino \n" "Language-Team: LANGUAGE \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.10-dev\n" @@ -5657,7 +5657,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5669,7 +5669,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5686,7 +5686,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6364,7 +6364,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6376,13 +6376,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55619,6 +55619,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "Elenca i riferimenti in un repository remoto" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "agisci sui branch remoti tracciati" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.mr.po b/po/documentation.mr.po index 759fffd8..98223f7f 100644 --- a/po/documentation.mr.po +++ b/po/documentation.mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git-manpages-l 10n\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-02-08 19:40+0100\n" "Last-Translator: Jean-Nol Avila \n" "Language-Team: Marathi\n" @@ -5654,7 +5654,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5666,7 +5666,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5683,7 +5683,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6373,13 +6373,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -25241,7 +25241,7 @@ msgstr "" #, no-wrap, priority:100 msgid "" "-- >8 --\n" -"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n" +"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n" msgstr "" #. type: delimited block - @@ -55599,6 +55599,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -55683,49 +56936,49 @@ msgstr "" #. type: Plain text #: en/line-range-format.txt:2 -#, priority:100 +#, priority:260 msgid " and can take one of these forms:" msgstr "" #. type: Plain text #: en/line-range-format.txt:4 -#, priority:100 +#, priority:260 msgid "number" msgstr "" #. type: Plain text #: en/line-range-format.txt:7 -#, priority:100 +#, priority:260 msgid "If or is a number, it specifies an absolute line number (lines count from 1)." msgstr "" #. type: Plain text #: en/line-range-format.txt:10 -#, priority:100 +#, priority:260 msgid "/regex/" msgstr "" #. type: Plain text #: en/line-range-format.txt:17 -#, priority:100 +#, priority:260 msgid "This form will use the first line matching the given POSIX regex. If is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If is ``^/regex/'', it will search from the start of file. If is a regex, it will search starting at the line given by ." msgstr "" #. type: Plain text #: en/line-range-format.txt:20 -#, priority:100 +#, priority:260 msgid "+offset or -offset" msgstr "" #. type: Plain text #: en/line-range-format.txt:23 -#, priority:100 +#, priority:260 msgid "This is only valid for and will specify a number of lines before or after the line given by ." msgstr "" #. type: Plain text #: en/line-range-format.txt:30 -#, priority:100 +#, priority:260 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." msgstr "" diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po index b4b8fb0a..1cb69cce 100644 --- a/po/documentation.nb_NO.po +++ b/po/documentation.nb_NO.po @@ -4,14 +4,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-10-14 23:28+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: nb_NO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb_NO\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -5655,7 +5655,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5667,7 +5667,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5684,7 +5684,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6363,7 +6363,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6375,13 +6375,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55616,6 +55616,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -60701,5 +61954,6 @@ msgstr "" msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL." msgstr "" +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" diff --git a/po/documentation.nl.po b/po/documentation.nl.po index 3e1a6d4b..128ff805 100644 --- a/po/documentation.nl.po +++ b/po/documentation.nl.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-10-31 12:31+0100\n" "Last-Translator: Matthias Ahauer \n" "Language-Team: LANGUAGE \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -5654,7 +5654,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5666,7 +5666,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5683,7 +5683,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6373,13 +6373,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55723,6 +55723,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.pl.po b/po/documentation.pl.po index 9cd8ff9c..363d61ea 100644 --- a/po/documentation.pl.po +++ b/po/documentation.pl.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2019-12-10 22:58+0100\n" "Last-Translator: Matthias Ahauer \n" "Language-Team: LANGUAGE \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -5654,7 +5654,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5666,7 +5666,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5683,7 +5683,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6373,13 +6373,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55605,6 +55605,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.pot b/po/documentation.pot index 96d05628..dd85de58 100644 --- a/po/documentation.pot +++ b/po/documentation.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6024,7 +6024,7 @@ msgid "git-add(1)" msgstr "" #. 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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap msgid "NAME" msgstr "" @@ -6035,7 +6035,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap msgid "SYNOPSIS" msgstr "" @@ -6054,7 +6054,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -6857,7 +6857,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -6870,13 +6870,13 @@ msgid "" msgstr "" #. type: Title - -#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap msgid "GIT" msgstr "" #. type: Plain text -#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -63910,6 +63910,1528 @@ msgid "" "subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, no-wrap +msgid "gitglossary(7)" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:7 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +msgid "" +"linkgit:gittutorial[7], linkgit:gittutorial-2[7], " +"linkgit:gitcvs-migration[7], linkgit:giteveryday[7], " +"link:user-manual.html[The Git User's Manual]" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +msgid "" +"Via the alternates mechanism, a <> can inherit " +"part of its <> from another object " +"database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +msgid "" +"A bare repository is normally an appropriately named " +"<> with a `.git` suffix that does not have a " +"locally checked-out copy of any of the files under revision control. That " +"is, all of the Git administrative and control files that would normally be " +"present in the hidden `.git` sub-directory are directly present in the " +"`repository.git` directory instead, and no other files are present and " +"checked out. Usually publishers of public repositories make bare " +"repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +msgid "" +"A \"branch\" is an active line of development. The most recent " +"<> on a branch is referred to as the tip of that branch. " +"The tip of the branch is referenced by a branch <>, which " +"moves forward as additional development is done on the branch. A single Git " +"<> can track an arbitrary number of branches, but " +"your <> is associated with just one of them " +"(the \"current\" or \"checked out\" branch), and <> points to " +"that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +msgid "" +"A list of objects, where each <> in the list contains a " +"reference to its successor (for example, the successor of a " +"<> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +msgid "" +"BitKeeper/cvsps speak for \"<>\". Since Git does not " +"store changes, but states, it really does not make sense to use the term " +"\"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +msgid "" +"The action of updating all or part of the <> " +"with a <> or <> from the " +"<>, and updating the " +"<> and <> if the whole working tree has been " +"pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +msgid "" +"In <> jargon, \"cherry pick\" means to choose a subset of " +"changes out of a series of changes (typically commits) and record them as a " +"new series of changes on top of a different codebase. In Git, this is " +"performed by the \"git cherry-pick\" command to extract the change " +"introduced by an existing <> and to record it based on " +"the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +msgid "" +"A <> is clean, if it corresponds to the " +"<> referenced by the current <>. Also " +"see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +msgid "" +"As a noun: A single point in the Git history; the entire history of a " +"project is represented as a set of interrelated commits. The word " +"\"commit\" is often used by Git in the same places other revision control " +"systems use the words \"revision\" or \"version\". Also used as a short " +"hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +msgid "" +"As a verb: The action of storing a new snapshot of the project's state in " +"the Git history, by creating a new commit representing the current state of " +"the <> and advancing <> to point at the new " +"commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +msgid "" +"An <> which contains the information about a particular " +"<>, such as <>, committer, " +"author, date and the <> which corresponds to " +"the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +msgid "" +"A <> or an <> that can " +"be recursively dereferenced to a commit object. The following are all " +"commit-ishes: a commit object, a <> that points " +"to a commit object, a tag object that points to a tag object that points to " +"a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +msgid "" +"Fundamental data structures and utilities of Git. Exposes only limited " +"source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +msgid "" +"Directed acyclic graph. The <> form a " +"directed acyclic graph, because they have parents (directed), and the graph " +"of commit objects is acyclic (there is no <> which begins " +"and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +msgid "" +"An <> which is not " +"<> even from other unreachable objects; a dangling " +"object has no references to it from any reference or <> " +"in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +msgid "" +"Normally the <> stores the name of a <>, " +"and commands that operate on the history HEAD represents operate on the " +"history leading to the tip of the branch the HEAD points at. However, Git " +"also allows you to <> an arbitrary " +"<> that isn't necessarily the tip of any particular " +"branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +msgid "" +"Note that commands that operate on the history of the current branch " +"(e.g. `git commit` to build a new history on top of it) still work while the " +"HEAD is detached. They update the HEAD to point at the tip of the updated " +"history without affecting any branch. Commands that update or inquire " +"information _about_ the current branch (e.g. `git branch --set-upstream-to` " +"that sets what remote-tracking branch the current branch integrates with) " +"obviously do not work, as there is no (real) current branch to ask about in " +"this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +msgid "" +"A <> is said to be \"dirty\" if it contains " +"modifications which have not been <> to the current " +"<>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +msgid "" +"An evil merge is a <> that introduces changes that do not " +"appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +msgid "" +"A fast-forward is a special type of <> where you have a " +"<> and you are \"merging\" another " +"<>'s changes that happen to be a descendant of what you " +"have. In such a case, you do not make a new <> " +"<> but instead just update to his revision. This will " +"happen frequently on a <> " +"of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +msgid "" +"Fetching a <> means to get the branch's " +"<> from a remote <>, to " +"find out which objects are missing from the local " +"<>, and to get them, too. See also " +"linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +msgid "" +"Linus Torvalds originally designed Git to be a user space file system, " +"i.e. the infrastructure to hold files and directories. That ensured the " +"efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +msgid "" +"A plain file `.git` at the root of a working tree that points at the " +"directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +msgid "" +"Grafts enables two otherwise different lines of development to be joined " +"together by recording fake ancestry information for commits. This way you " +"can make Git pretend the set of <> a " +"<> has is different from what was recorded when the " +"commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +msgid "" +"Note that the grafts mechanism is outdated and can lead to problems " +"transferring objects between repositories; see linkgit:git-replace[1] for a " +"more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +msgid "" +"A <> to the <> at the tip of a " +"<>. Heads are stored in a file in `$GIT_DIR/refs/heads/` " +"directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +msgid "" +"The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by " +"HEAD. HEAD is a reference to one of the <> in your " +"repository, except when using a <>, in " +"which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +msgid "" +"During the normal execution of several Git commands, call-outs are made to " +"optional scripts that allow a developer to add functionality or " +"checking. Typically, the hooks allow for a command to be pre-verified and " +"potentially aborted, and allow for a post-notification after the operation " +"is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and " +"are enabled by simply removing the `.sample` suffix from the filename. In " +"earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +msgid "" +"A collection of files with stat information, whose contents are stored as " +"objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third " +"version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +msgid "" +"The information regarding a particular file, stored in the " +"<>. An index entry can be unmerged, if a " +"<> was started, but not yet finished (i.e. if the index " +"contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +msgid "" +"The default development <>. Whenever you create a Git " +"<>, a branch named \"master\" is created, and " +"becomes the active branch. In most cases, this contains the local " +"development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +msgid "" +"As a verb: To bring the contents of another <> (possibly " +"from an external <>) into the current branch. In " +"the case where the merged-in branch is from a different repository, this is " +"done by first <> the remote branch and then merging the " +"result into the current branch. This combination of fetch and merge " +"operations is called a <>. Merging is performed by an " +"automatic process that identifies changes made since the branches diverged, " +"and then applies all those changes together. In cases where changes " +"conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +msgid "" +"As a noun: unless it is a <>, a successful " +"merge results in the creation of a new <> representing " +"the result of the merge, and having as <> the tips of " +"the merged <>. This commit is referred to as a \"merge " +"commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +msgid "" +"The unit of storage in Git. It is uniquely identified by the " +"<> of its contents. Consequently, an object cannot be " +"changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +msgid "" +"Stores a set of \"objects\", and an individual <> is " +"identified by its <>. The objects usually live " +"in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +msgid "" +"The unique identifier of an <>. The object name is " +"usually represented by a 40 character hexadecimal string. Also colloquially " +"called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +msgid "" +"One of the identifiers \"<>\", " +"\"<>\", \"<>\" or " +"\"<>\" describing the type of an " +"<>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +msgid "" +"The default upstream <>. Most projects have at " +"least one upstream project which they track. By default 'origin' is used for " +"that purpose. New upstream updates will be fetched into " +"<> named " +"origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +msgid "" +"Only update and add files to the working directory, but don't delete them, " +"similar to how 'cp -R' would update the contents in the destination " +"directory. This is the default mode in a <> when " +"checking out files from the <> or a " +"<>. In contrast, no-overlay mode also deletes " +"tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +msgid "" +"A set of objects which have been compressed into one file (to save space or " +"to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +msgid "" +"The list of identifiers, and other information, of the objects in a " +"<>, to assist in efficiently accessing the contents of a " +"pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +msgid "" +"Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", " +"\"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other " +"commands to limit the scope of operations to some subset of the tree or " +"worktree. See the documentation of each command for whether paths are " +"relative to the current directory or toplevel. The pathspec syntax is as " +"follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +msgid "" +"the pathspec up to the last slash represents a directory prefix. The scope " +"of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +msgid "" +"the rest of the pathspec is a pattern for the remainder of the pathname. " +"Paths relative to the directory prefix will be matched against that pattern " +"using fnmatch(3); in particular, '*' and '?' _can_ match directory " +"separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +msgid "" +"For example, Documentation/*.jpg will match all .jpg files in the " +"Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +msgid "" +"A pathspec that begins with a colon `:` has special meaning. In the short " +"form, the leading colon `:` is followed by zero or more \"magic signature\" " +"letters (which optionally is terminated by another colon `:`), and the " +"remainder is the pattern to match against the path. The \"magic signature\" " +"consists of ASCII symbols that are neither alphanumeric, glob, regex special " +"characters nor colon. The optional colon that terminates the \"magic " +"signature\" can be omitted if the pattern begins with a character that does " +"not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +msgid "" +"In the long form, the leading colon `:` is followed by an open parenthesis " +"`(`, a comma-separated list of zero or more \"magic words\", and a close " +"parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +msgid "" +"A pathspec with only a colon means \"there is no pathspec\". This form " +"should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, no-wrap +msgid "top" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:359 +msgid "" +"The magic word `top` (magic signature: `/`) makes the pattern match from the " +"root of the working tree, even when you are running the command from inside " +"a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, no-wrap +msgid "literal" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:363 +msgid "" +"Wildcards in the pattern such as `*` or `?` are treated as literal " +"characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, no-wrap +msgid "glob" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:374 +msgid "" +"Git treats the pattern as a shell glob suitable for consumption by " +"fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not " +"match a / in the pathname. For example, \"Documentation/{asterisk}.html\" " +"matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or " +"\"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +msgid "" +"Two consecutive asterisks (\"`**`\") in patterns matched against full " +"pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +msgid "" +"A leading \"`**`\" followed by a slash means match in all directories. For " +"example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same " +"as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" " +"anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +msgid "" +"A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" " +"matches all files inside directory \"abc\", relative to the location of the " +"`.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +msgid "" +"A slash followed by two consecutive asterisks then a slash matches zero or " +"more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", " +"\"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +msgid "" +"After `attr:` comes a space separated list of \"attribute requirements\", " +"all of which must be met in order for the path to be considered a match; " +"this is in addition to the usual non-magic pathspec pattern matching. See " +"linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +msgid "" +"\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string " +"`VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +msgid "" +"Note that when matching against a tree object, attributes are still obtained " +"from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, no-wrap +msgid "exclude" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:425 +msgid "" +"After a path matches any non-exclude pathspec, it will be run through all " +"exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, " +"the path is ignored. When there is no non-exclude pathspec, the exclusion " +"is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +msgid "" +"A <> contains a (possibly empty) list of " +"the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +msgid "" +"The term <> refers to an option to the diffcore " +"routines that help select changes that add or delete a given text " +"string. With the `--pickaxe-all` option, it can be used to view the full " +"<> that introduced or removed, say, a particular " +"line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +msgid "" +"Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of " +"a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +msgid "" +"Refs that are per-<>, rather than global. This " +"is presently only <> and any refs that start with " +"`refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +msgid "" +"Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for " +"the purposes of rev-parse, but which are treated specially by git. " +"Pseudorefs both have names that are all-caps, and always start with a line " +"consisting of a <> followed by whitespace. So, HEAD is not " +"a pseudoref, because it is sometimes a symbolic ref. They might optionally " +"contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are " +"examples. Unlike <>, these files " +"cannot be symbolic refs, and never have reflogs. They also cannot be " +"updated through the normal ref update machinery. Instead, they are updated " +"by directly writing to the files. However, they can be read as if they were " +"refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +msgid "" +"Pulling a <> means to <> it and " +"<> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +msgid "" +"Pushing a <> means to get the branch's " +"<> from a remote <>, find " +"out if it is an ancestor to the branch's local head ref, and in that case, " +"putting all objects, which are <> from the local " +"head ref, and which are missing from the remote repository, into the remote " +"<>, and updating the remote head " +"ref. If the remote <> is not an ancestor to the local head, " +"the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +msgid "" +"All of the ancestors of a given <> are said to be " +"\"reachable\" from that commit. More generally, one <> is " +"reachable from another if we can reach the one from the other by a " +"<> that follows <> to whatever they tag, " +"<> to their parents or trees, and " +"<> to the trees or <> that " +"they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +msgid "" +"To reapply a series of changes from a <> to a different " +"base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +msgid "" +"A name that begins with `refs/` (e.g. `refs/heads/master`) that points to " +"an <> or another ref (the latter is called a " +"<>). For convenience, a ref can sometimes be " +"abbreviated when used as an argument to a Git command; see " +"linkgit:gitrevisions[7] for details. Refs are stored in the " +"<>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +msgid "" +"The ref namespace is hierarchical. Different subhierarchies are used for " +"different purposes (e.g. the `refs/heads/` hierarchy is used to represent " +"local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +msgid "" +"There are a few special-purpose refs that do not begin with `refs/`. The " +"most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +msgid "" +"A reflog shows the local \"history\" of a ref. In other words, it can tell " +"you what the 3rd last revision in _this_ repository was, and what was the " +"current state in _this_ repository, yesterday 9:14pm. See " +"linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +msgid "" +"A \"refspec\" is used by <> and <> to " +"describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +msgid "" +"A <> which is used to track the same project but " +"resides somewhere else. To communicate with remotes, see <> " +"or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +msgid "" +"A <> that is used to follow changes from another " +"<>. It typically looks like " +"'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a " +"remote named 'foo'), and matches the right-hand-side of a configured fetch " +"<>. A remote-tracking branch should not contain direct " +"modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +msgid "" +"A collection of <> together with an " +"<> containing all objects which are " +"<> from the refs, possibly accompanied by meta data " +"from one or more <>. A repository can share an " +"object database with other repositories via " +"<>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +msgid "" +"The action of fixing up manually what a failed automatic <> " +"left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +msgid "" +"To throw away part of the development, i.e. to assign the <> " +"to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +msgid "" +"\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context " +"of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +msgid "" +"Mostly a synonym to <> but the " +"phrase makes it more explicit that it was created by running `git clone " +"--depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +msgid "" +"A shallow <> has an incomplete history some of " +"whose <> have <> cauterized away (in " +"other words, Git is told to pretend that these commits do not have the " +"parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the " +"recent history of a project even though the real history recorded in the " +"upstream is much larger. A shallow repository is created by giving the " +"`--depth` option to linkgit:git-clone[1], and its history can be later " +"deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +msgid "" +"An <> used to temporarily store the contents of a " +"<> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +msgid "" +"A <> that holds the history of a separate project " +"inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +msgid "" +"A <> that references repositories of other " +"projects in its working tree as <>. The " +"superproject knows about the names of (but does not hold copies of) commit " +"objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +msgid "" +"Symbolic reference: instead of containing the <> id itself, " +"it is of the format 'ref: refs/some/thing' and when referenced, it " +"recursively dereferences to this reference. '<>' is a prime " +"example of a symref. Symbolic references are manipulated with the " +"linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +msgid "" +"A <> under `refs/tags/` namespace that points to an object of " +"an arbitrary type (typically a tag points to either a <> " +"or a <>). In contrast to a " +"<>, a tag is not updated by the `commit` command. A Git tag " +"has nothing to do with a Lisp tag (which would be called an " +"<> in Git's context). A tag is most typically " +"used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +msgid "" +"An <> containing a <> pointing to another " +"object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called " +"a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +msgid "" +"A regular Git <> that is used by a developer to identify " +"a conceptual line of development. Since branches are very easy and " +"inexpensive, it is often desirable to have several small branches that each " +"contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +msgid "" +"Either a <>, or a <> together with the dependent <> and tree " +"objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +msgid "" +"An <> containing a list of file names and modes along " +"with refs to the associated blob and/or tree objects. A <> is " +"equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +msgid "" +"A <> or an <> that can be " +"recursively dereferenced to a tree object. Dereferencing a " +"<> yields the tree object corresponding to " +"the <>'s top <>. The " +"following are all tree-ishes: a <>, a tree " +"object, a <> that points to a tree object, a tag " +"object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +msgid "" +"An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +msgid "" +"An <> which is not <> from a " +"<>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +msgid "" +"The default <> that is merged into the branch in question " +"(or the branch in question is rebased onto). It is configured via " +"branch..remote and branch..merge. If the upstream branch of 'A' " +"is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +msgid "" +"The tree of actual checked out files. The working tree normally contains " +"the contents of the <> commit's tree, plus any local changes " +"that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 msgid "Git is to some extent character encoding agnostic." diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po index 5473e833..0ffaaf70 100644 --- a/po/documentation.pt_BR.po +++ b/po/documentation.pt_BR.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-01-02 15:21+0000\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: none\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 3.10\n" @@ -5844,7 +5844,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "NOME" @@ -5856,7 +5856,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "SINOPSE" @@ -5882,7 +5882,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "DESCRIÇÃO" @@ -6578,7 +6578,7 @@ msgid "modifying the contents of context or removal lines" msgstr "modificando o conteúdo do contexto ou linhas de remoção" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 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" @@ -6590,13 +6590,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "Parte do linkgit:git[1] suite" @@ -56147,6 +56147,1260 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "Includes" +msgid "exclude" +msgstr "Inclui" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, fuzzy, no-wrap, priority:100 +#| msgid "List references in a remote repository." +msgid "[[def_remote]]remote repository" +msgstr "Lista as referências em um repositório remoto." + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -61269,5 +62523,6 @@ msgstr "" #~ msgid "In addition to those found in .gitignore (per directory) and $GIT_DIR/info/exclude, also consider these patterns to be in the set of the ignore rules in effect." #~ msgstr "Além dos encontrados em .gitignore (por diretório) e $GIT_DIR/info/excluir, considere também que esses padrões estejam no conjunto das regras de ignorar em vigor." +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po index 9b41358e..20862723 100644 --- a/po/documentation.pt_PT.po +++ b/po/documentation.pt_PT.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-02-08 19:43+0100\n" "Last-Translator: Matthias Ahauer \n" "Language-Team: pt_PT\n" +"Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_PT\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 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 @@ -5654,7 +5654,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5666,7 +5666,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5683,7 +5683,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6361,7 +6361,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6373,13 +6373,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -25244,7 +25244,7 @@ msgstr "" #, no-wrap, priority:100 msgid "" "-- >8 --\n" -"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n" +"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n" msgstr "" #. type: delimited block - @@ -55604,6 +55604,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.ru.po b/po/documentation.ru.po index 0b77494d..338d88df 100644 --- a/po/documentation.ru.po +++ b/po/documentation.ru.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-01-19 20:55+0000\n" "Last-Translator: Golubev Alexander \n" "Language-Team: LANGUAGE \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 3.11-dev\n" @@ -5657,7 +5657,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "НАЗВАНИЕ" @@ -5669,7 +5669,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5686,7 +5686,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "ОПИСАНИЕ" @@ -6365,7 +6365,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "СМОТРИ ТАКЖЕ" @@ -6377,13 +6377,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55635,6 +55635,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "Вывод списка ссылок во внешнем репозитории" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, fuzzy, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "выполнить действия на отслеживаемых внешних ветках" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -60719,6 +61972,7 @@ msgstr "" msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL." msgstr "" +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" diff --git a/po/documentation.tr.po b/po/documentation.tr.po index 2c26e1e4..ca33bba3 100644 --- a/po/documentation.tr.po +++ b/po/documentation.tr.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-01-18 19:51+0100\n" "Last-Translator: Matthias Ahauer \n" "Language-Team: LANGUAGE \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.10\n" @@ -5656,7 +5656,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5668,7 +5668,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" @@ -5685,7 +5685,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -6363,7 +6363,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6375,13 +6375,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55606,6 +55606,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 7dda4ab1..1c784d35 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-01-24 01:21+0000\n" "Last-Translator: 吴洪明 \n" "Language-Team: LANGUAGE \n" +"Language: zh_HANS-CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_HANS-CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 3.11-dev\n" @@ -5657,7 +5657,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "名称" @@ -5669,7 +5669,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "概述" @@ -5695,7 +5695,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "描述" @@ -6374,7 +6374,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6386,13 +6386,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55629,6 +55629,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po index 8354c5c6..c4eb67d0 100644 --- a/po/documentation.zh_HANT.po +++ b/po/documentation.zh_HANT.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2020-01-28 19:39+0100\n" +"POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-01-28 18:51+0000\n" "Last-Translator: Pango \n" "Language-Team: French\n" +"Language: zh_HANT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_HANT\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Weblate 3.11-dev\n" @@ -5658,7 +5658,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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 +#: en/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-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5670,7 +5670,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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 +#: en/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-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "格式" @@ -5687,7 +5687,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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 +#: 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-bundle.txt:18 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:22 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:19 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:35 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:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 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:24 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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "說明" @@ -6366,7 +6366,7 @@ msgid "modifying the contents of context or removal lines" msgstr "" #. type: Title - -#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 +#: en/git-add.txt:428 en/git-am.txt:240 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:113 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:118 en/git-commit.txt:504 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:114 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 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:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:184 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:293 en/git-status.txt:438 en/git-submodule.txt:447 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:942 en/git-update-index.txt:553 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18 #, no-wrap, priority:300 msgid "SEE ALSO" msgstr "" @@ -6378,13 +6378,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:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 en/git-write-tree.txt:41 +#: en/git-add.txt:437 en/git-am.txt:244 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:119 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:242 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:342 en/git-column.txt:78 en/git-commit-tree.txt:122 en/git-commit.txt:512 en/git-config.txt:494 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:105 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:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1545 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:710 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:351 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:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:238 en/git-ls-files.txt:249 en/git-ls-remote.txt:118 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:371 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:262 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1075 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:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:496 en/git-restore.txt:206 en/git-revert.txt:141 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:188 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:301 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:451 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:950 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:559 en/git-update-ref.txt:151 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:381 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:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 +#: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 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:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 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:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 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:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 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:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" @@ -55623,6 +55623,1259 @@ msgstr "" msgid "Writes a tree object that represents a subdirectory ``. This can be used to write the tree object for a subproject that is in the named subdirectory." msgstr "" +#. type: Title = +#: en/gitglossary.txt:2 +#, ignore-same, no-wrap, priority:100 +msgid "gitglossary(7)" +msgstr "gitglossary(7)" + +#. type: Plain text +#: en/gitglossary.txt:7 +#, priority:100 +msgid "gitglossary - A Git Glossary" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:11 +#, no-wrap, priority:100 +msgid "*\n" +msgstr "" + +#. type: Plain text +#: en/gitglossary.txt:24 +#, fuzzy, priority:100 +#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" +msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" + +#. type: Labeled list +#: en/glossary-content.txt:1 +#, no-wrap, priority:100 +msgid "[[def_alternate_object_database]]alternate object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:5 +#, priority:100 +msgid "Via the alternates mechanism, a <> can inherit part of its <> from another object database, which is called an \"alternate\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:6 +#, no-wrap, priority:100 +msgid "[[def_bare_repository]]bare repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:16 +#, priority:100 +msgid "A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:17 +#, no-wrap, priority:100 +msgid "[[def_blob_object]]blob object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:19 +#, priority:100 +msgid "Untyped <>, e.g. the contents of a file." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:20 +#, no-wrap, priority:100 +msgid "[[def_branch]]branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:30 +#, priority:100 +msgid "A \"branch\" is an active line of development. The most recent <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:31 +#, no-wrap, priority:100 +msgid "[[def_cache]]cache" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:33 +#, priority:100 +msgid "Obsolete for: <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:34 +#, no-wrap, priority:100 +msgid "[[def_chain]]chain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:38 +#, priority:100 +msgid "A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a <> could be one of its <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:39 +#, no-wrap, priority:100 +msgid "[[def_changeset]]changeset" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:43 +#, priority:100 +msgid "BitKeeper/cvsps speak for \"<>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:44 +#, no-wrap, priority:100 +msgid "[[def_checkout]]checkout" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:51 +#, priority:100 +msgid "The action of updating all or part of the <> with a <> or <> from the <>, and updating the <> and <> if the whole working tree has been pointed at a new <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:52 +#, no-wrap, priority:100 +msgid "[[def_cherry-picking]]cherry-picking" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:59 +#, priority:100 +msgid "In <> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <> and to record it based on the tip of the current <> as a new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:60 +#, no-wrap, priority:100 +msgid "[[def_clean]]clean" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:64 +#, priority:100 +msgid "A <> is clean, if it corresponds to the <> referenced by the current <>. Also see \"<>\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:65 +#, no-wrap, priority:100 +msgid "[[def_commit]]commit" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:72 +#, priority:100 +msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:77 +#, priority:100 +msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:78 +#, no-wrap, priority:100 +msgid "[[def_commit_object]]commit object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:84 +#, priority:100 +msgid "An <> which contains the information about a particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored revision." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:85 +#, no-wrap, priority:100 +msgid "[[def_commit-ish]]commit-ish (also committish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:96 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:97 +#, no-wrap, priority:100 +msgid "[[def_core_git]]core Git" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:100 +#, priority:100 +msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:101 +#, no-wrap, priority:100 +msgid "[[def_DAG]]DAG" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:106 +#, priority:100 +msgid "Directed acyclic graph. The <> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <> which begins and ends with the same <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:107 +#, no-wrap, priority:100 +msgid "[[def_dangling_object]]dangling object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:112 +#, priority:100 +msgid "An <> which is not <> even from other unreachable objects; a dangling object has no references to it from any reference or <> in the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:113 +#, no-wrap, priority:100 +msgid "[[def_detached_HEAD]]detached HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:122 +#, priority:100 +msgid "Normally the <> stores the name of a <>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:131 +#, priority:100 +msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:132 +#, no-wrap, priority:100 +msgid "[[def_directory]]directory" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:134 +#, priority:100 +msgid "The list you get with \"ls\" :-)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:135 +#, no-wrap, priority:100 +msgid "[[def_dirty]]dirty" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:139 +#, priority:100 +msgid "A <> is said to be \"dirty\" if it contains modifications which have not been <> to the current <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:140 +#, no-wrap, priority:100 +msgid "[[def_evil_merge]]evil merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:143 +#, priority:100 +msgid "An evil merge is a <> that introduces changes that do not appear in any <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:144 +#, no-wrap, priority:100 +msgid "[[def_fast_forward]]fast-forward" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:153 +#, priority:100 +msgid "A fast-forward is a special type of <> where you have a <> and you are \"merging\" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:154 +#, no-wrap, priority:100 +msgid "[[def_fetch]]fetch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:160 +#, priority:100 +msgid "Fetching a <> means to get the branch's <> from a remote <>, to find out which objects are missing from the local <>, and to get them, too. See also linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:161 +#, no-wrap, priority:100 +msgid "[[def_file_system]]file system" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:165 +#, priority:100 +msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:166 +#, no-wrap, priority:100 +msgid "[[def_git_archive]]Git archive" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:168 +#, priority:100 +msgid "Synonym for <> (for arch people)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:169 +#, no-wrap, priority:100 +msgid "[[def_gitfile]]gitfile" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:172 +#, priority:100 +msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:173 +#, no-wrap, priority:100 +msgid "[[def_grafts]]grafts" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:179 +#, priority:100 +msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:183 +#, priority:100 +msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:184 +#, no-wrap, priority:100 +msgid "[[def_hash]]hash" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:186 +#, priority:100 +msgid "In Git's context, synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:187 +#, no-wrap, priority:100 +msgid "[[def_head]]head" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:192 +#, priority:100 +msgid "A <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:193 +#, no-wrap, priority:100 +msgid "[[def_HEAD]]HEAD" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:200 +#, priority:100 +msgid "The current <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a <>, in which case it directly references an arbitrary commit." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:201 +#, no-wrap, priority:100 +msgid "[[def_head_ref]]head ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:203 +#, priority:100 +msgid "A synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:204 +#, no-wrap, priority:100 +msgid "[[def_hook]]hook" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:213 +#, priority:100 +msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:214 +#, no-wrap, priority:100 +msgid "[[def_index]]index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:220 +#, priority:100 +msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:221 +#, no-wrap, priority:100 +msgid "[[def_index_entry]]index entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:226 +#, priority:100 +msgid "The information regarding a particular file, stored in the <>. An index entry can be unmerged, if a <> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:227 +#, no-wrap, priority:100 +msgid "[[def_master]]master" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:233 +#, priority:100 +msgid "The default development <>. Whenever you create a Git <>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:234 +#, no-wrap, priority:100 +msgid "[[def_merge]]merge" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:247 +#, priority:100 +msgid "As a verb: To bring the contents of another <> (possibly from an external <>) into the current branch. In the case where the merged-in branch is from a different repository, this is done by first <> the remote branch and then merging the result into the current branch. This combination of fetch and merge operations is called a <>. Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. In cases where changes conflict, manual intervention may be required to complete the merge." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:254 +#, priority:100 +msgid "As a noun: unless it is a <>, a successful merge results in the creation of a new <> representing the result of the merge, and having as <> the tips of the merged <>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:255 +#, no-wrap, priority:100 +msgid "[[def_object]]object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:259 +#, priority:100 +msgid "The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object cannot be changed." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:260 +#, no-wrap, priority:100 +msgid "[[def_object_database]]object database" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:264 +#, priority:100 +msgid "Stores a set of \"objects\", and an individual <> is identified by its <>. The objects usually live in `$GIT_DIR/objects/`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:265 +#, no-wrap, priority:100 +msgid "[[def_object_identifier]]object identifier" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:267 +#, priority:100 +msgid "Synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:268 +#, no-wrap, priority:100 +msgid "[[def_object_name]]object name" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:272 +#, priority:100 +msgid "The unique identifier of an <>. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:273 +#, no-wrap, priority:100 +msgid "[[def_object_type]]object type" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:278 +#, priority:100 +msgid "One of the identifiers \"<>\", \"<>\", \"<>\" or \"<>\" describing the type of an <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:279 +#, no-wrap, priority:100 +msgid "[[def_octopus]]octopus" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:281 +#, priority:100 +msgid "To <> more than two <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:282 +#, no-wrap, priority:100 +msgid "[[def_origin]]origin" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:289 +#, priority:100 +msgid "The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:290 +#, no-wrap, priority:100 +msgid "[[def_overlay]]overlay" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:298 +#, priority:100 +msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <> when checking out files from the <> or a <>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:299 +#, no-wrap, priority:100 +msgid "[[def_pack]]pack" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:302 +#, priority:100 +msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:303 +#, no-wrap, priority:100 +msgid "[[def_pack_index]]pack index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:307 +#, priority:100 +msgid "The list of identifiers, and other information, of the objects in a <>, to assist in efficiently accessing the contents of a pack." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:308 +#, no-wrap, priority:100 +msgid "[[def_pathspec]]pathspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:310 +#, priority:100 +msgid "Pattern used to limit paths in Git commands." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:318 +#, priority:100 +msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:322 +#, priority:100 +msgid "any path matches itself" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:325 +#, priority:100 +msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:329 +#, priority:100 +msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:335 +#, priority:100 +msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:345 +#, priority:100 +msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:350 +#, priority:100 +msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:353 +#, priority:100 +msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:355 +#, fuzzy, no-wrap, priority:100 +#| msgid "--stop" +msgid "top" +msgstr "--stop" + +#. type: Plain text +#: en/glossary-content.txt:359 +#, priority:100 +msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:360 +#, fuzzy, no-wrap, priority:100 +#| msgid "--literally" +msgid "literal" +msgstr "--literally" + +#. type: Plain text +#: en/glossary-content.txt:363 +#, priority:100 +msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:364 +#, no-wrap, priority:100 +msgid "icase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:366 +#, priority:100 +msgid "Case insensitive match." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:367 +#, fuzzy, no-wrap, priority:100 +#| msgid "--global" +msgid "glob" +msgstr "--global" + +#. type: Plain text +#: en/glossary-content.txt:374 +#, priority:100 +msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:377 +#, priority:100 +msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:383 +#, priority:100 +msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:387 +#, priority:100 +msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:391 +#, priority:100 +msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:393 +#, priority:100 +msgid "Other consecutive asterisks are considered invalid." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:395 +#, priority:100 +msgid "Glob magic is incompatible with literal magic." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:396 +#, no-wrap, priority:100 +msgid "attr" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:402 +#, priority:100 +msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:405 +#, priority:100 +msgid "Each of the attribute requirements for the path takes one of these forms:" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:407 +#, priority:100 +msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:409 +#, priority:100 +msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:412 +#, priority:100 +msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:415 +#, priority:100 +msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:418 +#, priority:100 +msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:419 +#, fuzzy, no-wrap, priority:100 +#| msgid "--include" +msgid "exclude" +msgstr "--include" + +#. type: Plain text +#: en/glossary-content.txt:425 +#, priority:100 +msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:427 +#, no-wrap, priority:100 +msgid "[[def_parent]]parent" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:431 +#, priority:100 +msgid "A <> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:432 +#, no-wrap, priority:100 +msgid "[[def_pickaxe]]pickaxe" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:438 +#, priority:100 +msgid "The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:439 +#, no-wrap, priority:100 +msgid "[[def_plumbing]]plumbing" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:441 +#, priority:100 +msgid "Cute name for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:442 +#, no-wrap, priority:100 +msgid "[[def_porcelain]]porcelain" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:447 +#, priority:100 +msgid "Cute name for programs and program suites depending on <>, presenting a high level access to core Git. Porcelains expose more of a <> interface than the <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:448 +#, no-wrap, priority:100 +msgid "[[def_per_worktree_ref]]per-worktree ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:453 +#, priority:100 +msgid "Refs that are per-<>, rather than global. This is presently only <> and any refs that start with `refs/bisect/`, but might later include other unusual refs." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:454 +#, no-wrap, priority:100 +msgid "[[def_pseudoref]]pseudoref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:469 +#, priority:100 +msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:470 +#, no-wrap, priority:100 +msgid "[[def_pull]]pull" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:473 +#, priority:100 +msgid "Pulling a <> means to <> it and <> it. See also linkgit:git-pull[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:474 +#, no-wrap, priority:100 +msgid "[[def_push]]push" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:485 +#, priority:100 +msgid "Pushing a <> means to get the branch's <> from a remote <>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote <>, and updating the remote head ref. If the remote <> is not an ancestor to the local head, the push fails." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:486 +#, no-wrap, priority:100 +msgid "[[def_reachable]]reachable" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:495 +#, priority:100 +msgid "All of the ancestors of a given <> are said to be \"reachable\" from that commit. More generally, one <> is reachable from another if we can reach the one from the other by a <> that follows <> to whatever they tag, <> to their parents or trees, and <> to the trees or <> that they contain." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:496 +#, no-wrap, priority:100 +msgid "[[def_rebase]]rebase" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:500 +#, priority:100 +msgid "To reapply a series of changes from a <> to a different base, and reset the <> of that branch to the result." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:501 +#, no-wrap, priority:100 +msgid "[[def_ref]]ref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:509 +#, priority:100 +msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <> or another ref (the latter is called a <>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <>." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:513 +#, priority:100 +msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:516 +#, priority:100 +msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:517 +#, no-wrap, priority:100 +msgid "[[def_reflog]]reflog" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:522 +#, priority:100 +msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:523 +#, no-wrap, priority:100 +msgid "[[def_refspec]]refspec" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:527 +#, priority:100 +msgid "A \"refspec\" is used by <> and <> to describe the mapping between remote <> and local ref." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:528 +#, no-wrap, priority:100 +msgid "[[def_remote]]remote repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:532 +#, priority:100 +msgid "A <> which is used to track the same project but resides somewhere else. To communicate with remotes, see <> or <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:533 +#, no-wrap, priority:100 +msgid "[[def_remote_tracking_branch]]remote-tracking branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:541 +#, priority:100 +msgid "A <> that is used to follow changes from another <>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <>. A remote-tracking branch should not contain direct modifications or have local commits made to it." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:542 +#, no-wrap, priority:100 +msgid "[[def_repository]]repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:549 +#, priority:100 +msgid "A collection of <> together with an <> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more <>. A repository can share an object database with other repositories via <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:550 +#, no-wrap, priority:100 +msgid "[[def_resolve]]resolve" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:553 +#, priority:100 +msgid "The action of fixing up manually what a failed automatic <> left behind." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:554 +#, no-wrap, priority:100 +msgid "[[def_revision]]revision" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:556 +#, priority:100 +msgid "Synonym for <> (the noun)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:557 +#, no-wrap, priority:100 +msgid "[[def_rewind]]rewind" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:560 +#, priority:100 +msgid "To throw away part of the development, i.e. to assign the <> to an earlier <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:561 +#, no-wrap, priority:100 +msgid "[[def_SCM]]SCM" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:563 +#, priority:100 +msgid "Source code management (tool)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:564 +#, no-wrap, priority:100 +msgid "[[def_SHA1]]SHA-1" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:567 +#, priority:100 +msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:568 +#, no-wrap, priority:100 +msgid "[[def_shallow_clone]]shallow clone" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:572 +#, ignore-ellipsis, priority:100 +msgid "Mostly a synonym to <> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:573 +#, no-wrap, priority:100 +msgid "[[def_shallow_repository]]shallow repository" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:583 +#, priority:100 +msgid "A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:584 +#, no-wrap, priority:100 +msgid "[[def_stash]]stash entry" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:587 +#, priority:100 +msgid "An <> used to temporarily store the contents of a <> working directory and the index for future reuse." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:588 +#, no-wrap, priority:100 +msgid "[[def_submodule]]submodule" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:592 +#, priority:100 +msgid "A <> that holds the history of a separate project inside another repository (the latter of which is called <>)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:593 +#, no-wrap, priority:100 +msgid "[[def_superproject]]superproject" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:598 +#, priority:100 +msgid "A <> that references repositories of other projects in its working tree as <>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:599 +#, no-wrap, priority:100 +msgid "[[def_symref]]symref" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:606 +#, priority:100 +msgid "Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:607 +#, no-wrap, priority:100 +msgid "[[def_tag]]tag" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:616 +#, priority:100 +msgid "A <> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:617 +#, no-wrap, priority:100 +msgid "[[def_tag_object]]tag object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:622 +#, priority:100 +msgid "An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:623 +#, no-wrap, priority:100 +msgid "[[def_topic_branch]]topic branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:629 +#, priority:100 +msgid "A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:630 +#, no-wrap, priority:100 +msgid "[[def_tree]]tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:634 +#, priority:100 +msgid "Either a <>, or a <> together with the dependent <> and tree objects (i.e. a stored representation of a working tree)." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:635 +#, no-wrap, priority:100 +msgid "[[def_tree_object]]tree object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:639 +#, priority:100 +msgid "An <> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <> is equivalent to a <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:640 +#, no-wrap, priority:100 +msgid "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:653 +#, priority:100 +msgid "A <> or an <> that can be recursively dereferenced to a tree object. Dereferencing a <> yields the tree object corresponding to the <>'s top <>. The following are all tree-ishes: a <>, a tree object, a <> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:654 +#, no-wrap, priority:100 +msgid "[[def_unmerged_index]]unmerged index" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:657 +#, priority:100 +msgid "An <> which contains unmerged <>." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:658 +#, no-wrap, priority:100 +msgid "[[def_unreachable_object]]unreachable object" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:661 +#, priority:100 +msgid "An <> which is not <> from a <>, <>, or any other reference." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:662 +#, no-wrap, priority:100 +msgid "[[def_upstream_branch]]upstream branch" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:667 +#, priority:100 +msgid "The default <> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch..remote and branch..merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." +msgstr "" + +#. type: Labeled list +#: en/glossary-content.txt:668 +#, no-wrap, priority:100 +msgid "[[def_working_tree]]working tree" +msgstr "" + +#. type: Plain text +#: en/glossary-content.txt:671 +#, priority:100 +msgid "The tree of actual checked out files. The working tree normally contains the contents of the <> commit's tree, plus any local changes that you have made but not yet committed." +msgstr "" + #. type: Plain text #: en/i18n.txt:2 #, priority:280 @@ -60709,5 +61962,6 @@ msgstr "" msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL." msgstr "" +#, ignore-same #~ msgid "git-remote-testgit(1)" #~ msgstr "git-remote-testgit(1)" diff --git a/sources.txt b/sources.txt index 28f83410..fe372c0b 100644 --- a/sources.txt +++ b/sources.txt @@ -165,6 +165,8 @@ git-web--browse.txt git-whatchanged.txt git-worktree.txt git-write-tree.txt +gitglossary.txt +glossary-content.txt i18n.txt line-range-format.txt mailmap.txt