|
|
9.
|
|
|
commit [noun]
|
|
|
"A single point in the git history."
|
|
|
|
|
commit [noun]
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
10.
|
|
|
commit [verb]
|
|
|
"The action of storing a new snapshot of the project's state in the git history."
|
|
|
|
|
commit [verb]
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
11.
|
|
|
diff [noun]
|
|
|
""
|
|
|
|
|
diff [noun]
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
12.
|
|
|
diff [verb]
|
|
|
""
|
|
|
|
|
diff [verb]
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
13.
|
|
|
fast forward merge
|
|
|
"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
|
|
|
|
|
fast-forward merge
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
14.
|
|
|
fetch
|
|
|
"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
|
|
|
|
|
fetch
|
|
Translated by
Tom
|
|
Reviewed by
Anthony Harrington
|
|
|
|
|
15.
|
|
|
hunk
|
|
|
"One context of consecutive lines in a whole patch, which consists of many such hunks"
|
|
|
|
|
hunk
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
16.
|
|
|
index (in git-gui: staging area)
|
|
|
"A collection of files. The index is a stored version of your working tree."
|
|
|
|
|
index (in git-gui: staging area)
|
|
Translated by
Tom
|
|
Reviewed by
Anthony Harrington
|
|
|
|
|
17.
|
|
|
merge [noun]
|
|
|
"A successful merge results in the creation of a new commit representing the result of the merge."
|
|
|
|
|
merge [noun]
|
|
Translated by
Tom
|
|
Reviewed by
Anthony Harrington
|
|
|
|
|
18.
|
|
|
merge [verb]
|
|
|
"To bring the contents of another branch into the current branch."
|
|
|
|
|
merge [verb]
|
|
Translated by
Tom
|
|
Reviewed by
Anthony Harrington
|
|
|
