Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 15a7453

Browse files
alshopovpatthoyts
authored andcommitted
git-gui l10n: Add 29 more terms to glossary
Signed-off-by: Alexander Shopov <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
1 parent 99337ef commit 15a7453

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

po/glossary/git-gui-glossary.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,32 @@
3636
"update" ""
3737
"verify" ""
3838
"working copy, working tree" "The tree of actual checked out files."
39+
"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
40+
"abort" "prematurely stop and abandon an operation"
41+
"bare repository" "a repository with only .git directory, without working directory"
42+
"base" "a parent version of the current file"
43+
"blame" "get the authors responsible for each line in a file"
44+
"cherry-pick" "to select and apply a single commit without merging"
45+
"child" "a commit that directly succeeds the current one in git's graph of commits"
46+
"cleanup" "clean the state of the git repository, often after manually stopped operation"
47+
"commit message" "a message that gets attached with any commit"
48+
"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
49+
"detached checkout" "checkout of a revision rather than a some head"
50+
"file level merging" "any merge strategy that works on a file by file basis"
51+
"head" "the last revision in a branch"
52+
"hook" "script that gets executed automatically on some event"
53+
"initial checkout" "the first checkout during a clone operation"
54+
"local branch" "a branch that resides in the local git repository"
55+
"loose object" "a Git object that is not part of any pack"
56+
"master branch" "a branch called by convention 'master' that exists in a newly created git repository"
57+
"origin" "a remote called by convention 'origin' that the current git repository has been cloned from"
58+
"pack [noun]" "a file containing many git objects packed together"
59+
"packed object" "a Git object part of some pack"
60+
"parent" "a commit that directly precedes the current one in git's graph of commits"
61+
"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
62+
"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git"
63+
"revert changes" "abandon changes and go to pristine version"
64+
"revision expression" "expression that signifies a revision in git"
65+
"stage/unstage" "add some content of files and directories to the staging area in preparation for a commit"
66+
"stash" "temporarily save changes in a stack without committing"
67+
"tracked/untracked" "file whose content is tracked/not tracked by git"

0 commit comments

Comments
 (0)