|
|
25.
|
|
|
detached HEAD
|
|
|
"checkout of a revision rather than some head"
|
|
|
|
|
detached HEAD
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
|
|
26.
|
|
|
detached checkout
|
|
|
"checkout of a revision rather than some head"
|
|
|
|
|
detached checkout
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
|
|
27.
|
|
|
diff [noun]
|
|
|
""
|
|
|
|
|
diff [noun]
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
28.
|
|
|
diff [verb]
|
|
|
""
|
|
|
|
|
diff [verb]
|
|
Translated and reviewed by
Anthony Harrington
|
|
|
|
|
29.
|
|
|
directory
|
|
|
""
|
|
|
|
|
directory
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
|
|
30.
|
|
|
fast-forward
|
|
|
"A fast-forward merge 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
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
|
|
31.
|
|
|
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
|
|
|
|
|
32.
|
|
|
file level merging
|
|
|
"any merge strategy that works on a file by file basis"
|
|
|
|
|
file level merging
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
|
|
33.
|
|
|
file
|
|
|
""
|
|
|
|
|
file
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
|
|
34.
|
|
|
head
|
|
|
"the last revision in a branch"
|
|
|
|
|
head
|
|
Translated and reviewed by
Stephan Woidowski
|
|
|
