From d40a794cf2e10a45ef14692bbe2b3a498f1924df Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 5 Sep 2013 05:42:50 +0200 Subject: split the merge entry todo into on todo for noun and one for verb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index da91569..e008b3f 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1426,7 +1426,8 @@ Unless set otherwise, the default branch in a repository. It is created with the first commit in the project. -@c @item merge +@c @item merge (verb) +@c @item merge (noun) @c @item object @c @item object database @c @item object identifier -- cgit v1.2.3-70-g09d2