diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-18 09:05:15 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-18 09:05:15 +0200 |
| commit | 952f273f315b914701cb51fc4b525c58216d86d8 (patch) | |
| tree | 0ce485d5d735478f43bb4c1b15b595fb9d0907d4 /using-git.texinfo | |
| parent | more shorthands for commit messages (diff) | |
| download | using-git-952f273f315b914701cb51fc4b525c58216d86d8.tar.gz using-git-952f273f315b914701cb51fc4b525c58216d86d8.tar.bz2 using-git-952f273f315b914701cb51fc4b525c58216d86d8.tar.xz | |
add merge to glossary
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 10 |
1 files 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 |