Junio C Hamano 3d3ef136b7 Merge branch 'nd/checkout-option-parsing-fix' into next ...

The option parsing of "git checkout" had error checking, dwim and
defaulting missing options, all mixed in the code, and issuing an
appropriate error message with useful context was getting harder.
Reorganize the code and allow giving a proper diagnosis when the
user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name
for a branch).

Will merge to 'next' after squashing the tip two.

* nd/checkout-option-parsing-fix:
  checkout: reorder option handling
  checkout: move more parameters to struct checkout_opts
  checkout: pass "struct checkout_opts *" as const pointer

Conflicts:
	builtin/checkout.c

2012-09-11 11:50:21 -07:00

..

add.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -07:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -07:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'nd/checkout-option-parsing-fix' into next

2012-09-11 11:50:21 -07:00

clean.c

…

clone.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -07:00

column.c

…

commit-tree.c

…

commit.c

Merge branch 'jc/maint-ident-missing-human-name' into next

2012-09-07 11:30:58 -07:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

Merge branch 'dj/fetch-all-tags' into next

2012-09-11 11:44:26 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

i18n: mark more index-pack strings for translation

2012-08-31 13:05:05 -07:00

init-db.c

…

log.c

Merge branch 'mz/cherry-pick-cmdline-order' into next

2012-08-31 13:24:30 -07:00

ls-files.c

…

ls-remote.c

ls-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

Merge branch 'jc/merge-bases' into next

2012-09-07 11:30:53 -07:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'rj/path-cleanup' into next

2012-09-11 11:46:46 -07:00

push.c

…

read-tree.c

…

receive-pack.c

Merge branch 'jc/merge-bases' into next

2012-09-07 11:30:53 -07:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'nd/maint-remote-remove' into next

2012-09-11 11:44:23 -07:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'mz/cherry-pick-cmdline-order' into next

2012-08-31 13:24:30 -07:00

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…