aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-14 11:54:34 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-14 11:54:34 -0700
commitb58f3a645bc04f3b52aa41c75a019d51b615c647 (patch)
tree264135b48c8fbcf0c1182715cb012e325ab05017 /git-mergetool.sh
parent22ce37d27f577867d831153c070ee6518906a146 (diff)
parentb6312c27a06f31625d915d44531d5e728ffd8d63 (diff)
downloadgit-b58f3a645bc04f3b52aa41c75a019d51b615c647.tar.gz
git-b58f3a645bc04f3b52aa41c75a019d51b615c647.tar.xz
Merge branch 'nd/checkout-option-parsing-fix'
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). * 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
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions