4528aa1aaf · matheusbsbs/matheus-bagliano

@@ -18,33 +18,27 @@ ordering and formatting options, such as `--reverse`.

18 -<number>::

19 -n <number>::

20 --max-count=<number>::

21 -

21 Limit the number of commits to output.

22

23 --skip=<number>::

25 -

24 Skip 'number' commits before starting to show the commit output.

25

26 --since=<date>::

27 --after=<date>::

30 -

28 Show commits more recent than a specific date.

29

30 --until=<date>::

31 --before=<date>::

35 -

32 Show commits older than a specific date.

33

34 ifdef::git-rev-list[]

35 --max-age=<timestamp>::

36 --min-age=<timestamp>::

41 -

37 Limit the commits output to specified time range.

38 endif::git-rev-list[]

39

40 --author=<pattern>::

41 --committer=<pattern>::

47 -

42 Limit the commits output to ones with author/committer

43 header lines that match the specified pattern (regular

44 expression). With more than one `--author=<pattern>`,

@@ -52,7 +46,6 @@ endif::git-rev-list[]

46 chosen (similarly for multiple `--committer=<pattern>`).

47

48 --grep-reflog=<pattern>::

55 -

49 Limit the commits output to ones with reflog entries that

50 match the specified pattern (regular expression). With

51 more than one `--grep-reflog`, commits whose reflog message

@@ -60,7 +53,6 @@ endif::git-rev-list[]

53 error to use this option unless `--walk-reflogs` is in use.

54

55 --grep=<pattern>::

63 -

56 Limit the commits output to ones with log message that

57 matches the specified pattern (regular expression). With

58 more than one `--grep=<pattern>`, commits whose message

@@ -71,46 +63,38 @@ When `--show-notes` is in effect, the message from the notes as

63 if it is part of the log message.

64

65 --all-match::

74 - Limit the commits output to ones that match all given --grep,

66 + Limit the commits output to ones that match all given `--grep`,

67 instead of ones that match at least one.

68

69 -i::

70 --regexp-ignore-case::

79 -

71 Match the regexp limiting patterns without regard to letters case.

72

73 --basic-regexp::

83 -

74 Consider the limiting patterns to be basic regular expressions;

75 this is the default.

76

77 -E::

78 --extended-regexp::

89 -

79 Consider the limiting patterns to be extended regular expressions

80 instead of the default basic regular expressions.

81

82 -F::

83 --fixed-strings::

95 -

84 Consider the limiting patterns to be fixed strings (don't interpret

85 pattern as a regular expression).

86

87 --perl-regexp::

100 -

88 Consider the limiting patterns to be Perl-compatible regexp.

89 Requires libpcre to be compiled in.

90

91 --remove-empty::

105 -

92 Stop when a given path disappears from the tree.

93

94 --merges::

109 -

95 Print only merge commits. This is exactly the same as `--min-parents=2`.

96

97 --no-merges::

113 -

98 Do not print commits with more than one parent. This is

99 exactly the same as `--max-parents=1`.

100

@@ -118,7 +102,6 @@ if it is part of the log message.

102 --max-parents=<number>::

103 --no-min-parents::

104 --no-max-parents::

121 -

105 Show only commits which have at least (or at most) that many parent

106 commits. In particular, `--max-parents=1` is the same as `--no-merges`,

107 `--min-parents=2` is the same as `--merges`. `--max-parents=0`

@@ -138,31 +121,26 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).

121 brought in to your history by such a merge.

122

123 --not::

141 -

124 Reverses the meaning of the '{caret}' prefix (or lack thereof)

143 - for all following revision specifiers, up to the next '--not'.

125 + for all following revision specifiers, up to the next `--not`.

126

127 --all::

146 -

128 Pretend as if all the refs in `refs/` are listed on the

129 command line as '<commit>'.

130

131 --branches[=<pattern>]::

151 -

132 Pretend as if all the refs in `refs/heads` are listed

133 on the command line as '<commit>'. If '<pattern>' is given, limit

134 branches to ones matching given shell glob. If pattern lacks '?',

135 '{asterisk}', or '[', '/{asterisk}' at the end is implied.

136

137 --tags[=<pattern>]::

158 -

138 Pretend as if all the refs in `refs/tags` are listed

139 on the command line as '<commit>'. If '<pattern>' is given, limit

140 tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}',

141 or '[', '/{asterisk}' at the end is implied.

142

143 --remotes[=<pattern>]::

165 -

144 Pretend as if all the refs in `refs/remotes` are listed

145 on the command line as '<commit>'. If '<pattern>' is given, limit

146 remote-tracking branches to ones matching given shell glob.

@@ -175,13 +153,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).

153 or '[', '/{asterisk}' at the end is implied.

154

155 --ignore-missing::

178 -

156 Upon seeing an invalid object name in the input, pretend as if

157 the bad input was not given.

158

159 ifndef::git-rev-list[]

160 --bisect::

184 -

161 Pretend as if the bad bisection ref `refs/bisect/bad`

162 was listed and as if it was followed by `--not` and the good

163 bisection refs `refs/bisect/good-*` on the command

@@ -189,7 +165,6 @@ ifndef::git-rev-list[]

165 endif::git-rev-list[]

166

167 --stdin::

192 -

168 In addition to the '<commit>' listed on the command

169 line, read them from the standard input. If a '--' separator is

170 seen, stop reading commits and start reading paths to limit the

@@ -197,36 +172,32 @@ endif::git-rev-list[]

172

173 ifdef::git-rev-list[]

174 --quiet::

200 -

175 Don't print anything to standard output. This form

176 is primarily meant to allow the caller to

177 test the exit status to see if a range of objects is fully

178 connected (or not). It is faster than redirecting stdout

205 - to /dev/null as the output does not have to be formatted.

179 + to `/dev/null` as the output does not have to be formatted.

180 endif::git-rev-list[]

181

182 --cherry-mark::

209 -

183 Like `--cherry-pick` (see below) but mark equivalent commits

184 with `=` rather than omitting them, and inequivalent ones with `+`.

185

186 --cherry-pick::

214 -

187 Omit any commit that introduces the same change as

216 - another commit on the "other side" when the set of

188 + another commit on the ``other side'' when the set of

189 commits are limited with symmetric difference.

190 +

191 For example, if you have two branches, `A` and `B`, a usual way

192 to list all commits on only one side of them is with

193 `--left-right` (see the example below in the description of

194 the `--left-right` option). It however shows the commits that were cherry-picked

223 -from the other branch (for example, "3rd on b" may be cherry-picked

195 +from the other branch (for example, ``3rd on b'' may be cherry-picked

196 from branch A). With this option, such pairs of commits are

197 excluded from the output.

198

199 --left-only::

200 --right-only::

229 -

201 List only commits on the respective side of a symmetric range,

202 i.e. only those which would be marked `<` resp. `>` by

203 `--left-right`.

@@ -238,7 +209,6 @@ More precisely, `--cherry-pick --right-only --no-merges` gives the exact

209 list.

210

211 --cherry::

241 -

212 A synonym for `--right-only --cherry-mark --no-merges`; useful to

213 limit the output to the commits on our side and mark those that

214 have been applied to the other side of a forked history with

@@ -247,30 +217,27 @@ list.

217

218 -g::

219 --walk-reflogs::

250 -

220 Instead of walking the commit ancestry chain, walk

221 reflog entries from the most recent one to older ones.

222 When this option is used you cannot specify commits to

223 exclude (that is, '{caret}commit', 'commit1..commit2',

224 nor 'commit1\...commit2' notations cannot be used).

225 +

257 -With '\--pretty' format other than oneline (for obvious reasons),

226 +With `--pretty` format other than `oneline` (for obvious reasons),

227 this causes the output to have two extra lines of information

228 taken from the reflog. By default, 'commit@\{Nth}' notation is

229 used in the output. When the starting commit is specified as

230 'commit@\{now}', output also uses 'commit@\{timestamp}' notation

262 -instead. Under '\--pretty=oneline', the commit message is

231 +instead. Under `--pretty=oneline`, the commit message is

232 prefixed with this information on the same line.

264 -This option cannot be combined with '\--reverse'.

233 +This option cannot be combined with `--reverse`.

234 See also linkgit:git-reflog[1].

235

236 --merge::

268 -

237 After a failed merge, show refs that touch files having a

238 conflict and don't exist on all heads to merge.

239

240 --boundary::

273 -

241 Output excluded boundary commits. Boundary commits are

242 prefixed with `-`.

243

@@ -287,11 +254,9 @@ is how to do it, as there are various strategies to simplify the history.

254 The following options select the commits to be shown:

255

256 <paths>::

290 -

257 Commits modifying the given <paths> are selected.

258

259 --simplify-by-decoration::

294 -

260 Commits that are referred by some branch or tag are selected.

261

262 Note that extra commits can be shown to give a meaningful history.

@@ -299,33 +264,27 @@ Note that extra commits can be shown to give a meaningful history.

264 The following options affect the way the simplification is performed:

265

266 Default mode::

302 -

267 Simplifies the history to the simplest history explaining the

268 final state of the tree. Simplest because it prunes some side

269 branches if the end result is the same (i.e. merging branches

270 with the same content)

271

272 --full-history::

309 -

273 Same as the default mode, but does not prune some history.

274

275 --dense::

313 -

276 Only the selected commits are shown, plus some to have a

277 meaningful history.

278

279 --sparse::

318 -

280 All commits in the simplified history are shown.

281

282 --simplify-merges::

322 -

323 - Additional option to '--full-history' to remove some needless

283 + Additional option to `--full-history` to remove some needless

284 merges from the resulting history, as there are no selected

285 commits contributing to this merge.

286

287 --ancestry-path::

328 -

288 When given a range of commits to display (e.g. 'commit1..commit2'

289 or 'commit2 {caret}commit1'), only display commits that exist

290 directly on the ancestry chain between the 'commit1' and

@@ -352,36 +311,35 @@ The horizontal line of history A---Q is taken to be the first parent of

311 each merge. The commits are:

312

313 * `I` is the initial commit, in which `foo` exists with contents

355 - "asdf", and a file `quux` exists with contents "quux". Initial

314 + ``asdf'', and a file `quux` exists with contents ``quux''. Initial

315 commits are compared to an empty tree, so `I` is !TREESAME.

316

358 -* In `A`, `foo` contains just "foo".

317 +* In `A`, `foo` contains just ``foo''.

318

319 * `B` contains the same change as `A`. Its merge `M` is trivial and

320 hence TREESAME to all parents.

321

363 -* `C` does not change `foo`, but its merge `N` changes it to "foobar",

322 +* `C` does not change `foo`, but its merge `N` changes it to ``foobar'',

323 so it is not TREESAME to any parent.

324

366 -* `D` sets `foo` to "baz". Its merge `O` combines the strings from

367 - `N` and `D` to "foobarbaz"; i.e., it is not TREESAME to any parent.

325 +* `D` sets `foo` to ``baz''. Its merge `O` combines the strings from

326 + `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent.

327

369 -* `E` changes `quux` to "xyzzy", and its merge `P` combines the

370 - strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.

328 +* `E` changes `quux` to ``xyzzy'', and its merge `P` combines the

329 + strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`.

330

331 * `X` is an independent root commit that added a new file `side`, and `Y`

332 modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and

333 `Q` is TREESAME to `P`, but not to `Y`.

334

376 -'rev-list' walks backwards through history, including or excluding

377 -commits based on whether '\--full-history' and/or parent rewriting

378 -(via '\--parents' or '\--children') are used. The following settings

335 +`rev-list` walks backwards through history, including or excluding

336 +commits based on whether `--full-history` and/or parent rewriting

337 +(via `--parents` or `--children`) are used. The following settings

338 are available.

339

340 Default mode::

382 -

341 Commits are included if they are not TREESAME to any parent

384 - (though this can be changed, see '\--sparse' below). If the

342 + (though this can be changed, see `--sparse` below). If the

343 commit was a merge, and it was TREESAME to one parent, follow

344 only that parent. (Even if there are several TREESAME

345 parents, follow only one of them.) Otherwise, follow all

@@ -400,12 +358,11 @@ available, removed `B` from consideration entirely. `C` was

358 considered via `N`, but is TREESAME. Root commits are compared to an

359 empty tree, so `I` is !TREESAME.

360 +

403 -Parent/child relations are only visible with --parents, but that does

361 +Parent/child relations are only visible with `--parents`, but that does

362 not affect the commits selected in default mode, so we have shown the

363 parent lines.

364

365 --full-history without parent rewriting::

408 -

366 This mode differs from the default in one point: always follow

367 all parents of a merge, even if it is TREESAME to one of them.

368 Even if more than one side of the merge has commits that are

@@ -425,9 +382,8 @@ about the parent/child relationships between the commits, so we show

382 them disconnected.

383

384 --full-history with parent rewriting::

428 -

385 Ordinary commits are only included if they are !TREESAME

430 - (though this can be changed, see '\--sparse' below).

386 + (though this can be changed, see `--sparse` below).

387 +

388 Merges are always included. However, their parent list is rewritten:

389 Along each parent, prune away commits that are not included

@@ -441,7 +397,7 @@ themselves. This results in

397 `-------------'

398 -----------------------------------------------------------------------

399 +

444 -Compare to '\--full-history' without rewriting above. Note that `E`

400 +Compare to `--full-history` without rewriting above. Note that `E`

401 was pruned away because it is TREESAME, but the parent list of P was

402 rewritten to contain `E`'s parent `I`. The same happened for `C` and

403 `N`, and `X`, `Y` and `Q`.

@@ -450,22 +406,19 @@ In addition to the above settings, you can change whether TREESAME

406 affects inclusion:

407

408 --dense::

453 -

409 Commits that are walked are included if they are not TREESAME

410 to any parent.

411

412 --sparse::

458 -

413 All commits that are walked are included.

414 +

461 -Note that without '\--full-history', this still simplifies merges: if

415 +Note that without `--full-history`, this still simplifies merges: if

416 one of the parents is TREESAME, we follow only that one, so the other

417 sides of the merge are never walked.

418

419 --simplify-merges::

466 -

420 First, build a history graph in the same way that

468 - '\--full-history' with parent rewriting does (see above).

421 + `--full-history` with parent rewriting does (see above).

422 +

423 Then simplify each commit `C` to its replacement `C'` in the final

424 history according to the following rules:

@@ -484,7 +437,7 @@ history according to the following rules:

437 --

438 +

439 The effect of this is best shown by way of comparing to

487 -'\--full-history' with parent rewriting. The example turns into:

440 +`--full-history` with parent rewriting. The example turns into:

441 +

442 -----------------------------------------------------------------------

443 .-A---M---N---O

@@ -494,7 +447,7 @@ The effect of this is best shown by way of comparing to

447 `---------'

448 -----------------------------------------------------------------------

449 +

497 -Note the major differences in `N`, `P` and `Q` over '--full-history':

450 +Note the major differences in `N`, `P` and `Q` over `--full-history`:

451 +

452 --

453 * `N`'s parent list had `I` removed, because it is an ancestor of the

@@ -511,11 +464,10 @@ Note the major differences in `N`, `P` and `Q` over '--full-history':

464 Finally, there is a fifth simplification mode available:

465

466 --ancestry-path::

514 -

467 Limit the displayed commits to those directly on the ancestry

516 - chain between the "from" and "to" commits in the given commit

517 - range. I.e. only display commits that are ancestor of the "to"

518 - commit, and descendants of the "from" commit.

468 + chain between the ``from'' and ``to'' commits in the given commit

469 + range. I.e. only display commits that are ancestor of the ``to''

470 + commit, and descendants of the ``from'' commit.

471 +

472 As an example use case, consider the following commit history:

473 +

@@ -530,14 +482,14 @@ As an example use case, consider the following commit history:

482 A regular 'D..M' computes the set of commits that are ancestors of `M`,

483 but excludes the ones that are ancestors of `D`. This is useful to see

484 what happened to the history leading to `M` since `D`, in the sense

533 -that "what does `M` have that did not exist in `D`". The result in this

485 +that ``what does `M` have that did not exist in `D`''. The result in this

486 example would be all the commits, except `A` and `B` (and `D` itself,

487 of course).

488 +

489 When we want to find out what commits in `M` are contaminated with the

490 bug introduced by `D` and need fixing, however, we might want to view

491 only the subset of 'D..M' that are actually descendants of `D`, i.e.

540 -excluding `C` and `K`. This is exactly what the '--ancestry-path'

492 +excluding `C` and `K`. This is exactly what the `--ancestry-path`

493 option does. Applied to the 'D..M' range, it results in:

494 +

495 -----------------------------------------------------------------------

@@ -548,7 +500,7 @@ option does. Applied to the 'D..M' range, it results in:

500 L--M

501 -----------------------------------------------------------------------

502

551 -The '\--simplify-by-decoration' option allows you to view only the

503 +The `--simplify-by-decoration` option allows you to view only the

504 big picture of the topology of the history, by omitting commits

505 that are not referenced by tags. Commits are marked as !TREESAME

506 (in other words, kept after history simplification rules described

@@ -561,50 +513,47 @@ Bisection Helpers

513 ~~~~~~~~~~~~~~~~~

514

515 --bisect::

564 -

565 -Limit output to the one commit object which is roughly halfway between

566 -included and excluded commits. Note that the bad bisection ref

567 -`refs/bisect/bad` is added to the included commits (if it

568 -exists) and the good bisection refs `refs/bisect/good-*` are

569 -added to the excluded commits (if they exist). Thus, supposing there

570 -are no refs in `refs/bisect/`, if

571 -

516 + Limit output to the one commit object which is roughly halfway between

517 + included and excluded commits. Note that the bad bisection ref

518 + `refs/bisect/bad` is added to the included commits (if it

519 + exists) and the good bisection refs `refs/bisect/good-*` are

520 + added to the excluded commits (if they exist). Thus, supposing there

521 + are no refs in `refs/bisect/`, if

522 ++

523 -----------------------------------------------------------------------

524 $ git rev-list --bisect foo ^bar ^baz

525 -----------------------------------------------------------------------

575 -

526 ++

527 outputs 'midpoint', the output of the two commands

577 -

528 ++

529 -----------------------------------------------------------------------

530 $ git rev-list foo ^midpoint

531 $ git rev-list midpoint ^bar ^baz

532 -----------------------------------------------------------------------

582 -

533 ++

534 would be of roughly the same length. Finding the change which

535 introduces a regression is thus reduced to a binary search: repeatedly

536 generate and test new 'midpoint's until the commit chain is of length

537 one.

538

539 --bisect-vars::

589 -

590 -This calculates the same as `--bisect`, except that refs in

591 -`refs/bisect/` are not used, and except that this outputs

592 -text ready to be eval'ed by the shell. These lines will assign the

593 -name of the midpoint revision to the variable `bisect_rev`, and the

594 -expected number of commits to be tested after `bisect_rev` is tested

595 -to `bisect_nr`, the expected number of commits to be tested if

596 -`bisect_rev` turns out to be good to `bisect_good`, the expected

597 -number of commits to be tested if `bisect_rev` turns out to be bad to

598 -`bisect_bad`, and the number of commits we are bisecting right now to

599 -`bisect_all`.

540 + This calculates the same as `--bisect`, except that refs in

541 + `refs/bisect/` are not used, and except that this outputs

542 + text ready to be eval'ed by the shell. These lines will assign the

543 + name of the midpoint revision to the variable `bisect_rev`, and the

544 + expected number of commits to be tested after `bisect_rev` is tested

545 + to `bisect_nr`, the expected number of commits to be tested if

546 + `bisect_rev` turns out to be good to `bisect_good`, the expected

547 + number of commits to be tested if `bisect_rev` turns out to be bad to

548 + `bisect_bad`, and the number of commits we are bisecting right now to

549 + `bisect_all`.

550

551 --bisect-all::

602 -

603 -This outputs all the commit objects between the included and excluded

604 -commits, ordered by their distance to the included and excluded

605 -commits. Refs in `refs/bisect/` are not used. The farthest

606 -from them is displayed first. (This is the only one displayed by

607 -`--bisect`.)

552 + This outputs all the commit objects between the included and excluded

553 + commits, ordered by their distance to the included and excluded

554 + commits. Refs in `refs/bisect/` are not used. The farthest

555 + from them is displayed first. (This is the only one displayed by

556 + `--bisect`.)

557 +

558 This is useful because it makes it easy to choose a good commit to

559 test when you want to avoid to test some of them for some reason (they

@@ -654,9 +603,8 @@ avoid showing the commits from two parallel development track mixed

603 together.

604

605 --reverse::

657 -

606 Output the commits in reverse order.

659 - Cannot be combined with '\--walk-reflogs'.

607 + Cannot be combined with `--walk-reflogs`.

608

609 Object Traversal

610 ~~~~~~~~~~~~~~~~

@@ -664,37 +612,32 @@ Object Traversal

612 These options are mostly targeted for packing of Git repositories.

613

614 --objects::

667 -

615 Print the object IDs of any object referenced by the listed

669 - commits. '--objects foo ^bar' thus means "send me

616 + commits. `--objects foo ^bar` thus means ``send me

617 all object IDs which I need to download if I have the commit

671 - object 'bar', but not 'foo'".

618 + object _bar_ but not _foo_''.

619

620 --objects-edge::

674 -

675 - Similar to '--objects', but also print the IDs of excluded

676 - commits prefixed with a "-" character. This is used by

677 - linkgit:git-pack-objects[1] to build "thin" pack, which records

621 + Similar to `--objects`, but also print the IDs of excluded

622 + commits prefixed with a ``-'' character. This is used by

623 + linkgit:git-pack-objects[1] to build ``thin'' pack, which records

624 objects in deltified form based on objects contained in these

625 excluded commits to reduce network traffic.

626

627 --unpacked::

682 -

683 - Only useful with '--objects'; print the object IDs that are not

628 + Only useful with `--objects`; print the object IDs that are not

629 in packs.

630

631 --no-walk[=(sorted|unsorted)]::

687 -

632 Only show the given commits, but do not traverse their ancestors.

633 This has no effect if a range is specified. If the argument

690 - "unsorted" is given, the commits are show in the order they were

691 - given on the command line. Otherwise (if "sorted" or no argument

634 + `unsorted` is given, the commits are show in the order they were

635 + given on the command line. Otherwise (if `sorted` or no argument

636 was given), the commits are show in reverse chronological order

637 by commit time.

638

639 --do-walk::

696 -

697 - Overrides a previous --no-walk.

640 + Overrides a previous `--no-walk`.

641

642 Commit Formatting

643 ~~~~~~~~~~~~~~~~~

@@ -708,17 +651,15 @@ endif::git-rev-list[]

651 include::pretty-options.txt[]

652

653 --relative-date::

711 -

654 Synonym for `--date=relative`.

655

656 --date=(relative|local|default|iso|rfc|short|raw)::

715 -

657 Only takes effect for dates shown in human-readable format, such

717 - as when using "--pretty". `log.date` config variable sets a default

718 - value for log command's --date option.

658 + as when using `--pretty`. `log.date` config variable sets a default

659 + value for log command's `--date` option.

660 +

661 `--date=relative` shows dates relative to the current time,

721 -e.g. "2 hours ago".

662 +e.g. ``2 hours ago''.

663 +

664 `--date=local` shows timestamps in user's local timezone.

665 +

@@ -736,18 +677,15 @@ format, often found in E-mail messages.

677

678 ifdef::git-rev-list[]

679 --header::

739 -

680 Print the contents of the commit in raw-format; each record is

681 separated with a NUL character.

682 endif::git-rev-list[]

683

684 --parents::

745 -

685 Print also the parents of the commit (in the form "commit parent...").

686 Also enables parent rewriting, see 'History Simplification' below.

687

688 --children::

750 -

689 Print also the children of the commit (in the form "commit child...").

690 Also enables parent rewriting, see 'History Simplification' below.

691

@@ -757,7 +695,6 @@ ifdef::git-rev-list[]

695 endif::git-rev-list[]

696

697 --left-right::

760 -

698 Mark which side of a symmetric diff a commit is reachable from.

699 Commits from the left side are prefixed with `<` and those from

700 the right with `>`. If combined with `--boundary`, those

@@ -787,7 +724,6 @@ you would get an output like this:

724 -----------------------------------------------------------------------

725

726 --graph::

790 -

727 Draw a text-based graphical representation of the commit history

728 on the left hand side of the output. This may cause extra lines

729 to be printed in between commits, in order for the graph history

@@ -795,21 +731,20 @@ you would get an output like this:

731 +

732 This enables parent rewriting, see 'History Simplification' below.

733 +

798 -This implies the '--topo-order' option by default, but the

799 -'--date-order' option may also be specified.

734 +This implies the `--topo-order` option by default, but the

735 +`--date-order` option may also be specified.

736

737 ifdef::git-rev-list[]

738 --count::

739 Print a number stating how many commits would have been

740 listed, and suppress all other output. When used together

805 - with '--left-right', instead print the counts for left and

741 + with `--left-right`, instead print the counts for left and

742 right commits, separated by a tab. When used together with

807 - '--cherry-mark', omit patch equivalent commits from these

743 + `--cherry-mark`, omit patch equivalent commits from these

744 counts and print the count for equivalent commits separated

745 by a tab.

746 endif::git-rev-list[]

747

812 -

748 ifndef::git-rev-list[]

749 Diff Formatting

750 ~~~~~~~~~~~~~~~

@@ -819,7 +754,6 @@ Some of them are specific to linkgit:git-rev-list[1], however other diff

754 options may be given. See linkgit:git-diff-files[1] for more options.

755

756 -c::

822 -

757 With this option, diff output for a merge commit

758 shows the differences from each of the parents to the merge result

759 simultaneously instead of showing pairwise diff between a parent

@@ -827,26 +761,22 @@ options may be given. See linkgit:git-diff-files[1] for more options.

761 which were modified from all parents.

762

763 --cc::

830 -

831 - This flag implies the '-c' option and further compresses the

764 + This flag implies the `-c` option and further compresses the

765 patch output by omitting uninteresting hunks whose contents in

766 the parents have only two variants and the merge result picks

767 one of them without modification.

768

769 -m::

837 -

770 This flag makes the merge commits show the full diff like

771 regular commits; for each merge parent, a separate log entry

772 and diff is generated. An exception is that only diff against

841 - the first parent is shown when '--first-parent' option is given;

773 + the first parent is shown when `--first-parent` option is given;

774 in that case, the output represents the changes the merge

775 brought _into_ the then-current branch.

776

777 -r::

846 -

778 Show recursive diffs.

779

780 -t::

850 -

851 - Show the tree objects in the diff output. This implies '-r'.

781 + Show the tree objects in the diff output. This implies `-r`.

782 endif::git-rev-list[]

Documentation/rev-list-options.txt: fix mark-up