diff options
Diffstat (limited to '')
| -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 |