| commit | c395c25b8642893dd1bb4be1fd124dd12f9b848c | |
| author | Jared Hance <jaredhance@gmail.com> | |
| Thu, 10 Feb 2011 23:52:41 +0000 (10 18:52 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 24 Mar 2011 07:09:51 +0000 (24 00:09 -0700) | ||
| tree | 5dcc2fc657a4d46e694aef9d75807906a5e804cd | treesnapshot (tar.gz zip) |
| parent | 7811d9600f02e70c9f835719c71156c967a684f7 | commitdiff |
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>
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 | diffblobblamehistory |