summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shopov <ash@kambanaria.org>2014-01-15 11:07:57 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2014-01-18 16:32:09 (GMT)
commit15a745305f04d4ee0704c37b06891b19020dc7f1 (patch)
tree3f725071f51ac4de050df3ba1c89ef0da0f014cb
parent99337ef22ca013758dd243e06b10c6851b786e87 (diff)
downloadgit-15a745305f04d4ee0704c37b06891b19020dc7f1.zip
git-15a745305f04d4ee0704c37b06891b19020dc7f1.tar.gz
git-15a745305f04d4ee0704c37b06891b19020dc7f1.tar.bz2
git-gui l10n: Add 29 more terms to glossary
Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rw-r--r--po/glossary/git-gui-glossary.txt29
1 files changed, 29 insertions, 0 deletions
diff --git a/po/glossary/git-gui-glossary.txt b/po/glossary/git-gui-glossary.txt
index 9b31f69..4093046 100644
--- a/po/glossary/git-gui-glossary.txt
+++ b/po/glossary/git-gui-glossary.txt
@@ -36,3 +36,32 @@
"update" ""
"verify" ""
"working copy, working tree" "The tree of actual checked out files."
+"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
+"abort" "prematurely stop and abandon an operation"
+"bare repository" "a repository with only .git directory, without working directory"
+"base" "a parent version of the current file"
+"blame" "get the authors responsible for each line in a file"
+"cherry-pick" "to select and apply a single commit without merging"
+"child" "a commit that directly succeeds the current one in git's graph of commits"
+"cleanup" "clean the state of the git repository, often after manually stopped operation"
+"commit message" "a message that gets attached with any commit"
+"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+"detached checkout" "checkout of a revision rather than a some head"
+"file level merging" "any merge strategy that works on a file by file basis"
+"head" "the last revision in a branch"
+"hook" "script that gets executed automatically on some event"
+"initial checkout" "the first checkout during a clone operation"
+"local branch" "a branch that resides in the local git repository"
+"loose object" "a Git object that is not part of any pack"
+"master branch" "a branch called by convention 'master' that exists in a newly created git repository"
+"origin" "a remote called by convention 'origin' that the current git repository has been cloned from"
+"pack [noun]" "a file containing many git objects packed together"
+"packed object" "a Git object part of some pack"
+"parent" "a commit that directly precedes the current one in git's graph of commits"
+"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git"
+"revert changes" "abandon changes and go to pristine version"
+"revision expression" "expression that signifies a revision in git"
+"stage/unstage" "add some content of files and directories to the staging area in preparation for a commit"
+"stash" "temporarily save changes in a stack without committing"
+"tracked/untracked" "file whose content is tracked/not tracked by git"