projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7811d96) | patch
merge: match the help text with the documentation
authorJared Hance <jaredhance@gmail.com>
Thu, 10 Feb 2011 23:52:41 +0000 (18:52 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Mar 2011 07:09:51 +0000 (00:09 -0700)
commitc395c25b8642893dd1bb4be1fd124dd12f9b848c
tree5dcc2fc657a4d46e694aef9d75807906a5e804cdtree | snapshot
parent7811d9600f02e70c9f835719c71156c967a684f7commit | diff
merge: match the help text with the documentation

We used to be very casual in terminology and used <branch>, <ref> and
<rev> more or less interchangeably with <commit>.  Match the help text
given by "git merge -h" with that of the documentation.

Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | history
Git—the stupid content tracker