Merge branch 'jk/options-cleanup'
commit722c9244452c1853f0592b22c331382c282768c7
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:08 +0000 (10 14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:08 +0000 (10 14:20 -0800)
tree51f432011324a752a2c57080e045a1fa7ad12c3f
parent24abb31727e8e0b216bdee182dbbbbc43d134fa6
parent1f3c79a9d6c3278753e7fb63b48569a9ff8632df
Merge branch 'jk/options-cleanup'

Various clean-ups to the command line option parsing.

* jk/options-cleanup:
  apply, ls-files: simplify "-z" parsing
  checkout-index: disallow "--no-stage" option
  checkout-index: handle "--no-index" option
  checkout-index: handle "--no-prefix" option
  checkout-index: simplify "-z" option parsing
  give "nbuf" strbuf a more meaningful name
builtin/hash-object.c
builtin/ls-files.c
builtin/update-index.c