Merge branch 'rs/opt-help-text'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 23:55:19 +0000 (24 15:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 23:55:19 +0000 (24 15:55 -0800)
* rs/opt-help-text:
  verify-tag: document --verbose
  branch: improve --verbose description
  archive: improve --verbose description
  Describe various forms of "be quiet" using OPT__QUIET
  add OPT__FORCE
  add description parameter to OPT__QUIET
  add description parameter to OPT__DRY_RUN
  add description parameter to OPT__VERBOSE

1  2 
builtin/apply.c
builtin/checkout.c
builtin/clean.c
builtin/fetch.c
builtin/merge-file.c
builtin/remote.c

diff --cc builtin/apply.c
Simple merge
Simple merge
diff --cc builtin/clean.c
Simple merge
diff --cc builtin/fetch.c
Simple merge
Simple merge
Simple merge