Junio C Hamano 2cfab60877 Merge branch 'nd/parse-options-aliases' ...

Attempt to use an abbreviated option in "git clone --recurs" is
responded by a request to disambiguate between --recursive and
--recurse-submodules, which is bad because these two are synonyms.
The parse-options API has been extended to define such synonyms
more easily and not produce an unnecessary failure.

* nd/parse-options-aliases:
  parse-options: don't emit "ambiguous option" for aliases

2019-05-19 16:45:28 +09:00

..

add.c

…

am.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

Merge branch 'nd/parse-options-aliases'

2019-05-19 16:45:28 +09:00

column.c

…

commit-graph.c

…

commit-tree.c

…

commit.c

Merge branch 'pw/clean-sequencer-state-upon-final-commit'

2019-05-13 23:50:35 +09:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

difftool.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

interpret-trailers.c

…

log.c

…

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

Merge branch 'ew/repack-with-bitmaps-by-default'

2019-05-13 23:50:32 +09:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'dl/merge-cleanup-scissors-fix'

2019-05-09 00:37:24 +09:00

push.c

…

range-diff.c

…

read-tree.c

…

rebase.c

Merge branch 'pw/rebase-i-internal'

2019-05-13 23:50:34 +09:00

receive-pack.c

…

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

Merge branch 'cc/replace-graft-peel-tags'

2019-05-09 00:37:24 +09:00

rerere.c

…

reset.c

…

rev-list.c

Merge branch 'tb/unexpected'

2019-05-09 00:37:25 +09:00

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

…

stash.c

…

stripspace.c

…

submodule--helper.c

Merge branch 'nd/submodule-helper-incomplete-line-fix'

2019-05-19 16:45:27 +09:00

symbolic-ref.c

…

tag.c

Merge branch 'dl/warn-tagging-a-tag'

2019-05-19 16:45:26 +09:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

…

write-tree.c

…