X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-gui%2Fpo%2Fglossary%2Fgit-gui-glossary.txt;h=9b31f69152025e484ddf467d7884c2bf2140a894;hb=105c21df14531bf2fd39e05b4c3a9aa31349da06;hp=500d0a0ea75215696481523010c6b33c9cd0786e;hpb=a41acc63badf20cbb22cca61039dca9309deaa19;p=git.git diff --git a/git-gui/po/glossary/git-gui-glossary.txt b/git-gui/po/glossary/git-gui-glossary.txt index 500d0a0ea..9b31f6915 100644 --- a/git-gui/po/glossary/git-gui-glossary.txt +++ b/git-gui/po/glossary/git-gui-glossary.txt @@ -12,6 +12,7 @@ "diff [verb]" "" "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." "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." +"hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" "index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." "merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." "merge [verb]" "To bring the contents of another branch into the current branch."