From 952f273f315b914701cb51fc4b525c58216d86d8 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 18 Sep 2013 09:05:15 +0200 Subject: add merge to glossary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/using-git.texinfo b/using-git.texinfo index 1520c3e..8271442 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -2105,8 +2105,14 @@ Unless set otherwise, the default branch in a repository. It is created with the first commit in the project. -@c @item merge (verb) -@c @item merge (noun) +@item merge (verb) +The action of integrating the commits for +another development branch. + +@item merge (noun) +A commit the is created when merging a +branch into another. + @c @item object @c @item object database @c @item object identifier -- cgit v1.2.3-70-g09d2