diff options
| author |  Jared Hance <jaredhance@gmail.com> | 2011-02-10 18:52:41 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-24 00:09:51 -0700 |
| commit | c395c25b8642893dd1bb4be1fd124dd12f9b848c (patch) | |
| tree | 5dcc2fc657a4d46e694aef9d75807906a5e804cd /Documentation/git-merge.txt | |
| parent | pull: Document the "--[no-]recurse-submodules" options (diff) | |
| download | tgif-c395c25b8642893dd1bb4be1fd124dd12f9b848c.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions