Jared Hance c395c25b86 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>

2011-03-24 00:09:51 -07:00

..

add.c

Merge branch 'nd/maint-fix-add-typo-detection' (early part)

2010-12-08 11:25:52 -08:00

annotate.c

…

apply.c

Merge branch 'fc/apply-p2-get-header-name' into maint

2010-12-09 10:36:36 -08:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'jn/parse-options-extra'

2010-12-12 21:49:53 -08:00

branch.c

builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

2010-12-19 10:43:53 -08:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

checkout.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

clean.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

clone.c

clone: Add the --recurse-submodules option as alias for --recursive

2010-11-05 10:28:01 -07:00

commit-tree.c

Sync with 1.7.3.2

2010-10-21 17:16:10 -07:00

commit.c

Merge branch 'maint'

2011-01-12 21:26:51 -08:00

config.c

…

count-objects.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

describe.c

Merge branch 'tf/commit-list-prefix'

2010-12-22 14:40:17 -08:00

diff-files.c

…

diff-index.c

Submodules: Use "ignore" settings from .gitmodules too for diff and status

2010-08-09 09:11:44 -07:00

diff-tree.c

…

diff.c

diff: support --cached on unborn branches

2011-02-07 15:04:30 -08:00

fast-export.c

…

fetch-pack.c

commit: Add commit_list prefix in two function names.

2010-11-29 14:01:52 -08:00

fetch.c

Merge branch 'jl/fetch-submodule-recursive'

2010-12-16 12:57:15 -08:00

fmt-merge-msg.c

Change incorrect "remote branch" to "remote tracking branch" in C code

2010-11-03 09:20:47 -07:00

for-each-ref.c

…

fsck.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

gc.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

grep.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -08:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

Remove all logic from get_git_work_tree()

2010-12-22 14:34:24 -08:00

log.c

Merge branch 'tc/format-patch-p'

2010-12-12 21:49:52 -08:00

ls-files.c

Merge branch 'jn/git-cmd-h-bypass-setup'

2010-12-12 21:49:50 -08:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

commit: helper methods to reduce redundant blocks of code

2010-11-04 13:53:34 -07:00

mailsplit.c

…

merge-base.c

…

merge-file.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

Merge branch 'jf/merge-ignore-ws'

2010-10-26 21:40:54 -07:00

merge-tree.c

…

merge.c

merge: match the help text with the documentation

2011-03-24 00:09:51 -07:00

mktag.c

…

mktree.c

…

mv.c

add OPT__FORCE

2010-11-15 10:04:43 -08:00

name-rev.c

…

notes.c

Merge branch 'jh/notes-merge'

2010-12-08 11:24:12 -08:00

pack-objects.c

thread-utils.h: simplify the inclusion

2010-12-10 12:58:06 -08:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

add description parameter to OPT__DRY_RUN

2010-11-15 09:57:37 -08:00

push.c

Merge branch 'maint'

2010-08-12 18:07:09 -07:00

read-tree.c

add description parameter to OPT__VERBOSE

2010-11-15 09:56:51 -08:00

receive-pack.c

…

reflog.c

…

remote-ext.c

remote-ext: do not segfault for blank lines

2011-01-18 10:18:25 -08:00

remote-fd.c

remote-fd/ext: finishing touches after code review

2010-11-19 11:04:20 -08:00

remote.c

Merge branch 'rs/opt-help-text'

2010-11-24 15:55:19 -08:00

replace.c

…

rerere.c

…

reset.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

rev-list.c

Merge branch 'jk/maint-rev-list-nul' into maint

2010-11-24 12:46:32 -08:00

rev-parse.c

…

revert.c

Merge branch 'jn/cherry-pick-refresh-index' into maint

2010-12-09 10:36:51 -08:00

rm.c

builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.

2010-12-19 10:44:06 -08:00

send-pack.c

Merge branch 'jk/push-progress'

2010-11-17 15:01:00 -08:00

shortlog.c

parse-options: Don't call parse_options_check() so much

2010-12-06 16:51:36 -08:00

show-branch.c

commit: Add commit_list prefix in two function names.

2010-11-29 14:01:52 -08:00

show-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

stripspace.c

…

symbolic-ref.c

Describe various forms of "be quiet" using OPT__QUIET

2010-11-15 10:04:56 -08:00

tag.c

Merge branch 'mg/maint-tag-rfc1991'

2010-12-08 11:24:13 -08:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

Merge branch 'jn/parse-options-extra'

2010-12-12 21:49:53 -08:00

update-ref.c

…

update-server-info.c

add OPT__FORCE

2010-11-15 10:04:43 -08:00

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

Merge branch 'mg/maint-tag-rfc1991'

2010-12-08 11:24:13 -08:00

write-tree.c

…