diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-05 05:42:50 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-05 05:42:50 +0200 |
| commit | d40a794cf2e10a45ef14692bbe2b3a498f1924df (patch) | |
| tree | ee45cce0c564e0877f17a4ec35cbdd7cfa773f2c /using-git.texinfo | |
| parent | add master to glossary (diff) | |
| download | using-git-d40a794cf2e10a45ef14692bbe2b3a498f1924df.tar.gz using-git-d40a794cf2e10a45ef14692bbe2b3a498f1924df.tar.bz2 using-git-d40a794cf2e10a45ef14692bbe2b3a498f1924df.tar.xz | |
split the merge entry todo into on todo for noun and one for verb
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 3 |
1 files changed, 2 insertions, 1 deletions
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 |