diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-21 00:58:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-21 00:58:38 (GMT) |
| commit | 105c21df14531bf2fd39e05b4c3a9aa31349da06 (patch) | |
| tree | 272f75883898897f17c337e247b70043e5efdaaf /git-gui/po/glossary/git-gui-glossary.txt | |
| parent | a41acc63badf20cbb22cca61039dca9309deaa19 (diff) | |
| parent | a02855711310b553c610fe7ef634f4ceb25fe9f6 (diff) | |
| download | git-105c21df14531bf2fd39e05b4c3a9aa31349da06.zip git-105c21df14531bf2fd39e05b4c3a9aa31349da06.tar.gz git-105c21df14531bf2fd39e05b4c3a9aa31349da06.tar.bz2 | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Makefile - Handle $DESTDIR on Cygwin
git-gui: add french glossary: glossary/fr.po
git-gui: Refresh file status description after hunk application
git-gui: Allow 'Create New Repository' on existing directories
git-gui: Initial french translation
git-gui: Improve German translation.
git-gui: Updated Swedish translation after mailing list review.
git-gui: Fix broken revert confirmation.
git-gui: Update German translation
git-gui: Update glossary: add term "hunk"
Diffstat (limited to 'git-gui/po/glossary/git-gui-glossary.txt')
| -rw-r--r-- | git-gui/po/glossary/git-gui-glossary.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/po/glossary/git-gui-glossary.txt b/git-gui/po/glossary/git-gui-glossary.txt index 500d0a0..9b31f69 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." |