|
|
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."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
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."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
15.
|
|
|
hunk
|
|
|
"One context of consecutive lines in a whole patch, which consists of many such hunks"
|
|
|
|
|
(no translation yet)
|
|
|
|
|
16.
|
|
|
index (in git-gui: staging area)
|
|
|
"A collection of files. The index is a stored version of your working tree."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
17.
|
|
|
merge [noun]
|
|
|
"A successful merge results in the creation of a new commit representing the result of the merge."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
18.
|
|
|
merge [verb]
|
|
|
"To bring the contents of another branch into the current branch."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
19.
|
|
|
message
|
|
|
""
|
|
|
|
|
(no translation yet)
|
|
|
|
|
20.
|
|
|
prune
|
|
|
"Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
21.
|
|
|
pull
|
|
|
"Pulling a branch means to fetch it and merge it."
|
|
|
|
|
(no translation yet)
|
|
|
|
|
22.
|
|
|
push
|
|
|
"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
|
|
|
|
|
(no translation yet)
|
|
|
