From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Sep 2020 19:37:06 +0000 (-0700)
Subject: Merge branch 'hl/bisect-doc-clarify-bad-good-ordering'
X-Git-Tag: v2.29.0-rc0~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da6b99c39abee3f6882ac35814485330bd344dfd;p=thirdparty%2Fgit.git

Merge branch 'hl/bisect-doc-clarify-bad-good-ordering'

Doc update.

* hl/bisect-doc-clarify-bad-good-ordering:
  bisect: swap command-line options in documentation
---

da6b99c39abee3f6882ac35814485330bd344dfd
diff --cc git-bisect.sh
index c28e35b0fa,3ec7558bdc..2f60fefcfa
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@@ -3,8 -3,8 +3,8 @@@
  USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
  LONG_USAGE='git bisect help
  	print this long help message.
- git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
+ git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]
 -		 [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...]
 +		 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
  	reset bisect state and start bisection.
  git bisect (bad|new) [<rev>]
  	mark <rev> a known-bad revision/