logo

oasis-root

Compiled tree of Oasis Linux based on own branch at <https://hacktivis.me/git/oasis/> git clone https://anongit.hacktivis.me/git/oasis-root.git

git-log.1 (132337B)

    

  1. '\" t
  2. .\"     Title: git-log
  3. .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
  4. .\" Generator: DocBook XSL Stylesheets v1.79.2 <http://docbook.sf.net/>
  5. .\"      Date: 2025-03-14
  6. .\"    Manual: Git Manual
  7. .\"    Source: Git 2.49.0
  8. .\"  Language: English
  9. .\"
  10. .TH "GIT\-LOG" "1" "2025-03-14" "Git 2\&.49\&.0" "Git Manual"
  11. .\" -----------------------------------------------------------------
  12. .\" * Define some portability stuff
  13. .\" -----------------------------------------------------------------
  14. .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  15. .\" http://bugs.debian.org/507673
  16. .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
  17. .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  18. .ie \n(.g .ds Aq \(aq
  19. .el       .ds Aq '
  20. .\" -----------------------------------------------------------------
  21. .\" * set default formatting
  22. .\" -----------------------------------------------------------------
  23. .\" disable hyphenation
  24. .nh
  25. .\" disable justification (adjust text to left margin only)
  26. .ad l
  27. .\" -----------------------------------------------------------------
  28. .\" * MAIN CONTENT STARTS HERE *
  29. .\" -----------------------------------------------------------------
  30. .SH "NAME"
  31. git-log \- Show commit logs
  32. .SH "SYNOPSIS"
  33. .sp
  34. .nf
  35. \fIgit log\fR [<options>] [<revision\-range>] [[\-\-] <path>\&...\:]
  36. .fi
  37. .SH "DESCRIPTION"
  38. .sp
  39. Shows the commit logs\&.
  40. .sp
  41. List commits that are reachable by following the \fBparent\fR links from the given commit(s), but exclude commits that are reachable from the one(s) given with a \fI^\fR in front of them\&. The output is given in reverse chronological order by default\&.
  42. .sp
  43. You can think of this as a set operation\&. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with \fI^\fR in front are subtracted from that set\&. The remaining commits are what comes out in the command\(cqs output\&. Various other options and paths parameters can be used to further limit the result\&.
  44. .sp
  45. Thus, the following command:
  46. .sp
  47. .if n \{\
  48. .RS 4
  49. .\}
  50. .nf
  51. $ git log foo bar ^baz
  52. .fi
  53. .if n \{\
  54. .RE
  55. .\}
  56. .sp
  57. means "list all the commits which are reachable from \fIfoo\fR or \fIbar\fR, but not from \fIbaz\fR"\&.
  58. .sp
  59. A special notation "\fI<commit1>\fR\&.\&.\fI<commit2>\fR" can be used as a short\-hand for "^\fI<commit1>\fR \fI<commit2>\fR"\&. For example, either of the following may be used interchangeably:
  60. .sp
  61. .if n \{\
  62. .RS 4
  63. .\}
  64. .nf
  65. $ git log origin\&.\&.HEAD
  66. $ git log HEAD ^origin
  67. .fi
  68. .if n \{\
  69. .RE
  70. .\}
  71. .sp
  72. Another special notation is "\fI<commit1>\fR\&...\:\fI<commit2>\fR" which is useful for merges\&. The resulting set of commits is the symmetric difference between the two operands\&. The following two commands are equivalent:
  73. .sp
  74. .if n \{\
  75. .RS 4
  76. .\}
  77. .nf
  78. $ git log A B \-\-not $(git merge\-base \-\-all A B)
  79. $ git log A\&.\&.\&.B
  80. .fi
  81. .if n \{\
  82. .RE
  83. .\}
  84. .sp
  85. The command takes options applicable to the \fBgit-rev-list\fR(1) command to control what is shown and how, and options applicable to the \fBgit-diff\fR(1) command to control how the changes each commit introduces are shown\&.
  86. .SH "OPTIONS"
  87. .PP
  88. \-\-follow
  89. .RS 4
  90. Continue listing the history of a file beyond renames (works only for a single file)\&.
  91. .RE
  92. .PP
  93. \-\-no\-decorate, \-\-decorate[=short|full|auto|no]
  94. .RS 4
  95. Print out the ref names of any commits that are shown\&. If
  96. \fIshort\fR
  97. is specified, the ref name prefixes
  98. \fIrefs/heads/\fR,
  99. \fIrefs/tags/\fR
  100. and
  101. \fIrefs/remotes/\fR
  102. will not be printed\&. If
  103. \fIfull\fR
  104. is specified, the full ref name (including prefix) will be printed\&. If
  105. \fIauto\fR
  106. is specified, then if the output is going to a terminal, the ref names are shown as if
  107. \fIshort\fR
  108. were given, otherwise no ref names are shown\&. The option
  109. \fB\-\-decorate\fR
  110. is short\-hand for
  111. \fB\-\-decorate=short\fR\&. Default to configuration value of
  112. \fBlog\&.decorate\fR
  113. if configured, otherwise,
  114. \fBauto\fR\&.
  115. .RE
  116. .PP
  117. \-\-decorate\-refs=<pattern>, \-\-decorate\-refs\-exclude=<pattern>
  118. .RS 4
  119. For each candidate reference, do not use it for decoration if it matches any patterns given to
  120. \fB\-\-decorate\-refs\-exclude\fR
  121. or if it doesn\(cqt match any of the patterns given to
  122. \fB\-\-decorate\-refs\fR\&. The
  123. \fBlog\&.excludeDecoration\fR
  124. config option allows excluding refs from the decorations, but an explicit
  125. \fB\-\-decorate\-refs\fR
  126. pattern will override a match in
  127. \fBlog\&.excludeDecoration\fR\&.
  128. .sp
  129. If none of these options or config settings are given, then references are used as decoration if they match
  130. \fBHEAD\fR,
  131. \fBrefs/heads/\fR,
  132. \fBrefs/remotes/\fR,
  133. \fBrefs/stash/\fR, or
  134. \fBrefs/tags/\fR\&.
  135. .RE
  136. .PP
  137. \-\-clear\-decorations
  138. .RS 4
  139. When specified, this option clears all previous
  140. \fB\-\-decorate\-refs\fR
  141. or
  142. \fB\-\-decorate\-refs\-exclude\fR
  143. options and relaxes the default decoration filter to include all references\&. This option is assumed if the config value
  144. \fBlog\&.initialDecorationSet\fR
  145. is set to
  146. \fBall\fR\&.
  147. .RE
  148. .PP
  149. \-\-source
  150. .RS 4
  151. Print out the ref name given on the command line by which each commit was reached\&.
  152. .RE
  153. .PP
  154. \-\-[no\-]mailmap, \-\-[no\-]use\-mailmap
  155. .RS 4
  156. Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses\&. See
  157. \fBgit-shortlog\fR(1)\&.
  158. .RE
  159. .PP
  160. \-\-full\-diff
  161. .RS 4
  162. Without this flag,
  163. \fBgit\fR
  164. \fBlog\fR
  165. \fB\-p\fR
  166. \fI<path>\fR\&.\&.\&. shows commits that touch the specified paths, and diffs about the same specified paths\&. With this, the full diff is shown for commits that touch the specified paths; this means that "<path>\&...\:" limits only commits, and doesn\(cqt limit diff for those commits\&.
  167. .sp
  168. Note that this affects all diff\-based output types, e\&.g\&. those produced by
  169. \fB\-\-stat\fR, etc\&.
  170. .RE
  171. .PP
  172. \-\-log\-size
  173. .RS 4
  174. Include a line
  175. \(lqlog size <number>\(rq
  176. in the output for each commit, where <number> is the length of that commit\(cqs message in bytes\&. Intended to speed up tools that read log messages from
  177. \fBgit\fR
  178. \fBlog\fR
  179. output by allowing them to allocate space in advance\&.
  180. .RE
  181. .PP
  182. \-L<start>,<end>:<file>, \-L:<funcname>:<file>
  183. .RS 4
  184. Trace the evolution of the line range given by
  185. \fI<start>,<end>\fR, or by the function name regex
  186. \fI<funcname>\fR, within the
  187. \fI<file>\fR\&. You may not give any pathspec limiters\&. This is currently limited to a walk starting from a single revision, i\&.e\&., you may only give zero or one positive revision arguments, and
  188. \fI<start>\fR
  189. and
  190. \fI<end>\fR
  191. (or
  192. \fI<funcname>\fR) must exist in the starting revision\&. You can specify this option more than once\&. Implies
  193. \fB\-\-patch\fR\&. Patch output can be suppressed using
  194. \fB\-\-no\-patch\fR, but other diff formats (namely
  195. \fB\-\-raw\fR,
  196. \fB\-\-numstat\fR,
  197. \fB\-\-shortstat\fR,
  198. \fB\-\-dirstat\fR,
  199. \fB\-\-summary\fR,
  200. \fB\-\-name\-only\fR,
  201. \fB\-\-name\-status\fR,
  202. \fB\-\-check\fR) are not currently implemented\&.
  203. .sp
  204. \fI<start>\fR
  205. and
  206. \fI<end>\fR
  207. can take one of these forms:
  208. .sp
  209. .RS 4
  210. .ie n \{\
  211. \h'-04'\(bu\h'+03'\c
  212. .\}
  213. .el \{\
  214. .sp -1
  215. .IP \(bu 2.3
  216. .\}
  217. number
  218. .sp
  219. If
  220. \fI<start>\fR
  221. or
  222. \fI<end>\fR
  223. is a number, it specifies an absolute line number (lines count from 1)\&.
  224. .RE
  225. .sp
  226. .RS 4
  227. .ie n \{\
  228. \h'-04'\(bu\h'+03'\c
  229. .\}
  230. .el \{\
  231. .sp -1
  232. .IP \(bu 2.3
  233. .\}
  234. \fB/regex/\fR
  235. .sp
  236. This form will use the first line matching the given POSIX regex\&. If
  237. \fI<start>\fR
  238. is a regex, it will search from the end of the previous
  239. \fB\-L\fR
  240. range, if any, otherwise from the start of file\&. If
  241. \fI<start>\fR
  242. is
  243. \fB^/regex/\fR, it will search from the start of file\&. If
  244. \fI<end>\fR
  245. is a regex, it will search starting at the line given by
  246. \fI<start>\fR\&.
  247. .RE
  248. .sp
  249. .RS 4
  250. .ie n \{\
  251. \h'-04'\(bu\h'+03'\c
  252. .\}
  253. .el \{\
  254. .sp -1
  255. .IP \(bu 2.3
  256. .\}
  257. +offset or \-offset
  258. .sp
  259. This is only valid for
  260. \fI<end>\fR
  261. and will specify a number of lines before or after the line given by
  262. \fI<start>\fR\&.
  263. .RE
  264. .sp
  265. If
  266. \fB:\fR\fI<funcname>\fR
  267. is given in place of
  268. \fI<start>\fR
  269. and
  270. \fI<end>\fR, it is a regular expression that denotes the range from the first funcname line that matches
  271. \fI<funcname>\fR, up to the next funcname line\&.
  272. \fB:\fR\fI<funcname>\fR
  273. searches from the end of the previous
  274. \fB\-L\fR
  275. range, if any, otherwise from the start of file\&.
  276. \fB^:\fR\fI<funcname>\fR
  277. searches from the start of file\&. The function names are determined in the same way as
  278. \fBgit\fR
  279. \fBdiff\fR
  280. works out patch hunk headers (see
  281. \fIDefining a custom hunk\-header\fR
  282. in
  283. \fBgitattributes\fR(5))\&.
  284. .RE
  285. .PP
  286. <revision\-range>
  287. .RS 4
  288. Show only commits in the specified revision range\&. When no <revision\-range> is specified, it defaults to
  289. \fBHEAD\fR
  290. (i\&.e\&. the whole history leading to the current commit)\&.
  291. \fBorigin\fR\fB\&.\&.\fR\fBHEAD\fR
  292. specifies all the commits reachable from the current commit (i\&.e\&.
  293. \fBHEAD\fR), but not from
  294. \fBorigin\fR\&. For a complete list of ways to spell <revision\-range>, see the
  295. \fISpecifying Ranges\fR
  296. section of
  297. \fBgitrevisions\fR(7)\&.
  298. .RE
  299. .PP
  300. [\-\-] <path>\&...\:
  301. .RS 4
  302. Show only commits that are enough to explain how the files that match the specified paths came to be\&. See
  303. \fIHistory Simplification\fR
  304. below for details and other simplification modes\&.
  305. .sp
  306. Paths may need to be prefixed with
  307. \fB\-\-\fR
  308. to separate them from options or the revision range, when confusion arises\&.
  309. .RE
  310. .SS "Commit Limiting"
  311. .sp
  312. Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit limiting may be applied\&.
  313. .sp
  314. Using more options generally further limits the output (e\&.g\&. \fB\-\-since=\fR\fI<date1>\fR limits to commits newer than \fI<date1>\fR, and using it with \fB\-\-grep=\fR\fI<pattern>\fR further limits to commits whose log message has a line that matches \fI<pattern>\fR), unless otherwise noted\&.
  315. .sp
  316. Note that these are applied before commit ordering and formatting options, such as \fB\-\-reverse\fR\&.
  317. .PP
  318. \-<number>, \-n <number>, \-\-max\-count=<number>
  319. .RS 4
  320. Limit the number of commits to output\&.
  321. .RE
  322. .PP
  323. \-\-skip=<number>
  324. .RS 4
  325. Skip
  326. \fInumber\fR
  327. commits before starting to show the commit output\&.
  328. .RE
  329. .PP
  330. \-\-since=<date>, \-\-after=<date>
  331. .RS 4
  332. Show commits more recent than a specific date\&.
  333. .RE
  334. .PP
  335. \-\-since\-as\-filter=<date>
  336. .RS 4
  337. Show all commits more recent than a specific date\&. This visits all commits in the range, rather than stopping at the first commit which is older than a specific date\&.
  338. .RE
  339. .PP
  340. \-\-until=<date>, \-\-before=<date>
  341. .RS 4
  342. Show commits older than a specific date\&.
  343. .RE
  344. .PP
  345. \-\-author=<pattern>, \-\-committer=<pattern>
  346. .RS 4
  347. Limit the commits output to ones with author/committer header lines that match the specified pattern (regular expression)\&. With more than one
  348. \fB\-\-author=\fR\fI<pattern>\fR, commits whose author matches any of the given patterns are chosen (similarly for multiple
  349. \fB\-\-committer=\fR\fI<pattern>\fR)\&.
  350. .RE
  351. .PP
  352. \-\-grep\-reflog=<pattern>
  353. .RS 4
  354. Limit the commits output to ones with reflog entries that match the specified pattern (regular expression)\&. With more than one
  355. \fB\-\-grep\-reflog\fR, commits whose reflog message matches any of the given patterns are chosen\&. It is an error to use this option unless
  356. \fB\-\-walk\-reflogs\fR
  357. is in use\&.
  358. .RE
  359. .PP
  360. \-\-grep=<pattern>
  361. .RS 4
  362. Limit the commits output to ones with a log message that matches the specified pattern (regular expression)\&. With more than one
  363. \fB\-\-grep=\fR\fI<pattern>\fR, commits whose message matches any of the given patterns are chosen (but see
  364. \fB\-\-all\-match\fR)\&.
  365. .sp
  366. When
  367. \fB\-\-notes\fR
  368. is in effect, the message from the notes is matched as if it were part of the log message\&.
  369. .RE
  370. .PP
  371. \-\-all\-match
  372. .RS 4
  373. Limit the commits output to ones that match all given
  374. \fB\-\-grep\fR, instead of ones that match at least one\&.
  375. .RE
  376. .PP
  377. \-\-invert\-grep
  378. .RS 4
  379. Limit the commits output to ones with a log message that do not match the pattern specified with
  380. \fB\-\-grep=\fR\fI<pattern>\fR\&.
  381. .RE
  382. .PP
  383. \-i, \-\-regexp\-ignore\-case
  384. .RS 4
  385. Match the regular expression limiting patterns without regard to letter case\&.
  386. .RE
  387. .PP
  388. \-\-basic\-regexp
  389. .RS 4
  390. Consider the limiting patterns to be basic regular expressions; this is the default\&.
  391. .RE
  392. .PP
  393. \-E, \-\-extended\-regexp
  394. .RS 4
  395. Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions\&.
  396. .RE
  397. .PP
  398. \-F, \-\-fixed\-strings
  399. .RS 4
  400. Consider the limiting patterns to be fixed strings (don\(cqt interpret pattern as a regular expression)\&.
  401. .RE
  402. .PP
  403. \-P, \-\-perl\-regexp
  404. .RS 4
  405. Consider the limiting patterns to be Perl\-compatible regular expressions\&.
  406. .sp
  407. Support for these types of regular expressions is an optional compile\-time dependency\&. If Git wasn\(cqt compiled with support for them providing this option will cause it to die\&.
  408. .RE
  409. .PP
  410. \-\-remove\-empty
  411. .RS 4
  412. Stop when a given path disappears from the tree\&.
  413. .RE
  414. .PP
  415. \-\-merges
  416. .RS 4
  417. Print only merge commits\&. This is exactly the same as
  418. \fB\-\-min\-parents=2\fR\&.
  419. .RE
  420. .PP
  421. \-\-no\-merges
  422. .RS 4
  423. Do not print commits with more than one parent\&. This is exactly the same as
  424. \fB\-\-max\-parents=1\fR\&.
  425. .RE
  426. .PP
  427. \-\-min\-parents=<number>, \-\-max\-parents=<number>, \-\-no\-min\-parents, \-\-no\-max\-parents
  428. .RS 4
  429. Show only commits which have at least (or at most) that many parent commits\&. In particular,
  430. \fB\-\-max\-parents=1\fR
  431. is the same as
  432. \fB\-\-no\-merges\fR,
  433. \fB\-\-min\-parents=2\fR
  434. is the same as
  435. \fB\-\-merges\fR\&.
  436. \fB\-\-max\-parents=0\fR
  437. gives all root commits and
  438. \fB\-\-min\-parents=3\fR
  439. all octopus merges\&.
  440. .sp
  441. \fB\-\-no\-min\-parents\fR
  442. and
  443. \fB\-\-no\-max\-parents\fR
  444. reset these limits (to no limit) again\&. Equivalent forms are
  445. \fB\-\-min\-parents=0\fR
  446. (any commit has 0 or more parents) and
  447. \fB\-\-max\-parents=\-1\fR
  448. (negative numbers denote no upper limit)\&.
  449. .RE
  450. .PP
  451. \-\-first\-parent
  452. .RS 4
  453. When finding commits to include, follow only the first parent commit upon seeing a merge commit\&. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge\&.
  454. .sp
  455. This option also changes default diff format for merge commits to
  456. \fBfirst\-parent\fR, see
  457. \fB\-\-diff\-merges=first\-parent\fR
  458. for details\&.
  459. .RE
  460. .PP
  461. \-\-exclude\-first\-parent\-only
  462. .RS 4
  463. When finding commits to exclude (with a
  464. \fI^\fR), follow only the first parent commit upon seeing a merge commit\&. This can be used to find the set of changes in a topic branch from the point where it diverged from the remote branch, given that arbitrary merges can be valid topic branch changes\&.
  465. .RE
  466. .PP
  467. \-\-not
  468. .RS 4
  469. Reverses the meaning of the
  470. \fI^\fR
  471. prefix (or lack thereof) for all following revision specifiers, up to the next
  472. \fB\-\-not\fR\&. When used on the command line before \-\-stdin, the revisions passed through stdin will not be affected by it\&. Conversely, when passed via standard input, the revisions passed on the command line will not be affected by it\&.
  473. .RE
  474. .PP
  475. \-\-all
  476. .RS 4
  477. Pretend as if all the refs in
  478. \fBrefs/\fR, along with
  479. \fBHEAD\fR, are listed on the command line as
  480. \fI<commit>\fR\&.
  481. .RE
  482. .PP
  483. \-\-branches[=<pattern>]
  484. .RS 4
  485. Pretend as if all the refs in
  486. \fBrefs/heads\fR
  487. are listed on the command line as
  488. \fI<commit>\fR\&. If
  489. \fI<pattern>\fR
  490. is given, limit branches to ones matching given shell glob\&. If pattern lacks
  491. \fI?\fR,
  492. \fI*\fR, or
  493. \fI[\fR,
  494. \fI/*\fR
  495. at the end is implied\&.
  496. .RE
  497. .PP
  498. \-\-tags[=<pattern>]
  499. .RS 4
  500. Pretend as if all the refs in
  501. \fBrefs/tags\fR
  502. are listed on the command line as
  503. \fI<commit>\fR\&. If
  504. \fI<pattern>\fR
  505. is given, limit tags to ones matching given shell glob\&. If pattern lacks
  506. \fI?\fR,
  507. \fI*\fR, or
  508. \fI[\fR,
  509. \fI/*\fR
  510. at the end is implied\&.
  511. .RE
  512. .PP
  513. \-\-remotes[=<pattern>]
  514. .RS 4
  515. Pretend as if all the refs in
  516. \fBrefs/remotes\fR
  517. are listed on the command line as
  518. \fI<commit>\fR\&. If
  519. \fI<pattern>\fR
  520. is given, limit remote\-tracking branches to ones matching given shell glob\&. If pattern lacks
  521. \fI?\fR,
  522. \fI*\fR, or
  523. \fI[\fR,
  524. \fI/*\fR
  525. at the end is implied\&.
  526. .RE
  527. .PP
  528. \-\-glob=<glob\-pattern>
  529. .RS 4
  530. Pretend as if all the refs matching shell glob
  531. \fI<glob\-pattern>\fR
  532. are listed on the command line as
  533. \fI<commit>\fR\&. Leading
  534. \fIrefs/\fR, is automatically prepended if missing\&. If pattern lacks
  535. \fI?\fR,
  536. \fI*\fR, or
  537. \fI[\fR,
  538. \fI/*\fR
  539. at the end is implied\&.
  540. .RE
  541. .PP
  542. \-\-exclude=<glob\-pattern>
  543. .RS 4
  544. Do not include refs matching
  545. \fI<glob\-pattern>\fR
  546. that the next
  547. \fB\-\-all\fR,
  548. \fB\-\-branches\fR,
  549. \fB\-\-tags\fR,
  550. \fB\-\-remotes\fR, or
  551. \fB\-\-glob\fR
  552. would otherwise consider\&. Repetitions of this option accumulate exclusion patterns up to the next
  553. \fB\-\-all\fR,
  554. \fB\-\-branches\fR,
  555. \fB\-\-tags\fR,
  556. \fB\-\-remotes\fR, or
  557. \fB\-\-glob\fR
  558. option (other options or arguments do not clear accumulated patterns)\&.
  559. .sp
  560. The patterns given should not begin with
  561. \fBrefs/heads\fR,
  562. \fBrefs/tags\fR, or
  563. \fBrefs/remotes\fR
  564. when applied to
  565. \fB\-\-branches\fR,
  566. \fB\-\-tags\fR, or
  567. \fB\-\-remotes\fR, respectively, and they must begin with
  568. \fBrefs/\fR
  569. when applied to
  570. \fB\-\-glob\fR
  571. or
  572. \fB\-\-all\fR\&. If a trailing
  573. \fI/*\fR
  574. is intended, it must be given explicitly\&.
  575. .RE
  576. .PP
  577. \-\-exclude\-hidden=[fetch|receive|uploadpack]
  578. .RS 4
  579. Do not include refs that would be hidden by
  580. \fBgit\-fetch\fR,
  581. \fBgit\-receive\-pack\fR
  582. or
  583. \fBgit\-upload\-pack\fR
  584. by consulting the appropriate
  585. \fBfetch\&.hideRefs\fR,
  586. \fBreceive\&.hideRefs\fR
  587. or
  588. \fBuploadpack\&.hideRefs\fR
  589. configuration along with
  590. \fBtransfer\&.hideRefs\fR
  591. (see
  592. \fBgit-config\fR(1))\&. This option affects the next pseudo\-ref option
  593. \fB\-\-all\fR
  594. or
  595. \fB\-\-glob\fR
  596. and is cleared after processing them\&.
  597. .RE
  598. .PP
  599. \-\-reflog
  600. .RS 4
  601. Pretend as if all objects mentioned by reflogs are listed on the command line as
  602. \fI<commit>\fR\&.
  603. .RE
  604. .PP
  605. \-\-alternate\-refs
  606. .RS 4
  607. Pretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line\&. An alternate repository is any repository whose object directory is specified in
  608. \fBobjects/info/alternates\fR\&. The set of included objects may be modified by
  609. \fBcore\&.alternateRefsCommand\fR, etc\&. See
  610. \fBgit-config\fR(1)\&.
  611. .RE
  612. .PP
  613. \-\-single\-worktree
  614. .RS 4
  615. By default, all working trees will be examined by the following options when there are more than one (see
  616. \fBgit-worktree\fR(1)):
  617. \fB\-\-all\fR,
  618. \fB\-\-reflog\fR
  619. and
  620. \fB\-\-indexed\-objects\fR\&. This option forces them to examine the current working tree only\&.
  621. .RE
  622. .PP
  623. \-\-ignore\-missing
  624. .RS 4
  625. Upon seeing an invalid object name in the input, pretend as if the bad input was not given\&.
  626. .RE
  627. .PP
  628. \-\-bisect
  629. .RS 4
  630. Pretend as if the bad bisection ref
  631. \fBrefs/bisect/bad\fR
  632. was listed and as if it was followed by
  633. \fB\-\-not\fR
  634. and the good bisection refs
  635. \fBrefs/bisect/good\-\fR* on the command line\&.
  636. .RE
  637. .PP
  638. \-\-stdin
  639. .RS 4
  640. In addition to getting arguments from the command line, read them from standard input as well\&. This accepts commits and pseudo\-options like
  641. \fB\-\-all\fR
  642. and
  643. \fB\-\-glob=\fR\&. When a
  644. \fB\-\-\fR
  645. separator is seen, the following input is treated as paths and used to limit the result\&. Flags like
  646. \fB\-\-not\fR
  647. which are read via standard input are only respected for arguments passed in the same way and will not influence any subsequent command line arguments\&.
  648. .RE
  649. .PP
  650. \-\-cherry\-mark
  651. .RS 4
  652. Like
  653. \fB\-\-cherry\-pick\fR
  654. (see below) but mark equivalent commits with
  655. \fB=\fR
  656. rather than omitting them, and inequivalent ones with
  657. \fB+\fR\&.
  658. .RE
  659. .PP
  660. \-\-cherry\-pick
  661. .RS 4
  662. Omit any commit that introduces the same change as another commit on the
  663. \(lqother side\(rq
  664. when the set of commits are limited with symmetric difference\&.
  665. .sp
  666. For example, if you have two branches,
  667. \fBA\fR
  668. and
  669. \fBB\fR, a usual way to list all commits on only one side of them is with
  670. \fB\-\-left\-right\fR
  671. (see the example below in the description of the
  672. \fB\-\-left\-right\fR
  673. option)\&. However, it shows the commits that were cherry\-picked from the other branch (for example,
  674. \(lq3rd on b\(rq
  675. may be cherry\-picked from branch A)\&. With this option, such pairs of commits are excluded from the output\&.
  676. .RE
  677. .PP
  678. \-\-left\-only, \-\-right\-only
  679. .RS 4
  680. List only commits on the respective side of a symmetric difference, i\&.e\&. only those which would be marked < resp\&. > by
  681. \fB\-\-left\-right\fR\&.
  682. .sp
  683. For example,
  684. \fB\-\-cherry\-pick\fR
  685. \fB\-\-right\-only\fR
  686. \fBA\fR\fB\&.\&.\&.\fR\fBB\fR
  687. omits those commits from
  688. \fBB\fR
  689. which are in
  690. \fBA\fR
  691. or are patch\-equivalent to a commit in
  692. \fBA\fR\&. In other words, this lists the
  693. \fB+\fR
  694. commits from
  695. \fBgit\fR
  696. \fBcherry\fR
  697. \fBA\fR
  698. \fBB\fR\&. More precisely,
  699. \fB\-\-cherry\-pick\fR
  700. \fB\-\-right\-only\fR
  701. \fB\-\-no\-merges\fR
  702. gives the exact list\&.
  703. .RE
  704. .PP
  705. \-\-cherry
  706. .RS 4
  707. A synonym for
  708. \fB\-\-right\-only\fR
  709. \fB\-\-cherry\-mark\fR
  710. \fB\-\-no\-merges\fR; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with
  711. \fBgit\fR
  712. \fBlog\fR
  713. \fB\-\-cherry\fR
  714. \fBupstream\fR\fB\&.\&.\&.\fR\fBmybranch\fR, similar to
  715. \fBgit\fR
  716. \fBcherry\fR
  717. \fBupstream\fR
  718. \fBmybranch\fR\&.
  719. .RE
  720. .PP
  721. \-g, \-\-walk\-reflogs
  722. .RS 4
  723. Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones\&. When this option is used you cannot specify commits to exclude (that is,
  724. \fI^commit\fR,
  725. \fIcommit1\&.\&.commit2\fR, and
  726. \fIcommit1\&.\&.\&.commit2\fR
  727. notations cannot be used)\&.
  728. .sp
  729. With
  730. \fB\-\-pretty\fR
  731. format other than
  732. \fBoneline\fR
  733. and
  734. \fBreference\fR
  735. (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog\&. The reflog designator in the output may be shown as
  736. \fBref@\fR{\fI<Nth>\fR} (where
  737. \fI<Nth>\fR
  738. is the reverse\-chronological index in the reflog) or as
  739. \fBref@\fR{\fI<timestamp>\fR} (with the
  740. \fI<timestamp>\fR
  741. for that entry), depending on a few rules:
  742. .sp
  743. .RS 4
  744. .ie n \{\
  745. \h'-04' 1.\h'+01'\c
  746. .\}
  747. .el \{\
  748. .sp -1
  749. .IP "  1." 4.2
  750. .\}
  751. If the starting point is specified as
  752. \fBref@\fR{\fI<Nth>\fR}, show the index format\&.
  753. .RE
  754. .sp
  755. .RS 4
  756. .ie n \{\
  757. \h'-04' 2.\h'+01'\c
  758. .\}
  759. .el \{\
  760. .sp -1
  761. .IP "  2." 4.2
  762. .\}
  763. If the starting point was specified as
  764. \fBref@\fR{now}, show the timestamp format\&.
  765. .RE
  766. .sp
  767. .RS 4
  768. .ie n \{\
  769. \h'-04' 3.\h'+01'\c
  770. .\}
  771. .el \{\
  772. .sp -1
  773. .IP "  3." 4.2
  774. .\}
  775. If neither was used, but
  776. \fB\-\-date\fR
  777. was given on the command line, show the timestamp in the format requested by
  778. \fB\-\-date\fR\&.
  779. .RE
  780. .sp
  781. .RS 4
  782. .ie n \{\
  783. \h'-04' 4.\h'+01'\c
  784. .\}
  785. .el \{\
  786. .sp -1
  787. .IP "  4." 4.2
  788. .\}
  789. Otherwise, show the index format\&.
  790. .RE
  791. .sp
  792. Under
  793. \fB\-\-pretty=oneline\fR, the commit message is prefixed with this information on the same line\&. This option cannot be combined with
  794. \fB\-\-reverse\fR\&. See also
  795. \fBgit-reflog\fR(1)\&.
  796. .sp
  797. Under
  798. \fB\-\-pretty=reference\fR, this information will not be shown at all\&.
  799. .RE
  800. .PP
  801. \-\-merge
  802. .RS 4
  803. Show commits touching conflicted paths in the range
  804. \fBHEAD\fR\fB\&.\&.\&.\fR\fI<other>\fR, where
  805. \fI<other>\fR
  806. is the first existing pseudoref in
  807. \fBMERGE_HEAD\fR,
  808. \fBCHERRY_PICK_HEAD\fR,
  809. \fBREVERT_HEAD\fR
  810. or
  811. \fBREBASE_HEAD\fR\&. Only works when the index has unmerged entries\&. This option can be used to show relevant commits when resolving conflicts from a 3\-way merge\&.
  812. .RE
  813. .PP
  814. \-\-boundary
  815. .RS 4
  816. Output excluded boundary commits\&. Boundary commits are prefixed with
  817. \fB\-\fR\&.
  818. .RE
  819. .SS "History Simplification"
  820. .sp
  821. Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>\&. But there are two parts of \fIHistory Simplification\fR, one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history\&.
  822. .sp
  823. The following options select the commits to be shown:
  824. .PP
  825. <paths>
  826. .RS 4
  827. Commits modifying the given <paths> are selected\&.
  828. .RE
  829. .PP
  830. \-\-simplify\-by\-decoration
  831. .RS 4
  832. Commits that are referred by some branch or tag are selected\&.
  833. .RE
  834. .sp
  835. Note that extra commits can be shown to give a meaningful history\&.
  836. .sp
  837. The following options affect the way the simplification is performed:
  838. .PP
  839. Default mode
  840. .RS 4
  841. Simplifies the history to the simplest history explaining the final state of the tree\&. Simplest because it prunes some side branches if the end result is the same (i\&.e\&. merging branches with the same content)
  842. .RE
  843. .PP
  844. \-\-show\-pulls
  845. .RS 4
  846. Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent\&. This mode is helpful for showing the merge commits that "first introduced" a change to a branch\&.
  847. .RE
  848. .PP
  849. \-\-full\-history
  850. .RS 4
  851. Same as the default mode, but does not prune some history\&.
  852. .RE
  853. .PP
  854. \-\-dense
  855. .RS 4
  856. Only the selected commits are shown, plus some to have a meaningful history\&.
  857. .RE
  858. .PP
  859. \-\-sparse
  860. .RS 4
  861. All commits in the simplified history are shown\&.
  862. .RE
  863. .PP
  864. \-\-simplify\-merges
  865. .RS 4
  866. Additional option to
  867. \fB\-\-full\-history\fR
  868. to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge\&.
  869. .RE
  870. .PP
  871. \-\-ancestry\-path[=<commit>]
  872. .RS 4
  873. When given a range of commits to display (e\&.g\&.
  874. \fIcommit1\&.\&.commit2\fR
  875. or
  876. \fIcommit2 ^commit1\fR), and a commit <commit> in that range, only display commits in that range that are ancestors of <commit>, descendants of <commit>, or <commit> itself\&. If no commit is specified, use
  877. \fIcommit1\fR
  878. (the excluded part of the range) as <commit>\&. Can be passed multiple times; if so, a commit is included if it is any of the commits given or if it is an ancestor or descendant of one of them\&.
  879. .RE
  880. .sp
  881. A more detailed explanation follows\&.
  882. .sp
  883. Suppose you specified \fBfoo\fR as the <paths>\&. We shall call commits that modify \fBfoo\fR !TREESAME, and the rest TREESAME\&. (In a diff filtered for \fBfoo\fR, they look different and equal, respectively\&.)
  884. .sp
  885. In the following, we will always refer to the same example history to illustrate the differences between simplification settings\&. We assume that you are filtering for a file \fBfoo\fR in this commit graph:
  886. .sp
  887. .if n \{\
  888. .RS 4
  889. .\}
  890. .nf
  891.           \&.\-A\-\-\-M\-\-\-N\-\-\-O\-\-\-P\-\-\-Q
  892.          /     /   /   /   /   /
  893.         I     B   C   D   E   Y
  894.          \e   /   /   /   /   /
  895.           `\-\-\-\-\-\-\-\-\-\-\-\-\-\*(Aq   X
  896. .fi
  897. .if n \{\
  898. .RE
  899. .\}
  900. .sp
  901. The horizontal line of history A\-\-\-Q is taken to be the first parent of each merge\&. The commits are:
  902. .sp
  903. .RS 4
  904. .ie n \{\
  905. \h'-04'\(bu\h'+03'\c
  906. .\}
  907. .el \{\
  908. .sp -1
  909. .IP \(bu 2.3
  910. .\}
  911. \fBI\fR
  912. is the initial commit, in which
  913. \fBfoo\fR
  914. exists with contents
  915. \(lqasdf\(rq, and a file
  916. \fBquux\fR
  917. exists with contents
  918. \(lqquux\(rq\&. Initial commits are compared to an empty tree, so
  919. \fBI\fR
  920. is !TREESAME\&.
  921. .RE
  922. .sp
  923. .RS 4
  924. .ie n \{\
  925. \h'-04'\(bu\h'+03'\c
  926. .\}
  927. .el \{\
  928. .sp -1
  929. .IP \(bu 2.3
  930. .\}
  931. In
  932. \fBA\fR,
  933. \fBfoo\fR
  934. contains just
  935. \(lqfoo\(rq\&.
  936. .RE
  937. .sp
  938. .RS 4
  939. .ie n \{\
  940. \h'-04'\(bu\h'+03'\c
  941. .\}
  942. .el \{\
  943. .sp -1
  944. .IP \(bu 2.3
  945. .\}
  946. \fBB\fR
  947. contains the same change as
  948. \fBA\fR\&. Its merge
  949. \fBM\fR
  950. is trivial and hence TREESAME to all parents\&.
  951. .RE
  952. .sp
  953. .RS 4
  954. .ie n \{\
  955. \h'-04'\(bu\h'+03'\c
  956. .\}
  957. .el \{\
  958. .sp -1
  959. .IP \(bu 2.3
  960. .\}
  961. \fBC\fR
  962. does not change
  963. \fBfoo\fR, but its merge
  964. \fBN\fR
  965. changes it to
  966. \(lqfoobar\(rq, so it is not TREESAME to any parent\&.
  967. .RE
  968. .sp
  969. .RS 4
  970. .ie n \{\
  971. \h'-04'\(bu\h'+03'\c
  972. .\}
  973. .el \{\
  974. .sp -1
  975. .IP \(bu 2.3
  976. .\}
  977. \fBD\fR
  978. sets
  979. \fBfoo\fR
  980. to
  981. \(lqbaz\(rq\&. Its merge
  982. \fBO\fR
  983. combines the strings from
  984. \fBN\fR
  985. and
  986. \fBD\fR
  987. to
  988. \(lqfoobarbaz\(rq; i\&.e\&., it is not TREESAME to any parent\&.
  989. .RE
  990. .sp
  991. .RS 4
  992. .ie n \{\
  993. \h'-04'\(bu\h'+03'\c
  994. .\}
  995. .el \{\
  996. .sp -1
  997. .IP \(bu 2.3
  998. .\}
  999. \fBE\fR
  1000. changes
  1001. \fBquux\fR
  1002. to
  1003. \(lqxyzzy\(rq, and its merge
  1004. \fBP\fR
  1005. combines the strings to
  1006. \(lqquux xyzzy\(rq\&.
  1007. \fBP\fR
  1008. is TREESAME to
  1009. \fBO\fR, but not to
  1010. \fBE\fR\&.
  1011. .RE
  1012. .sp
  1013. .RS 4
  1014. .ie n \{\
  1015. \h'-04'\(bu\h'+03'\c
  1016. .\}
  1017. .el \{\
  1018. .sp -1
  1019. .IP \(bu 2.3
  1020. .\}
  1021. \fBX\fR
  1022. is an independent root commit that added a new file
  1023. \fBside\fR, and
  1024. \fBY\fR
  1025. modified it\&.
  1026. \fBY\fR
  1027. is TREESAME to
  1028. \fBX\fR\&. Its merge
  1029. \fBQ\fR
  1030. added
  1031. \fBside\fR
  1032. to
  1033. \fBP\fR, and
  1034. \fBQ\fR
  1035. is TREESAME to
  1036. \fBP\fR, but not to
  1037. \fBY\fR\&.
  1038. .RE
  1039. .sp
  1040. \fBrev\-list\fR walks backwards through history, including or excluding commits based on whether \fB\-\-full\-history\fR and/or parent rewriting (via \fB\-\-parents\fR or \fB\-\-children\fR) are used\&. The following settings are available\&.
  1041. .PP
  1042. Default mode
  1043. .RS 4
  1044. Commits are included if they are not TREESAME to any parent (though this can be changed, see
  1045. \fB\-\-sparse\fR
  1046. below)\&. If the commit was a merge, and it was TREESAME to one parent, follow only that parent\&. (Even if there are several TREESAME parents, follow only one of them\&.) Otherwise, follow all parents\&.
  1047. .sp
  1048. This results in:
  1049. .sp
  1050. .if n \{\
  1051. .RS 4
  1052. .\}
  1053. .nf
  1054.           \&.\-A\-\-\-N\-\-\-O
  1055.          /     /   /
  1056.         I\-\-\-\-\-\-\-\-\-D
  1057. .fi
  1058. .if n \{\
  1059. .RE
  1060. .\}
  1061. .sp
  1062. Note how the rule to only follow the TREESAME parent, if one is available, removed
  1063. \fBB\fR
  1064. from consideration entirely\&.
  1065. \fBC\fR
  1066. was considered via
  1067. \fBN\fR, but is TREESAME\&. Root commits are compared to an empty tree, so
  1068. \fBI\fR
  1069. is !TREESAME\&.
  1070. .sp
  1071. Parent/child relations are only visible with
  1072. \fB\-\-parents\fR, but that does not affect the commits selected in default mode, so we have shown the parent lines\&.
  1073. .RE
  1074. .PP
  1075. \-\-full\-history without parent rewriting
  1076. .RS 4
  1077. This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them\&. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get
  1078. .sp
  1079. .if n \{\
  1080. .RS 4
  1081. .\}
  1082. .nf
  1083.         I  A  B  N  D  O  P  Q
  1084. .fi
  1085. .if n \{\
  1086. .RE
  1087. .\}
  1088. .sp
  1089. \fBM\fR
  1090. was excluded because it is TREESAME to both parents\&.
  1091. \fBE\fR,
  1092. \fBC\fR
  1093. and
  1094. \fBB\fR
  1095. were all walked, but only
  1096. \fBB\fR
  1097. was !TREESAME, so the others do not appear\&.
  1098. .sp
  1099. Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected\&.
  1100. .RE
  1101. .PP
  1102. \-\-full\-history with parent rewriting
  1103. .RS 4
  1104. Ordinary commits are only included if they are !TREESAME (though this can be changed, see
  1105. \fB\-\-sparse\fR
  1106. below)\&.
  1107. .sp
  1108. Merges are always included\&. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves\&. This results in
  1109. .sp
  1110. .if n \{\
  1111. .RS 4
  1112. .\}
  1113. .nf
  1114.           \&.\-A\-\-\-M\-\-\-N\-\-\-O\-\-\-P\-\-\-Q
  1115.          /     /   /   /   /
  1116.         I     B   /   D   /
  1117.          \e   /   /   /   /
  1118.           `\-\-\-\-\-\-\-\-\-\-\-\-\-\*(Aq
  1119. .fi
  1120. .if n \{\
  1121. .RE
  1122. .\}
  1123. .sp
  1124. Compare to
  1125. \fB\-\-full\-history\fR
  1126. without rewriting above\&. Note that
  1127. \fBE\fR
  1128. was pruned away because it is TREESAME, but the parent list of P was rewritten to contain
  1129. \fBE\fR\*(Aqs parent
  1130. \fBI\fR\&. The same happened for
  1131. \fBC\fR
  1132. and
  1133. \fBN\fR, and
  1134. \fBX\fR,
  1135. \fBY\fR
  1136. and
  1137. \fBQ\fR\&.
  1138. .RE
  1139. .sp
  1140. In addition to the above settings, you can change whether TREESAME affects inclusion:
  1141. .PP
  1142. \-\-dense
  1143. .RS 4
  1144. Commits that are walked are included if they are not TREESAME to any parent\&.
  1145. .RE
  1146. .PP
  1147. \-\-sparse
  1148. .RS 4
  1149. All commits that are walked are included\&.
  1150. .sp
  1151. Note that without
  1152. \fB\-\-full\-history\fR, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked\&.
  1153. .RE
  1154. .PP
  1155. \-\-simplify\-merges
  1156. .RS 4
  1157. First, build a history graph in the same way that
  1158. \fB\-\-full\-history\fR
  1159. with parent rewriting does (see above)\&.
  1160. .sp
  1161. Then simplify each commit
  1162. \fBC\fR
  1163. to its replacement
  1164. \fBC\fR\*(Aq in the final history according to the following rules:
  1165. .sp
  1166. .RS 4
  1167. .ie n \{\
  1168. \h'-04'\(bu\h'+03'\c
  1169. .\}
  1170. .el \{\
  1171. .sp -1
  1172. .IP \(bu 2.3
  1173. .\}
  1174. Set
  1175. \fBC\fR\*(Aq to
  1176. \fBC\fR\&.
  1177. .RE
  1178. .sp
  1179. .RS 4
  1180. .ie n \{\
  1181. \h'-04'\(bu\h'+03'\c
  1182. .\}
  1183. .el \{\
  1184. .sp -1
  1185. .IP \(bu 2.3
  1186. .\}
  1187. Replace each parent
  1188. \fBP\fR
  1189. of
  1190. \fBC\fR\*(Aq with its simplification
  1191. \fBP\fR\*(Aq\&. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to\&.
  1192. .RE
  1193. .sp
  1194. .RS 4
  1195. .ie n \{\
  1196. \h'-04'\(bu\h'+03'\c
  1197. .\}
  1198. .el \{\
  1199. .sp -1
  1200. .IP \(bu 2.3
  1201. .\}
  1202. If after this parent rewriting,
  1203. \fBC\fR\*(Aq is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains\&. Otherwise, it is replaced with its only parent\&.
  1204. .RE
  1205. .sp
  1206. The effect of this is best shown by way of comparing to
  1207. \fB\-\-full\-history\fR
  1208. with parent rewriting\&. The example turns into:
  1209. .sp
  1210. .if n \{\
  1211. .RS 4
  1212. .\}
  1213. .nf
  1214.           \&.\-A\-\-\-M\-\-\-N\-\-\-O
  1215.          /     /       /
  1216.         I     B       D
  1217.          \e   /       /
  1218.           `\-\-\-\-\-\-\-\-\-\*(Aq
  1219. .fi
  1220. .if n \{\
  1221. .RE
  1222. .\}
  1223. .sp
  1224. Note the major differences in
  1225. \fBN\fR,
  1226. \fBP\fR, and
  1227. \fBQ\fR
  1228. over
  1229. \fB\-\-full\-history\fR:
  1230. .sp
  1231. .RS 4
  1232. .ie n \{\
  1233. \h'-04'\(bu\h'+03'\c
  1234. .\}
  1235. .el \{\
  1236. .sp -1
  1237. .IP \(bu 2.3
  1238. .\}
  1239. \fBN\fR\*(Aqs parent list had
  1240. \fBI\fR
  1241. removed, because it is an ancestor of the other parent
  1242. \fBM\fR\&. Still,
  1243. \fBN\fR
  1244. remained because it is !TREESAME\&.
  1245. .RE
  1246. .sp
  1247. .RS 4
  1248. .ie n \{\
  1249. \h'-04'\(bu\h'+03'\c
  1250. .\}
  1251. .el \{\
  1252. .sp -1
  1253. .IP \(bu 2.3
  1254. .\}
  1255. \fBP\fR\*(Aqs parent list similarly had
  1256. \fBI\fR
  1257. removed\&.
  1258. \fBP\fR
  1259. was then removed completely, because it had one parent and is TREESAME\&.
  1260. .RE
  1261. .sp
  1262. .RS 4
  1263. .ie n \{\
  1264. \h'-04'\(bu\h'+03'\c
  1265. .\}
  1266. .el \{\
  1267. .sp -1
  1268. .IP \(bu 2.3
  1269. .\}
  1270. \fBQ\fR\*(Aqs parent list had
  1271. \fBY\fR
  1272. simplified to
  1273. \fBX\fR\&.
  1274. \fBX\fR
  1275. was then removed, because it was a TREESAME root\&.
  1276. \fBQ\fR
  1277. was then removed completely, because it had one parent and is TREESAME\&.
  1278. .RE
  1279. .RE
  1280. .sp
  1281. There is another simplification mode available:
  1282. .PP
  1283. \-\-ancestry\-path[=<commit>]
  1284. .RS 4
  1285. Limit the displayed commits to those which are an ancestor of <commit>, or which are a descendant of <commit>, or are <commit> itself\&.
  1286. .sp
  1287. As an example use case, consider the following commit history:
  1288. .sp
  1289. .if n \{\
  1290. .RS 4
  1291. .\}
  1292. .nf
  1293.             D\-\-\-E\-\-\-\-\-\-\-F
  1294.            /     \e       \e
  1295.           B\-\-\-C\-\-\-G\-\-\-H\-\-\-I\-\-\-J
  1296.          /                     \e
  1297.         A\-\-\-\-\-\-\-K\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-L\-\-M
  1298. .fi
  1299. .if n \{\
  1300. .RE
  1301. .\}
  1302. .sp
  1303. A regular
  1304. \fID\&.\&.M\fR
  1305. computes the set of commits that are ancestors of
  1306. \fBM\fR, but excludes the ones that are ancestors of
  1307. \fBD\fR\&. This is useful to see what happened to the history leading to
  1308. \fBM\fR
  1309. since
  1310. \fBD\fR, in the sense that
  1311. \(lqwhat does \fBM\fR have that did not exist in \fBD\fR\(rq\&. The result in this example would be all the commits, except
  1312. \fBA\fR
  1313. and
  1314. \fBB\fR
  1315. (and
  1316. \fBD\fR
  1317. itself, of course)\&.
  1318. .sp
  1319. When we want to find out what commits in
  1320. \fBM\fR
  1321. are contaminated with the bug introduced by
  1322. \fBD\fR
  1323. and need fixing, however, we might want to view only the subset of
  1324. \fID\&.\&.M\fR
  1325. that are actually descendants of
  1326. \fBD\fR, i\&.e\&. excluding
  1327. \fBC\fR
  1328. and
  1329. \fBK\fR\&. This is exactly what the
  1330. \fB\-\-ancestry\-path\fR
  1331. option does\&. Applied to the
  1332. \fID\&.\&.M\fR
  1333. range, it results in:
  1334. .sp
  1335. .if n \{\
  1336. .RS 4
  1337. .\}
  1338. .nf
  1339.                 E\-\-\-\-\-\-\-F
  1340.                  \e       \e
  1341.                   G\-\-\-H\-\-\-I\-\-\-J
  1342.                                \e
  1343.                                 L\-\-M
  1344. .fi
  1345. .if n \{\
  1346. .RE
  1347. .\}
  1348. .sp
  1349. We can also use
  1350. \fB\-\-ancestry\-path=D\fR
  1351. instead of
  1352. \fB\-\-ancestry\-path\fR
  1353. which means the same thing when applied to the
  1354. \fID\&.\&.M\fR
  1355. range but is just more explicit\&.
  1356. .sp
  1357. If we instead are interested in a given topic within this range, and all commits affected by that topic, we may only want to view the subset of
  1358. \fBD\fR\fB\&.\&.\fR\fBM\fR
  1359. which contain that topic in their ancestry path\&. So, using
  1360. \fB\-\-ancestry\-path=H\fR
  1361. \fBD\fR\fB\&.\&.\fR\fBM\fR
  1362. for example would result in:
  1363. .sp
  1364. .if n \{\
  1365. .RS 4
  1366. .\}
  1367. .nf
  1368.                 E
  1369.                  \e
  1370.                   G\-\-\-H\-\-\-I\-\-\-J
  1371.                                \e
  1372.                                 L\-\-M
  1373. .fi
  1374. .if n \{\
  1375. .RE
  1376. .\}
  1377. .sp
  1378. Whereas
  1379. \fB\-\-ancestry\-path=K\fR
  1380. \fBD\fR\fB\&.\&.\fR\fBM\fR
  1381. would result in
  1382. .sp
  1383. .if n \{\
  1384. .RS 4
  1385. .\}
  1386. .nf
  1387.                 K\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-L\-\-M
  1388. .fi
  1389. .if n \{\
  1390. .RE
  1391. .\}
  1392. .RE
  1393. .sp
  1394. Before discussing another option, \fB\-\-show\-pulls\fR, we need to create a new example history\&.
  1395. .sp
  1396. A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file\(cqs simplified history\&. Let\(cqs demonstrate a new example and show how options such as \fB\-\-full\-history\fR and \fB\-\-simplify\-merges\fR works in that case:
  1397. .sp
  1398. .if n \{\
  1399. .RS 4
  1400. .\}
  1401. .nf
  1402.           \&.\-A\-\-\-M\-\-\-\-\-C\-\-N\-\-\-O\-\-\-P
  1403.          /     / \e  \e  \e/   /   /
  1404.         I     B   \e  R\-\*(Aq`\-Z\*(Aq   /
  1405.          \e   /     \e/         /
  1406.           \e /      /\e        /
  1407.            `\-\-\-X\-\-\*(Aq  `\-\-\-Y\-\-\*(Aq
  1408. .fi
  1409. .if n \{\
  1410. .RE
  1411. .\}
  1412. .sp
  1413. For this example, suppose \fBI\fR created \fBfile\&.txt\fR which was modified by \fBA\fR, \fBB\fR, and \fBX\fR in different ways\&. The single\-parent commits \fBC\fR, \fBZ\fR, and \fBY\fR do not change \fBfile\&.txt\fR\&. The merge commit \fBM\fR was created by resolving the merge conflict to include both changes from \fBA\fR and \fBB\fR and hence is not TREESAME to either\&. The merge commit \fBR\fR, however, was created by ignoring the contents of \fBfile\&.txt\fR at \fBM\fR and taking only the contents of \fBfile\&.txt\fR at \fBX\fR\&. Hence, \fBR\fR is TREESAME to \fBX\fR but not \fBM\fR\&. Finally, the natural merge resolution to create \fBN\fR is to take the contents of \fBfile\&.txt\fR at \fBR\fR, so \fBN\fR is TREESAME to \fBR\fR but not \fBC\fR\&. The merge commits \fBO\fR and \fBP\fR are TREESAME to their first parents, but not to their second parents, \fBZ\fR and \fBY\fR respectively\&.
  1414. .sp
  1415. When using the default mode, \fBN\fR and \fBR\fR both have a TREESAME parent, so those edges are walked and the others are ignored\&. The resulting history graph is:
  1416. .sp
  1417. .if n \{\
  1418. .RS 4
  1419. .\}
  1420. .nf
  1421.         I\-\-\-X
  1422. .fi
  1423. .if n \{\
  1424. .RE
  1425. .\}
  1426. .sp
  1427. When using \fB\-\-full\-history\fR, Git walks every edge\&. This will discover the commits \fBA\fR and \fBB\fR and the merge \fBM\fR, but also will reveal the merge commits \fBO\fR and \fBP\fR\&. With parent rewriting, the resulting graph is:
  1428. .sp
  1429. .if n \{\
  1430. .RS 4
  1431. .\}
  1432. .nf
  1433.           \&.\-A\-\-\-M\-\-\-\-\-\-\-\-N\-\-\-O\-\-\-P
  1434.          /     / \e  \e  \e/   /   /
  1435.         I     B   \e  R\-\*(Aq`\-\-\*(Aq   /
  1436.          \e   /     \e/         /
  1437.           \e /      /\e        /
  1438.            `\-\-\-X\-\-\*(Aq  `\-\-\-\-\-\-\*(Aq
  1439. .fi
  1440. .if n \{\
  1441. .RE
  1442. .\}
  1443. .sp
  1444. Here, the merge commits \fBO\fR and \fBP\fR contribute extra noise, as they did not actually contribute a change to \fBfile\&.txt\fR\&. They only merged a topic that was based on an older version of \fBfile\&.txt\fR\&. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: many unrelated merges appear in the \fB\-\-full\-history\fR results\&.
  1445. .sp
  1446. When using the \fB\-\-simplify\-merges\fR option, the commits \fBO\fR and \fBP\fR disappear from the results\&. This is because the rewritten second parents of \fBO\fR and \fBP\fR are reachable from their first parents\&. Those edges are removed and then the commits look like single\-parent commits that are TREESAME to their parent\&. This also happens to the commit \fBN\fR, resulting in a history view as follows:
  1447. .sp
  1448. .if n \{\
  1449. .RS 4
  1450. .\}
  1451. .nf
  1452.           \&.\-A\-\-\-M\-\-\&.
  1453.          /     /    \e
  1454.         I     B      R
  1455.          \e   /      /
  1456.           \e /      /
  1457.            `\-\-\-X\-\-\*(Aq
  1458. .fi
  1459. .if n \{\
  1460. .RE
  1461. .\}
  1462. .sp
  1463. In this view, we see all of the important single\-parent changes from \fBA\fR, \fBB\fR, and \fBX\fR\&. We also see the carefully\-resolved merge \fBM\fR and the not\-so\-carefully\-resolved merge \fBR\fR\&. This is usually enough information to determine why the commits \fBA\fR and \fBB\fR "disappeared" from history in the default view\&. However, there are a few issues with this approach\&.
  1464. .sp
  1465. The first issue is performance\&. Unlike any previous option, the \fB\-\-simplify\-merges\fR option requires walking the entire commit history before returning a single result\&. This can make the option difficult to use for very large repositories\&.
  1466. .sp
  1467. The second issue is one of auditing\&. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch\&. The problematic merge \fBR\fR above is not likely to be the merge commit that was used to merge into an important branch\&. Instead, the merge \fBN\fR was used to merge \fBR\fR and \fBX\fR into the important branch\&. This commit may have information about why the change \fBX\fR came to override the changes from \fBA\fR and \fBB\fR in its commit message\&.
  1468. .PP
  1469. \-\-show\-pulls
  1470. .RS 4
  1471. In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent\&.
  1472. .sp
  1473. When a merge commit is included by
  1474. \fB\-\-show\-pulls\fR, the merge is treated as if it "pulled" the change from another branch\&. When using
  1475. \fB\-\-show\-pulls\fR
  1476. on this example (and no other options) the resulting graph is:
  1477. .sp
  1478. .if n \{\
  1479. .RS 4
  1480. .\}
  1481. .nf
  1482.         I\-\-\-X\-\-\-R\-\-\-N
  1483. .fi
  1484. .if n \{\
  1485. .RE
  1486. .\}
  1487. .sp
  1488. Here, the merge commits
  1489. \fBR\fR
  1490. and
  1491. \fBN\fR
  1492. are included because they pulled the commits
  1493. \fBX\fR
  1494. and
  1495. \fBR\fR
  1496. into the base branch, respectively\&. These merges are the reason the commits
  1497. \fBA\fR
  1498. and
  1499. \fBB\fR
  1500. do not appear in the default history\&.
  1501. .sp
  1502. When
  1503. \fB\-\-show\-pulls\fR
  1504. is paired with
  1505. \fB\-\-simplify\-merges\fR, the graph includes all of the necessary information:
  1506. .sp
  1507. .if n \{\
  1508. .RS 4
  1509. .\}
  1510. .nf
  1511.           \&.\-A\-\-\-M\-\-\&.   N
  1512.          /     /    \e /
  1513.         I     B      R
  1514.          \e   /      /
  1515.           \e /      /
  1516.            `\-\-\-X\-\-\*(Aq
  1517. .fi
  1518. .if n \{\
  1519. .RE
  1520. .\}
  1521. .sp
  1522. Notice that since
  1523. \fBM\fR
  1524. is reachable from
  1525. \fBR\fR, the edge from
  1526. \fBN\fR
  1527. to
  1528. \fBM\fR
  1529. was simplified away\&. However,
  1530. \fBN\fR
  1531. still appears in the history as an important commit because it "pulled" the change
  1532. \fBR\fR
  1533. into the main branch\&.
  1534. .RE
  1535. .sp
  1536. The \fB\-\-simplify\-by\-decoration\fR option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags\&. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line\&. All other commits are marked as TREESAME (subject to be simplified away)\&.
  1537. .SS "Commit Ordering"
  1538. .sp
  1539. By default, the commits are shown in reverse chronological order\&.
  1540. .PP
  1541. \-\-date\-order
  1542. .RS 4
  1543. Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order\&.
  1544. .RE
  1545. .PP
  1546. \-\-author\-date\-order
  1547. .RS 4
  1548. Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order\&.
  1549. .RE
  1550. .PP
  1551. \-\-topo\-order
  1552. .RS 4
  1553. Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed\&.
  1554. .sp
  1555. For example, in a commit history like this:
  1556. .sp
  1557. .if n \{\
  1558. .RS 4
  1559. .\}
  1560. .nf
  1561.     \-\-\-1\-\-\-\-2\-\-\-\-4\-\-\-\-7
  1562.         \e              \e
  1563.          3\-\-\-\-5\-\-\-\-6\-\-\-\-8\-\-\-
  1564. .fi
  1565. .if n \{\
  1566. .RE
  1567. .\}
  1568. .sp
  1569. where the numbers denote the order of commit timestamps,
  1570. \fBgit\fR
  1571. \fBrev\-list\fR
  1572. and friends with
  1573. \fB\-\-date\-order\fR
  1574. show the commits in the timestamp order: 8 7 6 5 4 3 2 1\&.
  1575. .sp
  1576. With
  1577. \fB\-\-topo\-order\fR, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together\&.
  1578. .RE
  1579. .PP
  1580. \-\-reverse
  1581. .RS 4
  1582. Output the commits chosen to be shown (see Commit Limiting section above) in reverse order\&. Cannot be combined with
  1583. \fB\-\-walk\-reflogs\fR\&.
  1584. .RE
  1585. .SS "Object Traversal"
  1586. .sp
  1587. These options are mostly targeted for packing of Git repositories\&.
  1588. .PP
  1589. \-\-no\-walk[=(sorted|unsorted)]
  1590. .RS 4
  1591. Only show the given commits, but do not traverse their ancestors\&. This has no effect if a range is specified\&. If the argument
  1592. \fBunsorted\fR
  1593. is given, the commits are shown in the order they were given on the command line\&. Otherwise (if
  1594. \fBsorted\fR
  1595. or no argument was given), the commits are shown in reverse chronological order by commit time\&. Cannot be combined with
  1596. \fB\-\-graph\fR\&.
  1597. .RE
  1598. .PP
  1599. \-\-do\-walk
  1600. .RS 4
  1601. Overrides a previous
  1602. \fB\-\-no\-walk\fR\&.
  1603. .RE
  1604. .SS "Commit Formatting"
  1605. .PP
  1606. \-\-pretty[=<format>], \-\-format=<format>
  1607. .RS 4
  1608. Pretty\-print the contents of the commit logs in a given format, where
  1609. \fI<format>\fR
  1610. can be one of
  1611. \fIoneline\fR,
  1612. \fIshort\fR,
  1613. \fImedium\fR,
  1614. \fIfull\fR,
  1615. \fIfuller\fR,
  1616. \fIreference\fR,
  1617. \fIemail\fR,
  1618. \fIraw\fR,
  1619. \fIformat:<string>\fR
  1620. and
  1621. \fItformat:<string>\fR\&. When
  1622. \fI<format>\fR
  1623. is none of the above, and has
  1624. \fI%placeholder\fR
  1625. in it, it acts as if
  1626. \fI\-\-pretty=tformat:<format>\fR
  1627. were given\&.
  1628. .sp
  1629. See the "PRETTY FORMATS" section for some additional details for each format\&. When
  1630. \fI=<format>\fR
  1631. part is omitted, it defaults to
  1632. \fImedium\fR\&.
  1633. .sp
  1634. Note: you can specify the default pretty format in the repository configuration (see
  1635. \fBgit-config\fR(1))\&.
  1636. .RE
  1637. .PP
  1638. \-\-abbrev\-commit
  1639. .RS 4
  1640. Instead of showing the full 40\-byte hexadecimal commit object name, show a prefix that names the object uniquely\&. "\-\-abbrev=<n>" (which also modifies diff output, if it is displayed) option can be used to specify the minimum length of the prefix\&.
  1641. .sp
  1642. This should make "\-\-pretty=oneline" a whole lot more readable for people using 80\-column terminals\&.
  1643. .RE
  1644. .PP
  1645. \-\-no\-abbrev\-commit
  1646. .RS 4
  1647. Show the full 40\-byte hexadecimal commit object name\&. This negates
  1648. \fB\-\-abbrev\-commit\fR, either explicit or implied by other options such as "\-\-oneline"\&. It also overrides the
  1649. \fBlog\&.abbrevCommit\fR
  1650. variable\&.
  1651. .RE
  1652. .PP
  1653. \-\-oneline
  1654. .RS 4
  1655. This is a shorthand for "\-\-pretty=oneline \-\-abbrev\-commit" used together\&.
  1656. .RE
  1657. .PP
  1658. \-\-encoding=<encoding>
  1659. .RS 4
  1660. Commit objects record the character encoding used for the log message in their encoding header; this option can be used to tell the command to re\-code the commit log message in the encoding preferred by the user\&. For non plumbing commands this defaults to UTF\-8\&. Note that if an object claims to be encoded in
  1661. \fBX\fR
  1662. and we are outputting in
  1663. \fBX\fR, we will output the object verbatim; this means that invalid sequences in the original commit may be copied to the output\&. Likewise, if iconv(3) fails to convert the commit, we will quietly output the original object verbatim\&.
  1664. .RE
  1665. .PP
  1666. \-\-expand\-tabs=<n>, \-\-expand\-tabs, \-\-no\-expand\-tabs
  1667. .RS 4
  1668. Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of
  1669. \fI<n>\fR) in the log message before showing it in the output\&.
  1670. \fB\-\-expand\-tabs\fR
  1671. is a short\-hand for
  1672. \fB\-\-expand\-tabs=8\fR, and
  1673. \fB\-\-no\-expand\-tabs\fR
  1674. is a short\-hand for
  1675. \fB\-\-expand\-tabs=0\fR, which disables tab expansion\&.
  1676. .sp
  1677. By default, tabs are expanded in pretty formats that indent the log message by 4 spaces (i\&.e\&.
  1678. \fImedium\fR, which is the default,
  1679. \fIfull\fR, and
  1680. \fIfuller\fR)\&.
  1681. .RE
  1682. .PP
  1683. \-\-notes[=<ref>]
  1684. .RS 4
  1685. Show the notes (see
  1686. \fBgit-notes\fR(1)) that annotate the commit, when showing the commit log message\&. This is the default for
  1687. \fBgit\fR
  1688. \fBlog\fR,
  1689. \fBgit\fR
  1690. \fBshow\fR
  1691. and
  1692. \fBgit\fR
  1693. \fBwhatchanged\fR
  1694. commands when there is no
  1695. \fB\-\-pretty\fR,
  1696. \fB\-\-format\fR, or
  1697. \fB\-\-oneline\fR
  1698. option given on the command line\&.
  1699. .sp
  1700. By default, the notes shown are from the notes refs listed in the
  1701. \fBcore\&.notesRef\fR
  1702. and
  1703. \fBnotes\&.displayRef\fR
  1704. variables (or corresponding environment overrides)\&. See
  1705. \fBgit-config\fR(1)
  1706. for more details\&.
  1707. .sp
  1708. With an optional
  1709. \fI<ref>\fR
  1710. argument, use the ref to find the notes to display\&. The ref can specify the full refname when it begins with
  1711. \fBrefs/notes/\fR; when it begins with
  1712. \fBnotes/\fR,
  1713. \fBrefs/\fR
  1714. and otherwise
  1715. \fBrefs/notes/\fR
  1716. is prefixed to form the full name of the ref\&.
  1717. .sp
  1718. Multiple \-\-notes options can be combined to control which notes are being displayed\&. Examples: "\-\-notes=foo" will show only notes from "refs/notes/foo"; "\-\-notes=foo \-\-notes" will show both notes from "refs/notes/foo" and from the default notes ref(s)\&.
  1719. .RE
  1720. .PP
  1721. \-\-no\-notes
  1722. .RS 4
  1723. Do not show notes\&. This negates the above
  1724. \fB\-\-notes\fR
  1725. option, by resetting the list of notes refs from which notes are shown\&. Options are parsed in the order given on the command line, so e\&.g\&. "\-\-notes \-\-notes=foo \-\-no\-notes \-\-notes=bar" will only show notes from "refs/notes/bar"\&.
  1726. .RE
  1727. .PP
  1728. \-\-show\-notes\-by\-default
  1729. .RS 4
  1730. Show the default notes unless options for displaying specific notes are given\&.
  1731. .RE
  1732. .PP
  1733. \-\-show\-notes[=<ref>], \-\-[no\-]standard\-notes
  1734. .RS 4
  1735. These options are deprecated\&. Use the above \-\-notes/\-\-no\-notes options instead\&.
  1736. .RE
  1737. .PP
  1738. \-\-show\-signature
  1739. .RS 4
  1740. Check the validity of a signed commit object by passing the signature to
  1741. \fBgpg\fR
  1742. \fB\-\-verify\fR
  1743. and show the output\&.
  1744. .RE
  1745. .PP
  1746. \-\-relative\-date
  1747. .RS 4
  1748. Synonym for
  1749. \fB\-\-date=relative\fR\&.
  1750. .RE
  1751. .PP
  1752. \-\-date=<format>
  1753. .RS 4
  1754. Only takes effect for dates shown in human\-readable format, such as when using
  1755. \fB\-\-pretty\fR\&.
  1756. \fBlog\&.date\fR
  1757. config variable sets a default value for the log command\(cqs
  1758. \fB\-\-date\fR
  1759. option\&. By default, dates are shown in the original time zone (either committer\(cqs or author\(cqs)\&. If
  1760. \fB\-local\fR
  1761. is appended to the format (e\&.g\&.,
  1762. \fBiso\-local\fR), the user\(cqs local time zone is used instead\&.
  1763. .sp
  1764. \fB\-\-date=relative\fR
  1765. shows dates relative to the current time, e\&.g\&.
  1766. \(lq2 hours ago\(rq\&. The
  1767. \fB\-local\fR
  1768. option has no effect for
  1769. \fB\-\-date=relative\fR\&.
  1770. .sp
  1771. \fB\-\-date=local\fR
  1772. is an alias for
  1773. \fB\-\-date=default\-local\fR\&.
  1774. .sp
  1775. \fB\-\-date=iso\fR
  1776. (or
  1777. \fB\-\-date=iso8601\fR) shows timestamps in a ISO 8601\-like format\&. The differences to the strict ISO 8601 format are:
  1778. .sp
  1779. .RS 4
  1780. .ie n \{\
  1781. \h'-04'\(bu\h'+03'\c
  1782. .\}
  1783. .el \{\
  1784. .sp -1
  1785. .IP \(bu 2.3
  1786. .\}
  1787. a space instead of the
  1788. \fBT\fR
  1789. date/time delimiter
  1790. .RE
  1791. .sp
  1792. .RS 4
  1793. .ie n \{\
  1794. \h'-04'\(bu\h'+03'\c
  1795. .\}
  1796. .el \{\
  1797. .sp -1
  1798. .IP \(bu 2.3
  1799. .\}
  1800. a space between time and time zone
  1801. .RE
  1802. .sp
  1803. .RS 4
  1804. .ie n \{\
  1805. \h'-04'\(bu\h'+03'\c
  1806. .\}
  1807. .el \{\
  1808. .sp -1
  1809. .IP \(bu 2.3
  1810. .\}
  1811. no colon between hours and minutes of the time zone
  1812. .RE
  1813. .sp
  1814. \fB\-\-date=iso\-strict\fR
  1815. (or
  1816. \fB\-\-date=iso8601\-strict\fR) shows timestamps in strict ISO 8601 format\&.
  1817. .sp
  1818. \fB\-\-date=rfc\fR
  1819. (or
  1820. \fB\-\-date=rfc2822\fR) shows timestamps in RFC 2822 format, often found in email messages\&.
  1821. .sp
  1822. \fB\-\-date=short\fR
  1823. shows only the date, but not the time, in
  1824. \fBYYYY\-MM\-DD\fR
  1825. format\&.
  1826. .sp
  1827. \fB\-\-date=raw\fR
  1828. shows the date as seconds since the epoch (1970\-01\-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a
  1829. \fB+\fR
  1830. or
  1831. \fB\-\fR
  1832. with four digits; the first two are hours, and the second two are minutes)\&. I\&.e\&., as if the timestamp were formatted with
  1833. \fBstrftime\fR("%s %z"))\&. Note that the
  1834. \fB\-local\fR
  1835. option does not affect the seconds\-since\-epoch value (which is always measured in UTC), but does switch the accompanying timezone value\&.
  1836. .sp
  1837. \fB\-\-date=human\fR
  1838. shows the timezone if the timezone does not match the current time\-zone, and doesn\(cqt print the whole date if that matches (ie skip printing year for dates that are "this year", but also skip the whole date itself if it\(cqs in the last few days and we can just say what weekday it was)\&. For older dates the hour and minute is also omitted\&.
  1839. .sp
  1840. \fB\-\-date=unix\fR
  1841. shows the date as a Unix epoch timestamp (seconds since 1970)\&. As with
  1842. \fB\-\-raw\fR, this is always in UTC and therefore
  1843. \fB\-local\fR
  1844. has no effect\&.
  1845. .sp
  1846. \fB\-\-date=format:\&.\&.\fR\&. feeds the format \&.\&.\&. to your system
  1847. \fBstrftime\fR, except for %s, %z, and %Z, which are handled internally\&. Use
  1848. \fB\-\-date=format:\fR%c to show the date in your system locale\(cqs preferred format\&. See the
  1849. \fBstrftime\fR
  1850. manual for a complete list of format placeholders\&. When using
  1851. \fB\-local\fR, the correct syntax is
  1852. \fB\-\-date=format\-local:\&.\&.\fR\&.\&.
  1853. .sp
  1854. \fB\-\-date=default\fR
  1855. is the default format, and is based on ctime(3) output\&. It shows a single line with three\-letter day of the week, three\-letter month, day\-of\-month, hour\-minute\-seconds in "HH:MM:SS" format, followed by 4\-digit year, plus timezone information, unless the local time zone is used, e\&.g\&.
  1856. \fBThu\fR
  1857. \fBJan\fR
  1858. \fB1\fR
  1859. \fB00:00:00\fR
  1860. \fB1970\fR
  1861. \fB+0000\fR\&.
  1862. .RE
  1863. .PP
  1864. \-\-parents
  1865. .RS 4
  1866. Print also the parents of the commit (in the form "commit parent\&...\:")\&. Also enables parent rewriting, see
  1867. \fIHistory Simplification\fR
  1868. above\&.
  1869. .RE
  1870. .PP
  1871. \-\-children
  1872. .RS 4
  1873. Print also the children of the commit (in the form "commit child\&...\:")\&. Also enables parent rewriting, see
  1874. \fIHistory Simplification\fR
  1875. above\&.
  1876. .RE
  1877. .PP
  1878. \-\-left\-right
  1879. .RS 4
  1880. Mark which side of a symmetric difference a commit is reachable from\&. Commits from the left side are prefixed with < and those from the right with >\&. If combined with
  1881. \fB\-\-boundary\fR, those commits are prefixed with
  1882. \fB\-\fR\&.
  1883. .sp
  1884. For example, if you have this topology:
  1885. .sp
  1886. .if n \{\
  1887. .RS 4
  1888. .\}
  1889. .nf
  1890.              y\-\-\-b\-\-\-b  branch B
  1891.             / \e /
  1892.            /   \&.
  1893.           /   / \e
  1894.          o\-\-\-x\-\-\-a\-\-\-a  branch A
  1895. .fi
  1896. .if n \{\
  1897. .RE
  1898. .\}
  1899. .sp
  1900. you would get an output like this:
  1901. .sp
  1902. .if n \{\
  1903. .RS 4
  1904. .\}
  1905. .nf
  1906.         $ git rev\-list \-\-left\-right \-\-boundary \-\-pretty=oneline A\&.\&.\&.B
  1908.         >bbbbbbb\&.\&.\&. 3rd on b
  1909.         >bbbbbbb\&.\&.\&. 2nd on b
  1910.         <aaaaaaa\&.\&.\&. 3rd on a
  1911.         <aaaaaaa\&.\&.\&. 2nd on a
  1912.         \-yyyyyyy\&.\&.\&. 1st on b
  1913.         \-xxxxxxx\&.\&.\&. 1st on a
  1914. .fi
  1915. .if n \{\
  1916. .RE
  1917. .\}
  1918. .RE
  1919. .PP
  1920. \-\-graph
  1921. .RS 4
  1922. Draw a text\-based graphical representation of the commit history on the left hand side of the output\&. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly\&. Cannot be combined with
  1923. \fB\-\-no\-walk\fR\&.
  1924. .sp
  1925. This enables parent rewriting, see
  1926. \fIHistory Simplification\fR
  1927. above\&.
  1928. .sp
  1929. This implies the
  1930. \fB\-\-topo\-order\fR
  1931. option by default, but the
  1932. \fB\-\-date\-order\fR
  1933. option may also be specified\&.
  1934. .RE
  1935. .PP
  1936. \-\-show\-linear\-break[=<barrier>]
  1937. .RS 4
  1938. When \-\-graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch\&. This option puts a barrier in between them in that case\&. If
  1939. \fI<barrier>\fR
  1940. is specified, it is the string that will be shown instead of the default one\&.
  1941. .RE
  1942. .SH "PRETTY FORMATS"
  1943. .sp
  1944. If the commit is a merge, and if the pretty\-format is not \fIoneline\fR, \fIemail\fR or \fIraw\fR, an additional line is inserted before the \fIAuthor:\fR line\&. This line begins with "Merge: " and the hashes of ancestral commits are printed, separated by spaces\&. Note that the listed commits may not necessarily be the list of the \fBdirect\fR parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file\&.
  1945. .sp
  1946. There are several built\-in formats, and you can define additional formats by setting a pretty\&.<name> config option to either another format name, or a \fIformat:\fR string, as described below (see \fBgit-config\fR(1))\&. Here are the details of the built\-in formats:
  1947. .sp
  1948. .RS 4
  1949. .ie n \{\
  1950. \h'-04'\(bu\h'+03'\c
  1951. .\}
  1952. .el \{\
  1953. .sp -1
  1954. .IP \(bu 2.3
  1955. .\}
  1956. \fIoneline\fR
  1957. .sp
  1958. .if n \{\
  1959. .RS 4
  1960. .\}
  1961. .nf
  1962. <hash> <title\-line>
  1963. .fi
  1964. .if n \{\
  1965. .RE
  1966. .\}
  1967. .sp
  1968. This is designed to be as compact as possible\&.
  1969. .RE
  1970. .sp
  1971. .RS 4
  1972. .ie n \{\
  1973. \h'-04'\(bu\h'+03'\c
  1974. .\}
  1975. .el \{\
  1976. .sp -1
  1977. .IP \(bu 2.3
  1978. .\}
  1979. \fIshort\fR
  1980. .sp
  1981. .if n \{\
  1982. .RS 4
  1983. .\}
  1984. .nf
  1985. commit <hash>
  1986. Author: <author>
  1987. .fi
  1988. .if n \{\
  1989. .RE
  1990. .\}
  1991. .sp
  1992. .if n \{\
  1993. .RS 4
  1994. .\}
  1995. .nf
  1996. <title\-line>
  1997. .fi
  1998. .if n \{\
  1999. .RE
  2000. .\}
  2001. .RE
  2002. .sp
  2003. .RS 4
  2004. .ie n \{\
  2005. \h'-04'\(bu\h'+03'\c
  2006. .\}
  2007. .el \{\
  2008. .sp -1
  2009. .IP \(bu 2.3
  2010. .\}
  2011. \fImedium\fR
  2012. .sp
  2013. .if n \{\
  2014. .RS 4
  2015. .\}
  2016. .nf
  2017. commit <hash>
  2018. Author: <author>
  2019. Date:   <author\-date>
  2020. .fi
  2021. .if n \{\
  2022. .RE
  2023. .\}
  2024. .sp
  2025. .if n \{\
  2026. .RS 4
  2027. .\}
  2028. .nf
  2029. <title\-line>
  2030. .fi
  2031. .if n \{\
  2032. .RE
  2033. .\}
  2034. .sp
  2035. .if n \{\
  2036. .RS 4
  2037. .\}
  2038. .nf
  2039. <full\-commit\-message>
  2040. .fi
  2041. .if n \{\
  2042. .RE
  2043. .\}
  2044. .RE
  2045. .sp
  2046. .RS 4
  2047. .ie n \{\
  2048. \h'-04'\(bu\h'+03'\c
  2049. .\}
  2050. .el \{\
  2051. .sp -1
  2052. .IP \(bu 2.3
  2053. .\}
  2054. \fIfull\fR
  2055. .sp
  2056. .if n \{\
  2057. .RS 4
  2058. .\}
  2059. .nf
  2060. commit <hash>
  2061. Author: <author>
  2062. Commit: <committer>
  2063. .fi
  2064. .if n \{\
  2065. .RE
  2066. .\}
  2067. .sp
  2068. .if n \{\
  2069. .RS 4
  2070. .\}
  2071. .nf
  2072. <title\-line>
  2073. .fi
  2074. .if n \{\
  2075. .RE
  2076. .\}
  2077. .sp
  2078. .if n \{\
  2079. .RS 4
  2080. .\}
  2081. .nf
  2082. <full\-commit\-message>
  2083. .fi
  2084. .if n \{\
  2085. .RE
  2086. .\}
  2087. .RE
  2088. .sp
  2089. .RS 4
  2090. .ie n \{\
  2091. \h'-04'\(bu\h'+03'\c
  2092. .\}
  2093. .el \{\
  2094. .sp -1
  2095. .IP \(bu 2.3
  2096. .\}
  2097. \fIfuller\fR
  2098. .sp
  2099. .if n \{\
  2100. .RS 4
  2101. .\}
  2102. .nf
  2103. commit <hash>
  2104. Author:     <author>
  2105. AuthorDate: <author\-date>
  2106. Commit:     <committer>
  2107. CommitDate: <committer\-date>
  2108. .fi
  2109. .if n \{\
  2110. .RE
  2111. .\}
  2112. .sp
  2113. .if n \{\
  2114. .RS 4
  2115. .\}
  2116. .nf
  2117. <title\-line>
  2118. .fi
  2119. .if n \{\
  2120. .RE
  2121. .\}
  2122. .sp
  2123. .if n \{\
  2124. .RS 4
  2125. .\}
  2126. .nf
  2127. <full\-commit\-message>
  2128. .fi
  2129. .if n \{\
  2130. .RE
  2131. .\}
  2132. .RE
  2133. .sp
  2134. .RS 4
  2135. .ie n \{\
  2136. \h'-04'\(bu\h'+03'\c
  2137. .\}
  2138. .el \{\
  2139. .sp -1
  2140. .IP \(bu 2.3
  2141. .\}
  2142. \fIreference\fR
  2143. .sp
  2144. .if n \{\
  2145. .RS 4
  2146. .\}
  2147. .nf
  2148. <abbrev\-hash> (<title\-line>, <short\-author\-date>)
  2149. .fi
  2150. .if n \{\
  2151. .RE
  2152. .\}
  2153. .sp
  2154. This format is used to refer to another commit in a commit message and is the same as
  2155. \fB\-\-pretty=\fR\*(Aqformat:%C(\fBauto\fR)%h (%s, %ad)\*(Aq\&. By default, the date is formatted with
  2156. \fB\-\-date=short\fR
  2157. unless another
  2158. \fB\-\-date\fR
  2159. option is explicitly specified\&. As with any
  2160. \fBformat:\fR
  2161. with format placeholders, its output is not affected by other options like
  2162. \fB\-\-decorate\fR
  2163. and
  2164. \fB\-\-walk\-reflogs\fR\&.
  2165. .RE
  2166. .sp
  2167. .RS 4
  2168. .ie n \{\
  2169. \h'-04'\(bu\h'+03'\c
  2170. .\}
  2171. .el \{\
  2172. .sp -1
  2173. .IP \(bu 2.3
  2174. .\}
  2175. \fIemail\fR
  2176. .sp
  2177. .if n \{\
  2178. .RS 4
  2179. .\}
  2180. .nf
  2181. From <hash> <date>
  2182. From: <author>
  2183. Date: <author\-date>
  2184. Subject: [PATCH] <title\-line>
  2185. .fi
  2186. .if n \{\
  2187. .RE
  2188. .\}
  2189. .sp
  2190. .if n \{\
  2191. .RS 4
  2192. .\}
  2193. .nf
  2194. <full\-commit\-message>
  2195. .fi
  2196. .if n \{\
  2197. .RE
  2198. .\}
  2199. .RE
  2200. .sp
  2201. .RS 4
  2202. .ie n \{\
  2203. \h'-04'\(bu\h'+03'\c
  2204. .\}
  2205. .el \{\
  2206. .sp -1
  2207. .IP \(bu 2.3
  2208. .\}
  2209. \fImboxrd\fR
  2210. .sp
  2211. Like
  2212. \fIemail\fR, but lines in the commit message starting with "From " (preceded by zero or more ">") are quoted with ">" so they aren\(cqt confused as starting a new commit\&.
  2213. .RE
  2214. .sp
  2215. .RS 4
  2216. .ie n \{\
  2217. \h'-04'\(bu\h'+03'\c
  2218. .\}
  2219. .el \{\
  2220. .sp -1
  2221. .IP \(bu 2.3
  2222. .\}
  2223. \fIraw\fR
  2224. .sp
  2225. The
  2226. \fIraw\fR
  2227. format shows the entire commit exactly as stored in the commit object\&. Notably, the hashes are displayed in full, regardless of whether \-\-abbrev or \-\-no\-abbrev are used, and
  2228. \fIparents\fR
  2229. information show the true parent commits, without taking grafts or history simplification into account\&. Note that this format affects the way commits are displayed, but not the way the diff is shown e\&.g\&. with
  2230. \fBgit\fR
  2231. \fBlog\fR
  2232. \fB\-\-raw\fR\&. To get full object names in a raw diff format, use
  2233. \fB\-\-no\-abbrev\fR\&.
  2234. .RE
  2235. .sp
  2236. .RS 4
  2237. .ie n \{\
  2238. \h'-04'\(bu\h'+03'\c
  2239. .\}
  2240. .el \{\
  2241. .sp -1
  2242. .IP \(bu 2.3
  2243. .\}
  2244. \fIformat:<format\-string>\fR
  2245. .sp
  2246. The
  2247. \fIformat:<format\-string>\fR
  2248. format allows you to specify which information you want to show\&. It works a little bit like printf format, with the notable exception that you get a newline with
  2249. \fI%n\fR
  2250. instead of
  2251. \fI\en\fR\&.
  2252. .sp
  2253. E\&.g,
  2254. \fIformat:"The author of %h was %an, %ar%nThe title was >>%s<<%n"\fR
  2255. would show something like this:
  2256. .sp
  2257. .if n \{\
  2258. .RS 4
  2259. .\}
  2260. .nf
  2261. The author of fe6e0ee was Junio C Hamano, 23 hours ago
  2262. The title was >>t4119: test autocomputing \-p<n> for traditional diff input\&.<<
  2263. .fi
  2264. .if n \{\
  2265. .RE
  2266. .\}
  2267. .sp
  2268. The placeholders are:
  2269. .sp
  2270. .RS 4
  2271. .ie n \{\
  2272. \h'-04'\(bu\h'+03'\c
  2273. .\}
  2274. .el \{\
  2275. .sp -1
  2276. .IP \(bu 2.3
  2277. .\}
  2278. Placeholders that expand to a single literal character:
  2279. .PP
  2280. \fI%n\fR
  2281. .RS 4
  2282. newline
  2283. .RE
  2284. .PP
  2285. \fI%%\fR
  2286. .RS 4
  2287. a raw
  2288. \fI%\fR
  2289. .RE
  2290. .PP
  2291. \fI%x00\fR
  2292. .RS 4
  2293. \fI%x\fR
  2294. followed by two hexadecimal digits is replaced with a byte with the hexadecimal digits\*(Aq value (we will call this "literal formatting code" in the rest of this document)\&.
  2295. .RE
  2296. .RE
  2297. .sp
  2298. .RS 4
  2299. .ie n \{\
  2300. \h'-04'\(bu\h'+03'\c
  2301. .\}
  2302. .el \{\
  2303. .sp -1
  2304. .IP \(bu 2.3
  2305. .\}
  2306. Placeholders that affect formatting of later placeholders:
  2307. .PP
  2308. \fI%Cred\fR
  2309. .RS 4
  2310. switch color to red
  2311. .RE
  2312. .PP
  2313. \fI%Cgreen\fR
  2314. .RS 4
  2315. switch color to green
  2316. .RE
  2317. .PP
  2318. \fI%Cblue\fR
  2319. .RS 4
  2320. switch color to blue
  2321. .RE
  2322. .PP
  2323. \fI%Creset\fR
  2324. .RS 4
  2325. reset color
  2326. .RE
  2327. .PP
  2328. \fI%C(\&...\:)\fR
  2329. .RS 4
  2330. color specification, as described under Values in the "CONFIGURATION FILE" section of
  2331. \fBgit-config\fR(1)\&. By default, colors are shown only when enabled for log output (by
  2332. \fBcolor\&.diff\fR,
  2333. \fBcolor\&.ui\fR, or
  2334. \fB\-\-color\fR, and respecting the
  2335. \fBauto\fR
  2336. settings of the former if we are going to a terminal)\&. %C(\fBauto,\fR\fB\&.\&.\&.\fR) is accepted as a historical synonym for the default (e\&.g\&., %C(\fBauto,red\fR))\&. Specifying %C(\fBalways,\fR\fB\&.\&.\&.\fR) will show the colors even when color is not otherwise enabled (though consider just using
  2337. \fB\-\-color=always\fR
  2338. to enable color for the whole output, including this format and anything else git might color)\&.
  2339. \fBauto\fR
  2340. alone (i\&.e\&. %C(\fBauto\fR)) will turn on auto coloring on the next placeholders until the color is switched again\&.
  2341. .RE
  2342. .PP
  2343. \fI%m\fR
  2344. .RS 4
  2345. left (<), right (>) or boundary (\fB\-\fR) mark
  2346. .RE
  2347. .PP
  2348. \fI%w([<w>[,<i1>[,<i2>]]])\fR
  2349. .RS 4
  2350. switch line wrapping, like the \-w option of
  2351. \fBgit-shortlog\fR(1)\&.
  2352. .RE
  2353. .PP
  2354. \fI%<( <N> [,trunc|ltrunc|mtrunc])\fR
  2355. .RS 4
  2356. make the next placeholder take at least N column widths, padding spaces on the right if necessary\&. Optionally truncate (with ellipsis
  2357. \fI\&.\&.\fR) at the left (ltrunc)
  2358. \fB\&.\&.\fR\fBft\fR, the middle (mtrunc)
  2359. \fBmi\fR\fB\&.\&.\fR\fBle\fR, or the end (trunc)
  2360. \fBrig\&.\&.\fR, if the output is longer than N columns\&. Note 1: that truncating only works correctly with N >= 2\&. Note 2: spaces around the N and M (see below) values are optional\&. Note 3: Emojis and other wide characters will take two display columns, which may over\-run column boundaries\&. Note 4: decomposed character combining marks may be misplaced at padding boundaries\&.
  2361. .RE
  2362. .PP
  2363. \fI%<|( <M> )\fR
  2364. .RS 4
  2365. make the next placeholder take at least until Mth display column, padding spaces on the right if necessary\&. Use negative M values for column positions measured from the right hand edge of the terminal window\&.
  2366. .RE
  2367. .PP
  2368. \fI%>( <N> )\fR, \fI%>|( <M> )\fR
  2369. .RS 4
  2370. similar to
  2371. \fI%<( <N> )\fR,
  2372. \fI%<|( <M> )\fR
  2373. respectively, but padding spaces on the left
  2374. .RE
  2375. .PP
  2376. \fI%>>( <N> )\fR, \fI%>>|( <M> )\fR
  2377. .RS 4
  2378. similar to
  2379. \fI%>( <N> )\fR,
  2380. \fI%>|( <M> )\fR
  2381. respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces
  2382. .RE
  2383. .PP
  2384. \fI%><( <N> )\fR, \fI%><|( <M> )\fR
  2385. .RS 4
  2386. similar to
  2387. \fI%<( <N> )\fR,
  2388. \fI%<|( <M> )\fR
  2389. respectively, but padding both sides (i\&.e\&. the text is centered)
  2390. .RE
  2391. .RE
  2392. .sp
  2393. .RS 4
  2394. .ie n \{\
  2395. \h'-04'\(bu\h'+03'\c
  2396. .\}
  2397. .el \{\
  2398. .sp -1
  2399. .IP \(bu 2.3
  2400. .\}
  2401. Placeholders that expand to information extracted from the commit:
  2402. .PP
  2403. \fI%H\fR
  2404. .RS 4
  2405. commit hash
  2406. .RE
  2407. .PP
  2408. \fI%h\fR
  2409. .RS 4
  2410. abbreviated commit hash
  2411. .RE
  2412. .PP
  2413. \fI%T\fR
  2414. .RS 4
  2415. tree hash
  2416. .RE
  2417. .PP
  2418. \fI%t\fR
  2419. .RS 4
  2420. abbreviated tree hash
  2421. .RE
  2422. .PP
  2423. \fI%P\fR
  2424. .RS 4
  2425. parent hashes
  2426. .RE
  2427. .PP
  2428. \fI%p\fR
  2429. .RS 4
  2430. abbreviated parent hashes
  2431. .RE
  2432. .PP
  2433. \fI%an\fR
  2434. .RS 4
  2435. author name
  2436. .RE
  2437. .PP
  2438. \fI%aN\fR
  2439. .RS 4
  2440. author name (respecting \&.mailmap, see
  2441. \fBgit-shortlog\fR(1)
  2442. or
  2443. \fBgit-blame\fR(1))
  2444. .RE
  2445. .PP
  2446. \fI%ae\fR
  2447. .RS 4
  2448. author email
  2449. .RE
  2450. .PP
  2451. \fI%aE\fR
  2452. .RS 4
  2453. author email (respecting \&.mailmap, see
  2454. \fBgit-shortlog\fR(1)
  2455. or
  2456. \fBgit-blame\fR(1))
  2457. .RE
  2458. .PP
  2459. \fI%al\fR
  2460. .RS 4
  2461. author email local\-part (the part before the
  2462. \fI@\fR
  2463. sign)
  2464. .RE
  2465. .PP
  2466. \fI%aL\fR
  2467. .RS 4
  2468. author local\-part (see
  2469. \fI%al\fR) respecting \&.mailmap, see
  2470. \fBgit-shortlog\fR(1)
  2471. or
  2472. \fBgit-blame\fR(1))
  2473. .RE
  2474. .PP
  2475. \fI%ad\fR
  2476. .RS 4
  2477. author date (format respects \-\-date= option)
  2478. .RE
  2479. .PP
  2480. \fI%aD\fR
  2481. .RS 4
  2482. author date, RFC2822 style
  2483. .RE
  2484. .PP
  2485. \fI%ar\fR
  2486. .RS 4
  2487. author date, relative
  2488. .RE
  2489. .PP
  2490. \fI%at\fR
  2491. .RS 4
  2492. author date, UNIX timestamp
  2493. .RE
  2494. .PP
  2495. \fI%ai\fR
  2496. .RS 4
  2497. author date, ISO 8601\-like format
  2498. .RE
  2499. .PP
  2500. \fI%aI\fR
  2501. .RS 4
  2502. author date, strict ISO 8601 format
  2503. .RE
  2504. .PP
  2505. \fI%as\fR
  2506. .RS 4
  2507. author date, short format (\fBYYYY\-MM\-DD\fR)
  2508. .RE
  2509. .PP
  2510. \fI%ah\fR
  2511. .RS 4
  2512. author date, human style (like the
  2513. \fB\-\-date=human\fR
  2514. option of
  2515. \fBgit-rev-list\fR(1))
  2516. .RE
  2517. .PP
  2518. \fI%cn\fR
  2519. .RS 4
  2520. committer name
  2521. .RE
  2522. .PP
  2523. \fI%cN\fR
  2524. .RS 4
  2525. committer name (respecting \&.mailmap, see
  2526. \fBgit-shortlog\fR(1)
  2527. or
  2528. \fBgit-blame\fR(1))
  2529. .RE
  2530. .PP
  2531. \fI%ce\fR
  2532. .RS 4
  2533. committer email
  2534. .RE
  2535. .PP
  2536. \fI%cE\fR
  2537. .RS 4
  2538. committer email (respecting \&.mailmap, see
  2539. \fBgit-shortlog\fR(1)
  2540. or
  2541. \fBgit-blame\fR(1))
  2542. .RE
  2543. .PP
  2544. \fI%cl\fR
  2545. .RS 4
  2546. committer email local\-part (the part before the
  2547. \fI@\fR
  2548. sign)
  2549. .RE
  2550. .PP
  2551. \fI%cL\fR
  2552. .RS 4
  2553. committer local\-part (see
  2554. \fI%cl\fR) respecting \&.mailmap, see
  2555. \fBgit-shortlog\fR(1)
  2556. or
  2557. \fBgit-blame\fR(1))
  2558. .RE
  2559. .PP
  2560. \fI%cd\fR
  2561. .RS 4
  2562. committer date (format respects \-\-date= option)
  2563. .RE
  2564. .PP
  2565. \fI%cD\fR
  2566. .RS 4
  2567. committer date, RFC2822 style
  2568. .RE
  2569. .PP
  2570. \fI%cr\fR
  2571. .RS 4
  2572. committer date, relative
  2573. .RE
  2574. .PP
  2575. \fI%ct\fR
  2576. .RS 4
  2577. committer date, UNIX timestamp
  2578. .RE
  2579. .PP
  2580. \fI%ci\fR
  2581. .RS 4
  2582. committer date, ISO 8601\-like format
  2583. .RE
  2584. .PP
  2585. \fI%cI\fR
  2586. .RS 4
  2587. committer date, strict ISO 8601 format
  2588. .RE
  2589. .PP
  2590. \fI%cs\fR
  2591. .RS 4
  2592. committer date, short format (\fBYYYY\-MM\-DD\fR)
  2593. .RE
  2594. .PP
  2595. \fI%ch\fR
  2596. .RS 4
  2597. committer date, human style (like the
  2598. \fB\-\-date=human\fR
  2599. option of
  2600. \fBgit-rev-list\fR(1))
  2601. .RE
  2602. .PP
  2603. \fI%d\fR
  2604. .RS 4
  2605. ref names, like the \-\-decorate option of
  2606. \fBgit-log\fR(1)
  2607. .RE
  2608. .PP
  2609. \fI%D\fR
  2610. .RS 4
  2611. ref names without the " (", ")" wrapping\&.
  2612. .RE
  2613. .PP
  2614. \fI%(decorate[:<options>])\fR
  2615. .RS 4
  2616. ref names with custom decorations\&. The
  2617. \fBdecorate\fR
  2618. string may be followed by a colon and zero or more comma\-separated options\&. Option values may contain literal formatting codes\&. These must be used for commas (%x2C) and closing parentheses (%x29), due to their role in the option syntax\&.
  2619. .sp
  2620. .RS 4
  2621. .ie n \{\
  2622. \h'-04'\(bu\h'+03'\c
  2623. .\}
  2624. .el \{\
  2625. .sp -1
  2626. .IP \(bu 2.3
  2627. .\}
  2628. \fIprefix=<value>\fR: Shown before the list of ref names\&. Defaults to "\ \&("\&.
  2629. .RE
  2630. .sp
  2631. .RS 4
  2632. .ie n \{\
  2633. \h'-04'\(bu\h'+03'\c
  2634. .\}
  2635. .el \{\
  2636. .sp -1
  2637. .IP \(bu 2.3
  2638. .\}
  2639. \fIsuffix=<value>\fR: Shown after the list of ref names\&. Defaults to ")"\&.
  2640. .RE
  2641. .sp
  2642. .RS 4
  2643. .ie n \{\
  2644. \h'-04'\(bu\h'+03'\c
  2645. .\}
  2646. .el \{\
  2647. .sp -1
  2648. .IP \(bu 2.3
  2649. .\}
  2650. \fIseparator=<value>\fR: Shown between ref names\&. Defaults to "\fB,\fR\ \&"\&.
  2651. .RE
  2652. .sp
  2653. .RS 4
  2654. .ie n \{\
  2655. \h'-04'\(bu\h'+03'\c
  2656. .\}
  2657. .el \{\
  2658. .sp -1
  2659. .IP \(bu 2.3
  2660. .\}
  2661. \fIpointer=<value>\fR: Shown between HEAD and the branch it points to, if any\&. Defaults to "\ \&\fB\-\fR>\ \&"\&.
  2662. .RE
  2663. .sp
  2664. .RS 4
  2665. .ie n \{\
  2666. \h'-04'\(bu\h'+03'\c
  2667. .\}
  2668. .el \{\
  2669. .sp -1
  2670. .IP \(bu 2.3
  2671. .\}
  2672. \fItag=<value>\fR: Shown before tag names\&. Defaults to "\fBtag:\fR\ \&"\&.
  2673. .RE
  2674. .RE
  2675. .RE
  2676. .sp
  2677. For example, to produce decorations with no wrapping or tag annotations, and spaces as separators:
  2678. .sp
  2679. + %(\fBdecorate:prefix=,suffix=,tag=,separator=\fR
  2680. )
  2681. .PP
  2682. \fI%(describe[:<options>])\fR
  2683. .RS 4
  2684. human\-readable name, like
  2685. \fBgit-describe\fR(1); empty string for undescribable commits\&. The
  2686. \fBdescribe\fR
  2687. string may be followed by a colon and zero or more comma\-separated options\&. Descriptions can be inconsistent when tags are added or removed at the same time\&.
  2688. .sp
  2689. .RS 4
  2690. .ie n \{\
  2691. \h'-04'\(bu\h'+03'\c
  2692. .\}
  2693. .el \{\
  2694. .sp -1
  2695. .IP \(bu 2.3
  2696. .\}
  2697. \fItags[=<bool\-value>]\fR: Instead of only considering annotated tags, consider lightweight tags as well\&.
  2698. .RE
  2699. .sp
  2700. .RS 4
  2701. .ie n \{\
  2702. \h'-04'\(bu\h'+03'\c
  2703. .\}
  2704. .el \{\
  2705. .sp -1
  2706. .IP \(bu 2.3
  2707. .\}
  2708. \fIabbrev=<number>\fR: Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use <number> digits, or as many digits as needed to form a unique object name\&.
  2709. .RE
  2710. .sp
  2711. .RS 4
  2712. .ie n \{\
  2713. \h'-04'\(bu\h'+03'\c
  2714. .\}
  2715. .el \{\
  2716. .sp -1
  2717. .IP \(bu 2.3
  2718. .\}
  2719. \fImatch=<pattern>\fR: Only consider tags matching the given
  2720. \fBglob\fR(\fB7\fR) pattern, excluding the "refs/tags/" prefix\&.
  2721. .RE
  2722. .sp
  2723. .RS 4
  2724. .ie n \{\
  2725. \h'-04'\(bu\h'+03'\c
  2726. .\}
  2727. .el \{\
  2728. .sp -1
  2729. .IP \(bu 2.3
  2730. .\}
  2731. \fIexclude=<pattern>\fR: Do not consider tags matching the given
  2732. \fBglob\fR(\fB7\fR) pattern, excluding the "refs/tags/" prefix\&.
  2733. .RE
  2734. .RE
  2735. .PP
  2736. \fI%S\fR
  2737. .RS 4
  2738. ref name given on the command line by which the commit was reached (like
  2739. \fBgit\fR
  2740. \fBlog\fR
  2741. \fB\-\-source\fR), only works with
  2742. \fBgit\fR
  2743. \fBlog\fR
  2744. .RE
  2745. .PP
  2746. \fI%e\fR
  2747. .RS 4
  2748. encoding
  2749. .RE
  2750. .PP
  2751. \fI%s\fR
  2752. .RS 4
  2753. subject
  2754. .RE
  2755. .PP
  2756. \fI%f\fR
  2757. .RS 4
  2758. sanitized subject line, suitable for a filename
  2759. .RE
  2760. .PP
  2761. \fI%b\fR
  2762. .RS 4
  2763. body
  2764. .RE
  2765. .PP
  2766. \fI%B\fR
  2767. .RS 4
  2768. raw body (unwrapped subject and body)
  2769. .RE
  2770. .PP
  2771. \fI%N\fR
  2772. .RS 4
  2773. commit notes
  2774. .RE
  2775. .PP
  2776. \fI%GG\fR
  2777. .RS 4
  2778. raw verification message from GPG for a signed commit
  2779. .RE
  2780. .PP
  2781. \fI%G?\fR
  2782. .RS 4
  2783. show "G" for a good (valid) signature, "B" for a bad signature, "U" for a good signature with unknown validity, "X" for a good signature that has expired, "Y" for a good signature made by an expired key, "R" for a good signature made by a revoked key, "E" if the signature cannot be checked (e\&.g\&. missing key) and "N" for no signature
  2784. .RE
  2785. .PP
  2786. \fI%GS\fR
  2787. .RS 4
  2788. show the name of the signer for a signed commit
  2789. .RE
  2790. .PP
  2791. \fI%GK\fR
  2792. .RS 4
  2793. show the key used to sign a signed commit
  2794. .RE
  2795. .PP
  2796. \fI%GF\fR
  2797. .RS 4
  2798. show the fingerprint of the key used to sign a signed commit
  2799. .RE
  2800. .PP
  2801. \fI%GP\fR
  2802. .RS 4
  2803. show the fingerprint of the primary key whose subkey was used to sign a signed commit
  2804. .RE
  2805. .PP
  2806. \fI%GT\fR
  2807. .RS 4
  2808. show the trust level for the key used to sign a signed commit
  2809. .RE
  2810. .PP
  2811. \fI%gD\fR
  2812. .RS 4
  2813. reflog selector, e\&.g\&.,
  2814. \fBrefs/stash@\fR{1} or
  2815. \fBrefs/stash@\fR{2
  2816. \fBminutes\fR
  2817. \fBago\fR}; the format follows the rules described for the
  2818. \fB\-g\fR
  2819. option\&. The portion before the
  2820. \fB@\fR
  2821. is the refname as given on the command line (so
  2822. \fBgit\fR
  2823. \fBlog\fR
  2824. \fB\-g\fR
  2825. \fBrefs/heads/master\fR
  2826. would yield
  2827. \fBrefs/heads/master@\fR{0})\&.
  2828. .RE
  2829. .PP
  2830. \fI%gd\fR
  2831. .RS 4
  2832. shortened reflog selector; same as %gD, but the refname portion is shortened for human readability (so
  2833. \fBrefs/heads/master\fR
  2834. becomes just
  2835. \fBmaster\fR)\&.
  2836. .RE
  2837. .PP
  2838. \fI%gn\fR
  2839. .RS 4
  2840. reflog identity name
  2841. .RE
  2842. .PP
  2843. \fI%gN\fR
  2844. .RS 4
  2845. reflog identity name (respecting \&.mailmap, see
  2846. \fBgit-shortlog\fR(1)
  2847. or
  2848. \fBgit-blame\fR(1))
  2849. .RE
  2850. .PP
  2851. \fI%ge\fR
  2852. .RS 4
  2853. reflog identity email
  2854. .RE
  2855. .PP
  2856. \fI%gE\fR
  2857. .RS 4
  2858. reflog identity email (respecting \&.mailmap, see
  2859. \fBgit-shortlog\fR(1)
  2860. or
  2861. \fBgit-blame\fR(1))
  2862. .RE
  2863. .PP
  2864. \fI%gs\fR
  2865. .RS 4
  2866. reflog subject
  2867. .RE
  2868. .PP
  2869. \fI%(trailers[:<options>])\fR
  2870. .RS 4
  2871. display the trailers of the body as interpreted by
  2872. \fBgit-interpret-trailers\fR(1)\&. The
  2873. \fBtrailers\fR
  2874. string may be followed by a colon and zero or more comma\-separated options\&. If any option is provided multiple times, the last occurrence wins\&.
  2875. .sp
  2876. .RS 4
  2877. .ie n \{\
  2878. \h'-04'\(bu\h'+03'\c
  2879. .\}
  2880. .el \{\
  2881. .sp -1
  2882. .IP \(bu 2.3
  2883. .\}
  2884. \fIkey=<key>\fR: only show trailers with specified <key>\&. Matching is done case\-insensitively and trailing colon is optional\&. If option is given multiple times trailer lines matching any of the keys are shown\&. This option automatically enables the
  2885. \fBonly\fR
  2886. option so that non\-trailer lines in the trailer block are hidden\&. If that is not desired it can be disabled with
  2887. \fBonly=false\fR\&. E\&.g\&., %(\fBtrailers:key=Reviewed\-by\fR) shows trailer lines with key
  2888. \fBReviewed\-by\fR\&.
  2889. .RE
  2890. .sp
  2891. .RS 4
  2892. .ie n \{\
  2893. \h'-04'\(bu\h'+03'\c
  2894. .\}
  2895. .el \{\
  2896. .sp -1
  2897. .IP \(bu 2.3
  2898. .\}
  2899. \fIonly[=<bool>]\fR: select whether non\-trailer lines from the trailer block should be included\&.
  2900. .RE
  2901. .sp
  2902. .RS 4
  2903. .ie n \{\
  2904. \h'-04'\(bu\h'+03'\c
  2905. .\}
  2906. .el \{\
  2907. .sp -1
  2908. .IP \(bu 2.3
  2909. .\}
  2910. \fIseparator=<sep>\fR: specify the separator inserted between trailer lines\&. Defaults to a line feed character\&. The string <sep> may contain the literal formatting codes described above\&. To use comma as separator one must use %x2C as it would otherwise be parsed as next option\&. E\&.g\&., %(\fBtrailers:key=Ticket,separator=\fR%x2C ) shows all trailer lines whose key is "Ticket" separated by a comma and a space\&.
  2911. .RE
  2912. .sp
  2913. .RS 4
  2914. .ie n \{\
  2915. \h'-04'\(bu\h'+03'\c
  2916. .\}
  2917. .el \{\
  2918. .sp -1
  2919. .IP \(bu 2.3
  2920. .\}
  2921. \fIunfold[=<bool>]\fR: make it behave as if interpret\-trailer\(cqs
  2922. \fB\-\-unfold\fR
  2923. option was given\&. E\&.g\&., %(\fBtrailers:only,unfold=true\fR) unfolds and shows all trailer lines\&.
  2924. .RE
  2925. .sp
  2926. .RS 4
  2927. .ie n \{\
  2928. \h'-04'\(bu\h'+03'\c
  2929. .\}
  2930. .el \{\
  2931. .sp -1
  2932. .IP \(bu 2.3
  2933. .\}
  2934. \fIkeyonly[=<bool>]\fR: only show the key part of the trailer\&.
  2935. .RE
  2936. .sp
  2937. .RS 4
  2938. .ie n \{\
  2939. \h'-04'\(bu\h'+03'\c
  2940. .\}
  2941. .el \{\
  2942. .sp -1
  2943. .IP \(bu 2.3
  2944. .\}
  2945. \fIvalueonly[=<bool>]\fR: only show the value part of the trailer\&.
  2946. .RE
  2947. .sp
  2948. .RS 4
  2949. .ie n \{\
  2950. \h'-04'\(bu\h'+03'\c
  2951. .\}
  2952. .el \{\
  2953. .sp -1
  2954. .IP \(bu 2.3
  2955. .\}
  2956. \fIkey_value_separator=<sep>\fR: specify the separator inserted between the key and value of each trailer\&. Defaults to ": "\&. Otherwise it shares the same semantics as
  2957. \fIseparator=<sep>\fR
  2958. above\&.
  2959. .RE
  2960. .RE
  2961. .RE
  2962. .if n \{\
  2963. .sp
  2964. .\}
  2965. .RS 4
  2966. .it 1 an-trap
  2967. .nr an-no-space-flag 1
  2968. .nr an-break-flag 1
  2969. .br
  2970. .ps +1
  2971. \fBNote\fR
  2972. .ps -1
  2973. .br
  2974. .sp
  2975. Some placeholders may depend on other options given to the revision traversal engine\&. For example, the %g* reflog options will insert an empty string unless we are traversing reflog entries (e\&.g\&., by \fBgit\fR \fBlog\fR \fB\-g\fR)\&. The %d and %D placeholders will use the "short" decoration format if \fB\-\-decorate\fR was not already provided on the command line\&.
  2976. .sp .5v
  2977. .RE
  2978. .sp
  2979. The boolean options accept an optional value [\fB=\fR\fI<bool\-value>\fR]\&. The values taken by \fB\-\-type=bool\fR git\-config[1], like \fByes\fR and \fBoff\fR, are all accepted\&. Giving a boolean option without \fB=\fR\fI<value>\fR is equivalent to giving it with \fB=true\fR\&.
  2980. .sp
  2981. If you add a \fB+\fR (plus sign) after \fI%\fR of a placeholder, a line\-feed is inserted immediately before the expansion if and only if the placeholder expands to a non\-empty string\&.
  2982. .sp
  2983. If you add a \fB\-\fR (minus sign) after \fI%\fR of a placeholder, all consecutive line\-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string\&.
  2984. .sp
  2985. If you add a ` ` (space) after \fI%\fR of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non\-empty string\&.
  2986. .sp
  2987. .RS 4
  2988. .ie n \{\
  2989. \h'-04'\(bu\h'+03'\c
  2990. .\}
  2991. .el \{\
  2992. .sp -1
  2993. .IP \(bu 2.3
  2994. .\}
  2995. \fItformat:\fR
  2996. .sp
  2997. The
  2998. \fItformat:\fR
  2999. format works exactly like
  3000. \fIformat:\fR, except that it provides "terminator" semantics instead of "separator" semantics\&. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries\&. This means that the final entry of a single\-line format will be properly terminated with a new line, just as the "oneline" format does\&. For example:
  3001. .sp
  3002. .if n \{\
  3003. .RS 4
  3004. .\}
  3005. .nf
  3006. $ git log \-2 \-\-pretty=format:%h 4da45bef \e
  3007.   | perl \-pe \*(Aq$_ \&.= " \-\- NO NEWLINE\en" unless /\en/\*(Aq
  3008. 4da45be
  3009. 7134973 \-\- NO NEWLINE
  3011. $ git log \-2 \-\-pretty=tformat:%h 4da45bef \e
  3012.   | perl \-pe \*(Aq$_ \&.= " \-\- NO NEWLINE\en" unless /\en/\*(Aq
  3013. 4da45be
  3014. 7134973
  3015. .fi
  3016. .if n \{\
  3017. .RE
  3018. .\}
  3019. .sp
  3020. In addition, any unrecognized string that has a % in it is interpreted as if it has
  3021. \fBtformat:\fR
  3022. in front of it\&. For example, these two are equivalent:
  3023. .sp
  3024. .if n \{\
  3025. .RS 4
  3026. .\}
  3027. .nf
  3028. $ git log \-2 \-\-pretty=tformat:%h 4da45bef
  3029. $ git log \-2 \-\-pretty=%h 4da45bef
  3030. .fi
  3031. .if n \{\
  3032. .RE
  3033. .\}
  3034. .RE
  3035. .SH "DIFF FORMATTING"
  3036. .sp
  3037. By default, \fBgit\fR \fBlog\fR does not generate any diff output\&. The options below can be used to show the changes made by each commit\&.
  3038. .sp
  3039. Note that unless one of \fB\-\-diff\-merges\fR variants (including short \fB\-m\fR, \fB\-c\fR, \fB\-\-cc\fR, and \fB\-\-dd\fR options) is explicitly given, merge commits will not show a diff, even if a diff format like \fB\-\-patch\fR is selected, nor will they match search options like \fB\-S\fR\&. The exception is when \fB\-\-first\-parent\fR is in use, in which case \fBfirst\-parent\fR is the default format for merge commits\&.
  3040. .PP
  3041. \fB\-p\fR, \fB\-u\fR, \fB\-\-patch\fR
  3042. .RS 4
  3043. Generate patch (see
  3044. the section called \(lqGENERATING PATCH TEXT WITH \-P\(rq)\&.
  3045. .RE
  3046. .PP
  3047. \fB\-s\fR, \fB\-\-no\-patch\fR
  3048. .RS 4
  3049. Suppress all output from the diff machinery\&. Useful for commands like
  3050. \fBgit\fR
  3051. \fBshow\fR
  3052. that show the patch by default to squelch their output, or to cancel the effect of options like
  3053. \fB\-\-patch\fR,
  3054. \fB\-\-stat\fR
  3055. earlier on the command line in an alias\&.
  3056. .RE
  3057. .PP
  3058. \-m
  3059. .RS 4
  3060. Show diffs for merge commits in the default format\&. This is similar to
  3061. \fB\-\-diff\-merges=on\fR, except
  3062. \fB\-m\fR
  3063. will produce no output unless
  3064. \fB\-p\fR
  3065. is given as well\&.
  3066. .RE
  3067. .PP
  3068. \-c
  3069. .RS 4
  3070. Produce combined diff output for merge commits\&. Shortcut for
  3071. \fB\-\-diff\-merges=combined\fR
  3072. \fB\-p\fR\&.
  3073. .RE
  3074. .PP
  3075. \-\-cc
  3076. .RS 4
  3077. Produce dense combined diff output for merge commits\&. Shortcut for
  3078. \fB\-\-diff\-merges=dense\-combined\fR
  3079. \fB\-p\fR\&.
  3080. .RE
  3081. .PP
  3082. \-\-dd
  3083. .RS 4
  3084. Produce diff with respect to first parent for both merge and regular commits\&. Shortcut for
  3085. \fB\-\-diff\-merges=first\-parent\fR
  3086. \fB\-p\fR\&.
  3087. .RE
  3088. .PP
  3089. \-\-remerge\-diff
  3090. .RS 4
  3091. Produce remerge\-diff output for merge commits\&. Shortcut for
  3092. \fB\-\-diff\-merges=remerge\fR
  3093. \fB\-p\fR\&.
  3094. .RE
  3095. .PP
  3096. \-\-no\-diff\-merges
  3097. .RS 4
  3098. Synonym for
  3099. \fB\-\-diff\-merges=off\fR\&.
  3100. .RE
  3101. .PP
  3102. \-\-diff\-merges=<format>
  3103. .RS 4
  3104. Specify diff format to be used for merge commits\&. Default is `off` unless
  3105. \fB\-\-first\-parent\fR
  3106. is in use, in which case
  3107. \fBfirst\-parent\fR
  3108. is the default\&.
  3109. .sp
  3110. The following formats are supported:
  3111. .PP
  3112. off, none
  3113. .RS 4
  3114. Disable output of diffs for merge commits\&. Useful to override implied value\&.
  3115. .RE
  3116. .PP
  3117. on, m
  3118. .RS 4
  3119. Make diff output for merge commits to be shown in the default format\&. The default format can be changed using
  3120. \fBlog\&.diffMerges\fR
  3121. configuration variable, whose default value is
  3122. \fBseparate\fR\&.
  3123. .RE
  3124. .PP
  3125. first\-parent, 1
  3126. .RS 4
  3127. Show full diff with respect to first parent\&. This is the same format as
  3128. \fB\-\-patch\fR
  3129. produces for non\-merge commits\&.
  3130. .RE
  3131. .PP
  3132. separate
  3133. .RS 4
  3134. Show full diff with respect to each of parents\&. Separate log entry and diff is generated for each parent\&.
  3135. .RE
  3136. .PP
  3137. combined, c
  3138. .RS 4
  3139. Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time\&. Furthermore, it lists only files which were modified from all parents\&.
  3140. .RE
  3141. .PP
  3142. dense\-combined, cc
  3143. .RS 4
  3144. Further compress output produced by
  3145. \fB\-\-diff\-merges=combined\fR
  3146. by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&.
  3147. .RE
  3148. .PP
  3149. remerge, r
  3150. .RS 4
  3151. Remerge two\-parent merge commits to create a temporary tree object\(em\:potentially containing files with conflict markers and such\&. A diff is then shown between that temporary tree and the actual merge commit\&.
  3152. .sp
  3153. The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)\&.
  3154. .RE
  3155. .RE
  3156. .PP
  3157. \-\-combined\-all\-paths
  3158. .RS 4
  3159. Cause combined diffs (used for merge commits) to list the name of the file from all parents\&. It thus only has effect when
  3160. \fB\-\-diff\-merges=\fR[\fBdense\-\fR]\fBcombined\fR
  3161. is in use, and is likely only useful if filename changes are detected (i\&.e\&. when either rename or copy detection have been requested)\&.
  3162. .RE
  3163. .PP
  3164. \fB\-U\fR\fI<n>\fR, \fB\-\-unified=\fR\fI<n>\fR
  3165. .RS 4
  3166. Generate diffs with
  3167. \fI<n>\fR
  3168. lines of context instead of the usual three\&. Implies
  3169. \fB\-\-patch\fR\&.
  3170. .RE
  3171. .PP
  3172. \fB\-\-output=\fR\fI<file>\fR
  3173. .RS 4
  3174. Output to a specific file instead of stdout\&.
  3175. .RE
  3176. .PP
  3177. \fB\-\-output\-indicator\-new=\fR\fI<char>\fR, \fB\-\-output\-indicator\-old=\fR\fI<char>\fR, \fB\-\-output\-indicator\-context=\fR\fI<char>\fR
  3178. .RS 4
  3179. Specify the character used to indicate new, old or context lines in the generated patch\&. Normally they are
  3180. \fB+\fR,
  3181. \fB\-\fR
  3182. and \*(Aq \*(Aq respectively\&.
  3183. .RE
  3184. .PP
  3185. \fB\-\-raw\fR
  3186. .RS 4
  3187. For each commit, show a summary of changes using the raw diff format\&. See the "RAW OUTPUT FORMAT" section of
  3188. \fBgit-diff\fR(1)\&. This is different from showing the log itself in raw format, which you can achieve with
  3189. \fB\-\-format=raw\fR\&.
  3190. .RE
  3191. .PP
  3192. \fB\-\-patch\-with\-raw\fR
  3193. .RS 4
  3194. Synonym for
  3195. \fB\-p\fR
  3196. \fB\-\-raw\fR\&.
  3197. .RE
  3198. .PP
  3199. \fB\-t\fR
  3200. .RS 4
  3201. Show the tree objects in the diff output\&.
  3202. .RE
  3203. .PP
  3204. \fB\-\-indent\-heuristic\fR
  3205. .RS 4
  3206. Enable the heuristic that shifts diff hunk boundaries to make patches easier to read\&. This is the default\&.
  3207. .RE
  3208. .PP
  3209. \fB\-\-no\-indent\-heuristic\fR
  3210. .RS 4
  3211. Disable the indent heuristic\&.
  3212. .RE
  3213. .PP
  3214. \fB\-\-minimal\fR
  3215. .RS 4
  3216. Spend extra time to make sure the smallest possible diff is produced\&.
  3217. .RE
  3218. .PP
  3219. \fB\-\-patience\fR
  3220. .RS 4
  3221. Generate a diff using the "patience diff" algorithm\&.
  3222. .RE
  3223. .PP
  3224. \fB\-\-histogram\fR
  3225. .RS 4
  3226. Generate a diff using the "histogram diff" algorithm\&.
  3227. .RE
  3228. .PP
  3229. \fB\-\-anchored=\fR\fI<text>\fR
  3230. .RS 4
  3231. Generate a diff using the "anchored diff" algorithm\&.
  3232. .sp
  3233. This option may be specified more than once\&.
  3234. .sp
  3235. If a line exists in both the source and destination, exists only once, and starts with
  3236. \fI<text>\fR, this algorithm attempts to prevent it from appearing as a deletion or addition in the output\&. It uses the "patience diff" algorithm internally\&.
  3237. .RE
  3238. .PP
  3239. \fB\-\-diff\-algorithm=\fR(\fBpatience\fR|\fBminimal\fR|\fBhistogram\fR|\fBmyers\fR)
  3240. .RS 4
  3241. Choose a diff algorithm\&. The variants are as follows:
  3242. .PP
  3243. \fBdefault\fR, \fBmyers\fR
  3244. .RS 4
  3245. The basic greedy diff algorithm\&. Currently, this is the default\&.
  3246. .RE
  3247. .PP
  3248. \fBminimal\fR
  3249. .RS 4
  3250. Spend extra time to make sure the smallest possible diff is produced\&.
  3251. .RE
  3252. .PP
  3253. \fBpatience\fR
  3254. .RS 4
  3255. Use "patience diff" algorithm when generating patches\&.
  3256. .RE
  3257. .PP
  3258. \fBhistogram\fR
  3259. .RS 4
  3260. This algorithm extends the patience algorithm to "support low\-occurrence common elements"\&.
  3261. .RE
  3262. .sp
  3263. For instance, if you configured the
  3264. \fBdiff\&.algorithm\fR
  3265. variable to a non\-default value and want to use the default one, then you have to use
  3266. \fB\-\-diff\-algorithm=default\fR
  3267. option\&.
  3268. .RE
  3269. .PP
  3270. \fB\-\-stat\fR[\fB=\fR\fI<width>\fR[\fB,\fR\fI<name\-width>\fR[\fB,\fR\fI<count>\fR]]]
  3271. .RS 4
  3272. Generate a diffstat\&. By default, as much space as necessary will be used for the filename part, and the rest for the graph part\&. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by
  3273. \fI<width>\fR\&. The width of the filename part can be limited by giving another width
  3274. \fI<name\-width>\fR
  3275. after a comma or by setting
  3276. \fBdiff\&.statNameWidth=\fR\fI<name\-width>\fR\&. The width of the graph part can be limited by using
  3277. \fB\-\-stat\-graph\-width=\fR\fI<graph\-width>\fR
  3278. or by setting
  3279. \fBdiff\&.statGraphWidth=\fR\fI<graph\-width>\fR\&. Using
  3280. \fB\-\-stat\fR
  3281. or
  3282. \fB\-\-stat\-graph\-width\fR
  3283. affects all commands generating a stat graph, while setting
  3284. \fBdiff\&.statNameWidth\fR
  3285. or
  3286. \fBdiff\&.statGraphWidth\fR
  3287. does not affect
  3288. \fBgit\fR
  3289. \fBformat\-patch\fR\&. By giving a third parameter
  3290. \fI<count>\fR, you can limit the output to the first
  3291. \fI<count>\fR
  3292. lines, followed by \&.\&.\&. if there are more\&.
  3293. .sp
  3294. These parameters can also be set individually with
  3295. \fB\-\-stat\-width=\fR\fI<width>\fR,
  3296. \fB\-\-stat\-name\-width=\fR\fI<name\-width>\fR
  3297. and
  3298. \fB\-\-stat\-count=\fR\fI<count>\fR\&.
  3299. .RE
  3300. .PP
  3301. \fB\-\-compact\-summary\fR
  3302. .RS 4
  3303. Output a condensed summary of extended header information such as file creations or deletions ("new" or "gone", optionally
  3304. \fB+l\fR
  3305. if it\(cqs a symlink) and mode changes (\fB+x\fR
  3306. or
  3307. \fB\-x\fR
  3308. for adding or removing executable bit respectively) in diffstat\&. The information is put between the filename part and the graph part\&. Implies
  3309. \fB\-\-stat\fR\&.
  3310. .RE
  3311. .PP
  3312. \fB\-\-numstat\fR
  3313. .RS 4
  3314. Similar to
  3315. \fB\-\-stat\fR, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly\&. For binary files, outputs two
  3316. \fB\-\fR
  3317. instead of saying
  3318. \fB0\fR
  3319. \fB0\fR\&.
  3320. .RE
  3321. .PP
  3322. \fB\-\-shortstat\fR
  3323. .RS 4
  3324. Output only the last line of the
  3325. \fB\-\-stat\fR
  3326. format containing total number of modified files, as well as number of added and deleted lines\&.
  3327. .RE
  3328. .PP
  3329. \fB\-X\fR [\fI<param>\fR\fB,\&.\&.\fR\&.], \fB\-\-dirstat\fR[\fB=\fR\fI<param>\fR\fB,\&.\&.\fR\&.]
  3330. .RS 4
  3331. Output the distribution of relative amount of changes for each sub\-directory\&. The behavior of
  3332. \fB\-\-dirstat\fR
  3333. can be customized by passing it a comma separated list of parameters\&. The defaults are controlled by the
  3334. \fBdiff\&.dirstat\fR
  3335. configuration variable (see
  3336. \fBgit-config\fR(1))\&. The following parameters are available:
  3337. .PP
  3338. \fBchanges\fR
  3339. .RS 4
  3340. Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination\&. This ignores the amount of pure code movements within a file\&. In other words, rearranging lines in a file is not counted as much as other changes\&. This is the default behavior when no parameter is given\&.
  3341. .RE
  3342. .PP
  3343. \fBlines\fR
  3344. .RS 4
  3345. Compute the dirstat numbers by doing the regular line\-based diff analysis, and summing the removed/added line counts\&. (For binary files, count 64\-byte chunks instead, since binary files have no natural concept of lines)\&. This is a more expensive
  3346. \fB\-\-dirstat\fR
  3347. behavior than the
  3348. \fBchanges\fR
  3349. behavior, but it does count rearranged lines within a file as much as other changes\&. The resulting output is consistent with what you get from the other
  3350. \fB\-\-\fR*stat options\&.
  3351. .RE
  3352. .PP
  3353. \fBfiles\fR
  3354. .RS 4
  3355. Compute the dirstat numbers by counting the number of files changed\&. Each changed file counts equally in the dirstat analysis\&. This is the computationally cheapest
  3356. \fB\-\-dirstat\fR
  3357. behavior, since it does not have to look at the file contents at all\&.
  3358. .RE
  3359. .PP
  3360. \fBcumulative\fR
  3361. .RS 4
  3362. Count changes in a child directory for the parent directory as well\&. Note that when using
  3363. \fBcumulative\fR, the sum of the percentages reported may exceed 100%\&. The default (non\-cumulative) behavior can be specified with the
  3364. \fBnoncumulative\fR
  3365. parameter\&.
  3366. .RE
  3367. .PP
  3368. \fI<limit>\fR
  3369. .RS 4
  3370. An integer parameter specifies a cut\-off percent (3% by default)\&. Directories contributing less than this percentage of the changes are not shown in the output\&.
  3371. .RE
  3372. .sp
  3373. Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories:
  3374. \fB\-\-dirstat=files,10,cumulative\fR\&.
  3375. .RE
  3376. .PP
  3377. \fB\-\-cumulative\fR
  3378. .RS 4
  3379. Synonym for
  3380. \fB\-\-dirstat=cumulative\fR\&.
  3381. .RE
  3382. .PP
  3383. \fB\-\-dirstat\-by\-file\fR[\fB=\fR\fI<param>\fR\fB,\&.\&.\fR\&.]
  3384. .RS 4
  3385. Synonym for
  3386. \fB\-\-dirstat=files,\fR\fI<param>\fR\fB,\&.\&.\fR\&.\&.
  3387. .RE
  3388. .PP
  3389. \fB\-\-summary\fR
  3390. .RS 4
  3391. Output a condensed summary of extended header information such as creations, renames and mode changes\&.
  3392. .RE
  3393. .PP
  3394. \fB\-\-patch\-with\-stat\fR
  3395. .RS 4
  3396. Synonym for
  3397. \fB\-p\fR
  3398. \fB\-\-stat\fR\&.
  3399. .RE
  3400. .PP
  3401. \fB\-z\fR
  3402. .RS 4
  3403. Separate the commits with
  3404. \fINUL\fRs instead of newlines\&.
  3405. .sp
  3406. Also, when
  3407. \fB\-\-raw\fR
  3408. or
  3409. \fB\-\-numstat\fR
  3410. has been given, do not munge pathnames and use
  3411. \fINUL\fRs as output field terminators\&.
  3412. .sp
  3413. Without this option, pathnames with "unusual" characters are quoted as explained for the configuration variable
  3414. \fBcore\&.quotePath\fR
  3415. (see
  3416. \fBgit-config\fR(1))\&.
  3417. .RE
  3418. .PP
  3419. \fB\-\-name\-only\fR
  3420. .RS 4
  3421. Show only the name of each changed file in the post\-image tree\&. The file names are often encoded in UTF\-8\&. For more information see the discussion about encoding in the
  3422. \fBgit-log\fR(1)
  3423. manual page\&.
  3424. .RE
  3425. .PP
  3426. \fB\-\-name\-status\fR
  3427. .RS 4
  3428. Show only the name(s) and status of each changed file\&. See the description of the
  3429. \fB\-\-diff\-filter\fR
  3430. option on what the status letters mean\&. Just like
  3431. \fB\-\-name\-only\fR
  3432. the file names are often encoded in UTF\-8\&.
  3433. .RE
  3434. .PP
  3435. \fB\-\-submodule\fR[\fB=\fR\fI<format>\fR]
  3436. .RS 4
  3437. Specify how differences in submodules are shown\&. When specifying
  3438. \fB\-\-submodule=short\fR
  3439. the
  3440. \fBshort\fR
  3441. format is used\&. This format just shows the names of the commits at the beginning and end of the range\&. When
  3442. \fB\-\-submodule\fR
  3443. or
  3444. \fB\-\-submodule=log\fR
  3445. is specified, the
  3446. \fBlog\fR
  3447. format is used\&. This format lists the commits in the range like
  3448. \fBgit-submodule\fR(1)
  3449. \fBsummary\fR
  3450. does\&. When
  3451. \fB\-\-submodule=diff\fR
  3452. is specified, the
  3453. \fBdiff\fR
  3454. format is used\&. This format shows an inline diff of the changes in the submodule contents between the commit range\&. Defaults to
  3455. \fBdiff\&.submodule\fR
  3456. or the
  3457. \fBshort\fR
  3458. format if the config option is unset\&.
  3459. .RE
  3460. .PP
  3461. \fB\-\-color\fR[\fB=\fR\fI<when>\fR]
  3462. .RS 4
  3463. Show colored diff\&.
  3464. \fB\-\-color\fR
  3465. (i\&.e\&. without
  3466. \fB=\fR\fI<when>\fR) is the same as
  3467. \fB\-\-color=always\fR\&.
  3468. \fI<when>\fR
  3469. can be one of
  3470. \fBalways\fR,
  3471. \fBnever\fR, or
  3472. \fBauto\fR\&.
  3473. .RE
  3474. .PP
  3475. \fB\-\-no\-color\fR
  3476. .RS 4
  3477. Turn off colored diff\&. It is the same as
  3478. \fB\-\-color=never\fR\&.
  3479. .RE
  3480. .PP
  3481. \fB\-\-color\-moved\fR[\fB=\fR\fI<mode>\fR]
  3482. .RS 4
  3483. Moved lines of code are colored differently\&. The
  3484. \fI<mode>\fR
  3485. defaults to
  3486. \fBno\fR
  3487. if the option is not given and to
  3488. \fBzebra\fR
  3489. if the option with no mode is given\&. The mode must be one of:
  3490. .PP
  3491. \fBno\fR
  3492. .RS 4
  3493. Moved lines are not highlighted\&.
  3494. .RE
  3495. .PP
  3496. \fBdefault\fR
  3497. .RS 4
  3498. Is a synonym for
  3499. \fBzebra\fR\&. This may change to a more sensible mode in the future\&.
  3500. .RE
  3501. .PP
  3502. \fBplain\fR
  3503. .RS 4
  3504. Any line that is added in one location and was removed in another location will be colored with
  3505. \fBcolor\&.diff\&.newMoved\fR\&. Similarly
  3506. \fBcolor\&.diff\&.oldMoved\fR
  3507. will be used for removed lines that are added somewhere else in the diff\&. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation\&.
  3508. .RE
  3509. .PP
  3510. \fBblocks\fR
  3511. .RS 4
  3512. Blocks of moved text of at least 20 alphanumeric characters are detected greedily\&. The detected blocks are painted using either the
  3513. \fBcolor\&.diff\&.\fR(\fBold\fR|\fBnew\fR)\fBMoved\fR
  3514. color\&. Adjacent blocks cannot be told apart\&.
  3515. .RE
  3516. .PP
  3517. \fBzebra\fR
  3518. .RS 4
  3519. Blocks of moved text are detected as in
  3520. \fBblocks\fR
  3521. mode\&. The blocks are painted using either the
  3522. \fBcolor\&.diff\&.\fR(\fBold\fR|\fBnew\fR)\fBMoved\fR
  3523. color or
  3524. \fBcolor\&.diff\&.\fR(\fBold\fR|\fBnew\fR)\fBMovedAlternative\fR\&. The change between the two colors indicates that a new block was detected\&.
  3525. .RE
  3526. .PP
  3527. \fBdimmed\-zebra\fR
  3528. .RS 4
  3529. Similar to
  3530. \fBzebra\fR, but additional dimming of uninteresting parts of moved code is performed\&. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting\&.
  3531. \fBdimmed_zebra\fR
  3532. is a deprecated synonym\&.
  3533. .RE
  3534. .RE
  3535. .PP
  3536. \fB\-\-no\-color\-moved\fR
  3537. .RS 4
  3538. Turn off move detection\&. This can be used to override configuration settings\&. It is the same as
  3539. \fB\-\-color\-moved=no\fR\&.
  3540. .RE
  3541. .PP
  3542. \fB\-\-color\-moved\-ws=\fR\fI<mode>\fR\fB,\&.\&.\fR\&.
  3543. .RS 4
  3544. This configures how whitespace is ignored when performing the move detection for
  3545. \fB\-\-color\-moved\fR\&. These modes can be given as a comma separated list:
  3546. .PP
  3547. \fBno\fR
  3548. .RS 4
  3549. Do not ignore whitespace when performing move detection\&.
  3550. .RE
  3551. .PP
  3552. \fBignore\-space\-at\-eol\fR
  3553. .RS 4
  3554. Ignore changes in whitespace at EOL\&.
  3555. .RE
  3556. .PP
  3557. \fBignore\-space\-change\fR
  3558. .RS 4
  3559. Ignore changes in amount of whitespace\&. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent\&.
  3560. .RE
  3561. .PP
  3562. \fBignore\-all\-space\fR
  3563. .RS 4
  3564. Ignore whitespace when comparing lines\&. This ignores differences even if one line has whitespace where the other line has none\&.
  3565. .RE
  3566. .PP
  3567. \fBallow\-indentation\-change\fR
  3568. .RS 4
  3569. Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line\&. This is incompatible with the other modes\&.
  3570. .RE
  3571. .RE
  3572. .PP
  3573. \fB\-\-no\-color\-moved\-ws\fR
  3574. .RS 4
  3575. Do not ignore whitespace when performing move detection\&. This can be used to override configuration settings\&. It is the same as
  3576. \fB\-\-color\-moved\-ws=no\fR\&.
  3577. .RE
  3578. .PP
  3579. \fB\-\-word\-diff\fR[\fB=\fR\fI<mode>\fR]
  3580. .RS 4
  3581. By default, words are delimited by whitespace; see
  3582. \fB\-\-word\-diff\-regex\fR
  3583. below\&. The
  3584. \fI<mode>\fR
  3585. defaults to
  3586. \fBplain\fR, and must be one of:
  3587. .PP
  3588. \fBcolor\fR
  3589. .RS 4
  3590. Highlight changed words using only colors\&. Implies
  3591. \fB\-\-color\fR\&.
  3592. .RE
  3593. .PP
  3594. \fBplain\fR
  3595. .RS 4
  3596. Show words as [\fB\-removed\-\fR] and {\fBadded\fR}\&. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous\&.
  3597. .RE
  3598. .PP
  3599. \fBporcelain\fR
  3600. .RS 4
  3601. Use a special line\-based format intended for script consumption\&. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a
  3602. \fB+\fR/\fB\-\fR/` ` character at the beginning of the line and extending to the end of the line\&. Newlines in the input are represented by a tilde
  3603. \fB~\fR
  3604. on a line of its own\&.
  3605. .RE
  3606. .PP
  3607. \fBnone\fR
  3608. .RS 4
  3609. Disable word diff again\&.
  3610. .RE
  3611. .sp
  3612. Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled\&.
  3613. .RE
  3614. .PP
  3615. \fB\-\-word\-diff\-regex=\fR\fI<regex>\fR
  3616. .RS 4
  3617. Use
  3618. \fI<regex>\fR
  3619. to decide what a word is, instead of considering runs of non\-whitespace to be a word\&. Also implies
  3620. \fB\-\-word\-diff\fR
  3621. unless it was already enabled\&.
  3622. .sp
  3623. Every non\-overlapping match of the
  3624. \fI<regex>\fR
  3625. is considered a word\&. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences\&. You may want to append |[\fB^\fR[\fB:space:\fR]] to your regular expression to make sure that it matches all non\-whitespace characters\&. A match that contains a newline is silently truncated(!) at the newline\&.
  3626. .sp
  3627. For example,
  3628. \fB\-\-word\-diff\-regex=\&.\fR
  3629. will treat each character as a word and, correspondingly, show differences character by character\&.
  3630. .sp
  3631. The regex can also be set via a diff driver or configuration option, see
  3632. \fBgitattributes\fR(5)
  3633. or
  3634. \fBgit-config\fR(1)\&. Giving it explicitly overrides any diff driver or configuration setting\&. Diff drivers override configuration settings\&.
  3635. .RE
  3636. .PP
  3637. \fB\-\-color\-words\fR[\fB=\fR\fI<regex>\fR]
  3638. .RS 4
  3639. Equivalent to
  3640. \fB\-\-word\-diff=color\fR
  3641. plus (if a regex was specified)
  3642. \fB\-\-word\-diff\-regex=\fR\fI<regex>\fR\&.
  3643. .RE
  3644. .PP
  3645. \fB\-\-no\-renames\fR
  3646. .RS 4
  3647. Turn off rename detection, even when the configuration file gives the default to do so\&.
  3648. .RE
  3649. .PP
  3650. \fB\-\-\fR[\fBno\-\fR]\fBrename\-empty\fR
  3651. .RS 4
  3652. Whether to use empty blobs as rename source\&.
  3653. .RE
  3654. .PP
  3655. \fB\-\-check\fR
  3656. .RS 4
  3657. Warn if changes introduce conflict markers or whitespace errors\&. What are considered whitespace errors is controlled by
  3658. \fBcore\&.whitespace\fR
  3659. configuration\&. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors\&. Exits with non\-zero status if problems are found\&. Not compatible with
  3660. \fB\-\-exit\-code\fR\&.
  3661. .RE
  3662. .PP
  3663. \fB\-\-ws\-error\-highlight=\fR\fI<kind>\fR
  3664. .RS 4
  3665. Highlight whitespace errors in the
  3666. \fBcontext\fR,
  3667. \fBold\fR
  3668. or
  3669. \fBnew\fR
  3670. lines of the diff\&. Multiple values are separated by comma,
  3671. \fBnone\fR
  3672. resets previous values,
  3673. \fBdefault\fR
  3674. reset the list to
  3675. \fBnew\fR
  3676. and
  3677. \fBall\fR
  3678. is a shorthand for
  3679. \fBold,new,context\fR\&. When this option is not given, and the configuration variable
  3680. \fBdiff\&.wsErrorHighlight\fR
  3681. is not set, only whitespace errors in
  3682. \fBnew\fR
  3683. lines are highlighted\&. The whitespace errors are colored with
  3684. \fBcolor\&.diff\&.whitespace\fR\&.
  3685. .RE
  3686. .PP
  3687. \fB\-\-full\-index\fR
  3688. .RS 4
  3689. Instead of the first handful of characters, show the full pre\- and post\-image blob object names on the "index" line when generating patch format output\&.
  3690. .RE
  3691. .PP
  3692. \fB\-\-binary\fR
  3693. .RS 4
  3694. In addition to
  3695. \fB\-\-full\-index\fR, output a binary diff that can be applied with
  3696. \fBgit\-apply\fR\&. Implies
  3697. \fB\-\-patch\fR\&.
  3698. .RE
  3699. .PP
  3700. \fB\-\-abbrev\fR[\fB=\fR\fI<n>\fR]
  3701. .RS 4
  3702. Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show the shortest prefix that is at least
  3703. \fI<n>\fR
  3704. hexdigits long that uniquely refers the object\&. In diff\-patch output format,
  3705. \fB\-\-full\-index\fR
  3706. takes higher precedence, i\&.e\&. if
  3707. \fB\-\-full\-index\fR
  3708. is specified, full blob names will be shown regardless of
  3709. \fB\-\-abbrev\fR\&. Non default number of digits can be specified with
  3710. \fB\-\-abbrev=\fR\fI<n>\fR\&.
  3711. .RE
  3712. .PP
  3713. \fB\-B\fR[\fI<n>\fR][\fB/\fR\fI<m>\fR], \fB\-\-break\-rewrites\fR[\fB=\fR[\fI<n>\fR][\fB/\fR\fI<m>\fR]]
  3714. .RS 4
  3715. Break complete rewrite changes into pairs of delete and create\&. This serves two purposes:
  3716. .sp
  3717. It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number
  3718. \fI<m>\fR
  3719. controls this aspect of the
  3720. \fB\-B\fR
  3721. option (defaults to 60%)\&.
  3722. \fB\-B/70\fR% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i\&.e\&. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)\&.
  3723. .sp
  3724. When used with
  3725. \fB\-M\fR, a totally\-rewritten file is also considered as the source of a rename (usually
  3726. \fB\-M\fR
  3727. only considers a file that disappeared as the source of a rename), and the number
  3728. \fI<n>\fR
  3729. controls this aspect of the
  3730. \fB\-B\fR
  3731. option (defaults to 50%)\&.
  3732. \fB\-B20\fR% specifies that a change with addition and deletion compared to 20% or more of the file\(cqs size are eligible for being picked up as a possible source of a rename to another file\&.
  3733. .RE
  3734. .PP
  3735. \fB\-M\fR[\fI<n>\fR], \fB\-\-find\-renames\fR[\fB=\fR\fI<n>\fR]
  3736. .RS 4
  3737. If generating diffs, detect and report renames for each commit\&. For following files across renames while traversing history, see
  3738. \fB\-\-follow\fR\&. If
  3739. \fI<n>\fR
  3740. is specified, it is a threshold on the similarity index (i\&.e\&. amount of addition/deletions compared to the file\(cqs size)\&. For example,
  3741. \fB\-M90\fR% means Git should consider a delete/add pair to be a rename if more than 90% of the file hasn\(cqt changed\&. Without a % sign, the number is to be read as a fraction, with a decimal point before it\&. I\&.e\&.,
  3742. \fB\-M5\fR
  3743. becomes 0\&.5, and is thus the same as
  3744. \fB\-M50\fR%\&. Similarly,
  3745. \fB\-M05\fR
  3746. is the same as
  3747. \fB\-M5\fR%\&. To limit detection to exact renames, use
  3748. \fB\-M100\fR%\&. The default similarity index is 50%\&.
  3749. .RE
  3750. .PP
  3751. \fB\-C\fR[\fI<n>\fR], \fB\-\-find\-copies\fR[\fB=\fR\fI<n>\fR]
  3752. .RS 4
  3753. Detect copies as well as renames\&. See also
  3754. \fB\-\-find\-copies\-harder\fR\&. If
  3755. \fI<n>\fR
  3756. is specified, it has the same meaning as for
  3757. \fB\-M\fR\fI<n>\fR\&.
  3758. .RE
  3759. .PP
  3760. \fB\-\-find\-copies\-harder\fR
  3761. .RS 4
  3762. For performance reasons, by default,
  3763. \fB\-C\fR
  3764. option finds copies only if the original file of the copy was modified in the same changeset\&. This flag makes the command inspect unmodified files as candidates for the source of copy\&. This is a very expensive operation for large projects, so use it with caution\&. Giving more than one
  3765. \fB\-C\fR
  3766. option has the same effect\&.
  3767. .RE
  3768. .PP
  3769. \fB\-D\fR, \fB\-\-irreversible\-delete\fR
  3770. .RS 4
  3771. Omit the preimage for deletes, i\&.e\&. print only the header but not the diff between the preimage and
  3772. \fB/dev/null\fR\&. The resulting patch is not meant to be applied with
  3773. \fBpatch\fR
  3774. or
  3775. \fBgit\fR
  3776. \fBapply\fR; this is solely for people who want to just concentrate on reviewing the text after the change\&. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option\&.
  3777. .sp
  3778. When used together with
  3779. \fB\-B\fR, omit also the preimage in the deletion part of a delete/create pair\&.
  3780. .RE
  3781. .PP
  3782. \fB\-l\fR\fI<num>\fR
  3783. .RS 4
  3784. The
  3785. \fB\-M\fR
  3786. and
  3787. \fB\-C\fR
  3788. options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources\&. (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant\&.) For N sources and destinations, this exhaustive check is O(N^2)\&. This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number\&. Defaults to
  3789. \fBdiff\&.renameLimit\fR\&. Note that a value of 0 is treated as unlimited\&.
  3790. .RE
  3791. .PP
  3792. \fB\-\-diff\-filter=\fR[(\fBA\fR|\fBC\fR|\fBD\fR|\fBM\fR|\fBR\fR|\fBT\fR|\fBU\fR|\fBX\fR|\fBB\fR)\fB\&.\&.\&.\fR[*]]
  3793. .RS 4
  3794. Select only files that are Added (\fBA\fR), Copied (\fBC\fR), Deleted (\fBD\fR), Modified (\fBM\fR), Renamed (\fBR\fR), have their type (i\&.e\&. regular file, symlink, submodule, \&...\:) changed (\fBT\fR), are Unmerged (\fBU\fR), are Unknown (\fBX\fR), or have had their pairing Broken (\fBB\fR)\&. Any combination of the filter characters (including none) can be used\&. When * (All\-or\-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected\&.
  3795. .sp
  3796. Also, these upper\-case letters can be downcased to exclude\&. E\&.g\&.
  3797. \fB\-\-diff\-filter=ad\fR
  3798. excludes added and deleted paths\&.
  3799. .sp
  3800. Note that not all diffs can feature all types\&. For instance, copied and renamed entries cannot appear if detection for those types is disabled\&.
  3801. .RE
  3802. .PP
  3803. \fB\-S\fR\fI<string>\fR
  3804. .RS 4
  3805. Look for differences that change the number of occurrences of the specified
  3806. \fI<string>\fR
  3807. (i\&.e\&. addition/deletion) in a file\&. Intended for the scripter\(cqs use\&.
  3808. .sp
  3809. It is useful when you\(cqre looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into
  3810. \fB\-S\fR, and keep going until you get the very first version of the block\&.
  3811. .sp
  3812. Binary files are searched as well\&.
  3813. .RE
  3814. .PP
  3815. \fB\-G\fR\fI<regex>\fR
  3816. .RS 4
  3817. Look for differences whose patch text contains added/removed lines that match
  3818. \fI<regex>\fR\&.
  3819. .sp
  3820. To illustrate the difference between
  3821. \fB\-S\fR\fI<regex>\fR
  3822. \fB\-\-pickaxe\-regex\fR
  3823. and
  3824. \fB\-G\fR\fI<regex>\fR, consider a commit with the following diff in the same file:
  3825. .sp
  3826. .if n \{\
  3827. .RS 4
  3828. .\}
  3829. .nf
  3830. +    return frotz(nitfol, two\->ptr, 1, 0);
  3831. \&.\&.\&.
  3832. \-    hit = frotz(nitfol, mf2\&.ptr, 1, 0);
  3833. .fi
  3834. .if n \{\
  3835. .RE
  3836. .\}
  3837. .sp
  3838. While
  3839. \fBgit\fR
  3840. \fBlog\fR
  3841. \fB\-G\fR"frotz\e(\fBnitfol\fR" will show this commit,
  3842. \fBgit\fR
  3843. \fBlog\fR
  3844. \fB\-S\fR"frotz\e(\fBnitfol\fR"
  3845. \fB\-\-pickaxe\-regex\fR
  3846. will not (because the number of occurrences of that string did not change)\&.
  3847. .sp
  3848. Unless
  3849. \fB\-\-text\fR
  3850. is supplied patches of binary files without a textconv filter will be ignored\&.
  3851. .sp
  3852. See the
  3853. \fIpickaxe\fR
  3854. entry in
  3855. \fBgitdiffcore\fR(7)
  3856. for more information\&.
  3857. .RE
  3858. .PP
  3859. \fB\-\-find\-object=\fR\fI<object\-id>\fR
  3860. .RS 4
  3861. Look for differences that change the number of occurrences of the specified object\&. Similar to
  3862. \fB\-S\fR, just the argument is different in that it doesn\(cqt search for a specific string but for a specific object id\&.
  3863. .sp
  3864. The object can be a blob or a submodule commit\&. It implies the
  3865. \fB\-t\fR
  3866. option in
  3867. \fBgit\-log\fR
  3868. to also find trees\&.
  3869. .RE
  3870. .PP
  3871. \fB\-\-pickaxe\-all\fR
  3872. .RS 4
  3873. When
  3874. \fB\-S\fR
  3875. or
  3876. \fB\-G\fR
  3877. finds a change, show all the changes in that changeset, not just the files that contain the change in
  3878. \fI<string>\fR\&.
  3879. .RE
  3880. .PP
  3881. \fB\-\-pickaxe\-regex\fR
  3882. .RS 4
  3883. Treat the
  3884. \fI<string>\fR
  3885. given to
  3886. \fB\-S\fR
  3887. as an extended POSIX regular expression to match\&.
  3888. .RE
  3889. .PP
  3890. \fB\-O\fR\fI<orderfile>\fR
  3891. .RS 4
  3892. Control the order in which files appear in the output\&. This overrides the
  3893. \fBdiff\&.orderFile\fR
  3894. configuration variable (see
  3895. \fBgit-config\fR(1))\&. To cancel
  3896. \fBdiff\&.orderFile\fR, use
  3897. \fB\-O/dev/null\fR\&.
  3898. .sp
  3899. The output order is determined by the order of glob patterns in
  3900. \fI<orderfile>\fR\&. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on\&. All files with pathnames that do not match any pattern are output last, as if there was an implicit match\-all pattern at the end of the file\&. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order\&.
  3901. .sp
  3902. \fI<orderfile>\fR
  3903. is parsed as follows:
  3904. .sp
  3905. .RS 4
  3906. .ie n \{\
  3907. \h'-04'\(bu\h'+03'\c
  3908. .\}
  3909. .el \{\
  3910. .sp -1
  3911. .IP \(bu 2.3
  3912. .\}
  3913. Blank lines are ignored, so they can be used as separators for readability\&.
  3914. .RE
  3915. .sp
  3916. .RS 4
  3917. .ie n \{\
  3918. \h'-04'\(bu\h'+03'\c
  3919. .\}
  3920. .el \{\
  3921. .sp -1
  3922. .IP \(bu 2.3
  3923. .\}
  3924. Lines starting with a hash ("#") are ignored, so they can be used for comments\&. Add a backslash ("\e") to the beginning of the pattern if it starts with a hash\&.
  3925. .RE
  3926. .sp
  3927. .RS 4
  3928. .ie n \{\
  3929. \h'-04'\(bu\h'+03'\c
  3930. .\}
  3931. .el \{\
  3932. .sp -1
  3933. .IP \(bu 2.3
  3934. .\}
  3935. Each other line contains a single pattern\&.
  3936. .RE
  3937. .sp
  3938. Patterns have the same syntax and semantics as patterns used for
  3939. \fBfnmatch\fR(3) without the
  3940. \fBFNM_PATHNAME\fR
  3941. flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern\&. For example, the pattern "\fBfoo\fR*bar" matches "\fBfooasdfbar\fR" and "\fBfoo/bar/baz/asdf\fR" but not "\fBfoobarx\fR"\&.
  3942. .RE
  3943. .PP
  3944. \fB\-\-skip\-to=\fR\fI<file>\fR, \fB\-\-rotate\-to=\fR\fI<file>\fR
  3945. .RS 4
  3946. Discard the files before the named
  3947. \fI<file>\fR
  3948. from the output (i\&.e\&.
  3949. \fIskip to\fR), or move them to the end of the output (i\&.e\&.
  3950. \fIrotate to\fR)\&. These options were invented primarily for the use of the
  3951. \fBgit\fR
  3952. \fBdifftool\fR
  3953. command, and may not be very useful otherwise\&.
  3954. .RE
  3955. .PP
  3956. \fB\-R\fR
  3957. .RS 4
  3958. Swap two inputs; that is, show differences from index or on\-disk file to tree contents\&.
  3959. .RE
  3960. .PP
  3961. \fB\-\-relative\fR[\fB=\fR\fI<path>\fR], \fB\-\-no\-relative\fR
  3962. .RS 4
  3963. When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option\&. When you are not in a subdirectory (e\&.g\&. in a bare repository), you can name which subdirectory to make the output relative to by giving a
  3964. \fI<path>\fR
  3965. as an argument\&.
  3966. \fB\-\-no\-relative\fR
  3967. can be used to countermand both
  3968. \fBdiff\&.relative\fR
  3969. config option and previous
  3970. \fB\-\-relative\fR\&.
  3971. .RE
  3972. .PP
  3973. \fB\-a\fR, \fB\-\-text\fR
  3974. .RS 4
  3975. Treat all files as text\&.
  3976. .RE
  3977. .PP
  3978. \fB\-\-ignore\-cr\-at\-eol\fR
  3979. .RS 4
  3980. Ignore carriage\-return at the end of line when doing a comparison\&.
  3981. .RE
  3982. .PP
  3983. \fB\-\-ignore\-space\-at\-eol\fR
  3984. .RS 4
  3985. Ignore changes in whitespace at EOL\&.
  3986. .RE
  3987. .PP
  3988. \fB\-b\fR, \fB\-\-ignore\-space\-change\fR
  3989. .RS 4
  3990. Ignore changes in amount of whitespace\&. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent\&.
  3991. .RE
  3992. .PP
  3993. \fB\-w\fR, \fB\-\-ignore\-all\-space\fR
  3994. .RS 4
  3995. Ignore whitespace when comparing lines\&. This ignores differences even if one line has whitespace where the other line has none\&.
  3996. .RE
  3997. .PP
  3998. \fB\-\-ignore\-blank\-lines\fR
  3999. .RS 4
  4000. Ignore changes whose lines are all blank\&.
  4001. .RE
  4002. .PP
  4003. \fB\-I\fR\fI<regex>\fR, \fB\-\-ignore\-matching\-lines=\fR\fI<regex>\fR
  4004. .RS 4
  4005. Ignore changes whose all lines match
  4006. \fI<regex>\fR\&. This option may be specified more than once\&.
  4007. .RE
  4008. .PP
  4009. \fB\-\-inter\-hunk\-context=\fR\fI<number>\fR
  4010. .RS 4
  4011. Show the context between diff hunks, up to the specified
  4012. \fI<number>\fR
  4013. of lines, thereby fusing hunks that are close to each other\&. Defaults to
  4014. \fBdiff\&.interHunkContext\fR
  4015. or 0 if the config option is unset\&.
  4016. .RE
  4017. .PP
  4018. \fB\-W\fR, \fB\-\-function\-context\fR
  4019. .RS 4
  4020. Show whole function as context lines for each change\&. The function names are determined in the same way as
  4021. \fBgit\fR
  4022. \fBdiff\fR
  4023. works out patch hunk headers (see "Defining a custom hunk\-header" in
  4024. \fBgitattributes\fR(5))\&.
  4025. .RE
  4026. .PP
  4027. \fB\-\-ext\-diff\fR
  4028. .RS 4
  4029. Allow an external diff helper to be executed\&. If you set an external diff driver with
  4030. \fBgitattributes\fR(5), you need to use this option with
  4031. \fBgit-log\fR(1)
  4032. and friends\&.
  4033. .RE
  4034. .PP
  4035. \fB\-\-no\-ext\-diff\fR
  4036. .RS 4
  4037. Disallow external diff drivers\&.
  4038. .RE
  4039. .PP
  4040. \fB\-\-textconv\fR, \fB\-\-no\-textconv\fR
  4041. .RS 4
  4042. Allow (or disallow) external text conversion filters to be run when comparing binary files\&. See
  4043. \fBgitattributes\fR(5)
  4044. for details\&. Because textconv filters are typically a one\-way conversion, the resulting diff is suitable for human consumption, but cannot be applied\&. For this reason, textconv filters are enabled by default only for
  4045. \fBgit-diff\fR(1)
  4046. and
  4047. \fBgit-log\fR(1), but not for
  4048. \fBgit-format-patch\fR(1)
  4049. or diff plumbing commands\&.
  4050. .RE
  4051. .PP
  4052. \fB\-\-ignore\-submodules\fR[\fB=\fR(\fBnone\fR|\fBuntracked\fR|\fBdirty\fR|\fBall\fR)]
  4053. .RS 4
  4054. Ignore changes to submodules in the diff generation\&.
  4055. \fBall\fR
  4056. is the default\&. Using
  4057. \fBnone\fR
  4058. will consider the submodule modified when it either contains untracked or modified files or its
  4059. \fBHEAD\fR
  4060. differs from the commit recorded in the superproject and can be used to override any settings of the
  4061. \fBignore\fR
  4062. option in
  4063. \fBgit-config\fR(1)
  4064. or
  4065. \fBgitmodules\fR(5)\&. When
  4066. \fBuntracked\fR
  4067. is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content)\&. Using
  4068. \fBdirty\fR
  4069. ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1\&.7\&.0)\&. Using
  4070. \fBall\fR
  4071. hides all changes to submodules\&.
  4072. .RE
  4073. .PP
  4074. \fB\-\-src\-prefix=\fR\fI<prefix>\fR
  4075. .RS 4
  4076. Show the given source
  4077. \fI<prefix>\fR
  4078. instead of "a/"\&.
  4079. .RE
  4080. .PP
  4081. \fB\-\-dst\-prefix=\fR\fI<prefix>\fR
  4082. .RS 4
  4083. Show the given destination
  4084. \fI<prefix>\fR
  4085. instead of "b/"\&.
  4086. .RE
  4087. .PP
  4088. \fB\-\-no\-prefix\fR
  4089. .RS 4
  4090. Do not show any source or destination prefix\&.
  4091. .RE
  4092. .PP
  4093. \fB\-\-default\-prefix\fR
  4094. .RS 4
  4095. Use the default source and destination prefixes ("a/" and "b/")\&. This overrides configuration variables such as
  4096. \fBdiff\&.noprefix\fR,
  4097. \fBdiff\&.srcPrefix\fR,
  4098. \fBdiff\&.dstPrefix\fR, and
  4099. \fBdiff\&.mnemonicPrefix\fR
  4100. (see
  4101. \fBgit-config\fR(1))\&.
  4102. .RE
  4103. .PP
  4104. \fB\-\-line\-prefix=\fR\fI<prefix>\fR
  4105. .RS 4
  4106. Prepend an additional
  4107. \fI<prefix>\fR
  4108. to every line of output\&.
  4109. .RE
  4110. .PP
  4111. \fB\-\-ita\-invisible\-in\-index\fR
  4112. .RS 4
  4113. By default entries added by
  4114. \fBgit\fR
  4115. \fBadd\fR
  4116. \fB\-N\fR
  4117. appear as an existing empty file in
  4118. \fBgit\fR
  4119. \fBdiff\fR
  4120. and a new file in
  4121. \fBgit\fR
  4122. \fBdiff\fR
  4123. \fB\-\-cached\fR\&. This option makes the entry appear as a new file in
  4124. \fBgit\fR
  4125. \fBdiff\fR
  4126. and non\-existent in
  4127. \fBgit\fR
  4128. \fBdiff\fR
  4129. \fB\-\-cached\fR\&. This option could be reverted with
  4130. \fB\-\-ita\-visible\-in\-index\fR\&. Both options are experimental and could be removed in future\&.
  4131. .RE
  4132. .sp
  4133. For more detailed explanation on these common options, see also \fBgitdiffcore\fR(7)\&.
  4134. .SH "GENERATING PATCH TEXT WITH \-P"
  4135. .sp
  4136. Running \fBgit-diff\fR(1), \fBgit-log\fR(1), \fBgit-show\fR(1), \fBgit-diff-index\fR(1), \fBgit-diff-tree\fR(1), or \fBgit-diff-files\fR(1) with the \fB\-p\fR option produces patch text\&. You can customize the creation of patch text via the \fBGIT_EXTERNAL_DIFF\fR and the \fBGIT_DIFF_OPTS\fR environment variables (see \fBgit\fR(1)), and the \fBdiff\fR attribute (see \fBgitattributes\fR(5))\&.
  4137. .sp
  4138. What the \fB\-p\fR option produces is slightly different from the traditional diff format:
  4139. .sp
  4140. .RS 4
  4141. .ie n \{\
  4142. \h'-04' 1.\h'+01'\c
  4143. .\}
  4144. .el \{\
  4145. .sp -1
  4146. .IP "  1." 4.2
  4147. .\}
  4148. It is preceded by a "git diff" header that looks like this:
  4149. .sp
  4150. .if n \{\
  4151. .RS 4
  4152. .\}
  4153. .nf
  4154. diff \-\-git a/file1 b/file2
  4155. .fi
  4156. .if n \{\
  4157. .RE
  4158. .\}
  4159. .sp
  4160. The
  4161. \fBa/\fR
  4162. and
  4163. \fBb/\fR
  4164. filenames are the same unless rename/copy is involved\&. Especially, even for a creation or a deletion,
  4165. \fB/dev/null\fR
  4166. is
  4167. \fInot\fR
  4168. used in place of the
  4169. \fBa/\fR
  4170. or
  4171. \fBb/\fR
  4172. filenames\&.
  4173. .sp
  4174. When a rename/copy is involved,
  4175. \fBfile1\fR
  4176. and
  4177. \fBfile2\fR
  4178. show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&.
  4179. .RE
  4180. .sp
  4181. .RS 4
  4182. .ie n \{\
  4183. \h'-04' 2.\h'+01'\c
  4184. .\}
  4185. .el \{\
  4186. .sp -1
  4187. .IP "  2." 4.2
  4188. .\}
  4189. It is followed by one or more extended header lines:
  4190. .sp
  4191. .if n \{\
  4192. .RS 4
  4193. .\}
  4194. .nf
  4195. \fBold\fR \fBmode\fR \fI<mode>\fR
  4196. \fBnew\fR \fBmode\fR \fI<mode>\fR
  4197. \fBdeleted\fR \fBfile\fR \fBmode\fR \fI<mode>\fR
  4198. \fBnew\fR \fBfile\fR \fBmode\fR \fI<mode>\fR
  4199. \fBcopy\fR \fBfrom\fR \fI<path>\fR
  4200. \fBcopy\fR \fBto\fR \fI<path>\fR
  4201. \fBrename\fR \fBfrom\fR \fI<path>\fR
  4202. \fBrename\fR \fBto\fR \fI<path>\fR
  4203. \fBsimilarity\fR \fBindex\fR \fI<number>\fR
  4204. \fBdissimilarity\fR \fBindex\fR \fI<number>\fR
  4205. \fBindex\fR \fI<hash>\fR`\&.\&.`\fI<hash>\fR \fI<mode>\fR
  4206. .fi
  4207. .if n \{\
  4208. .RE
  4209. .\}
  4210. File modes
  4211. \fI<mode>\fR
  4212. are printed as 6\-digit octal numbers including the file type and file permission bits\&.
  4213. .sp
  4214. Path names in extended headers do not include the
  4215. \fBa/\fR
  4216. and
  4217. \fBb/\fR
  4218. prefixes\&.
  4219. .sp
  4220. The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines\&. It is a rounded down integer, followed by a percent sign\&. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one\&.
  4221. .sp
  4222. The index line includes the blob object names before and after the change\&. The
  4223. \fI<mode>\fR
  4224. is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode\&.
  4225. .RE
  4226. .sp
  4227. .RS 4
  4228. .ie n \{\
  4229. \h'-04' 3.\h'+01'\c
  4230. .\}
  4231. .el \{\
  4232. .sp -1
  4233. .IP "  3." 4.2
  4234. .\}
  4235. Pathnames with "unusual" characters are quoted as explained for the configuration variable
  4236. \fBcore\&.quotePath\fR
  4237. (see
  4238. \fBgit-config\fR(1))\&.
  4239. .RE
  4240. .sp
  4241. .RS 4
  4242. .ie n \{\
  4243. \h'-04' 4.\h'+01'\c
  4244. .\}
  4245. .el \{\
  4246. .sp -1
  4247. .IP "  4." 4.2
  4248. .\}
  4249. All the
  4250. \fBfile1\fR
  4251. files in the output refer to files before the commit, and all the
  4252. \fBfile2\fR
  4253. files refer to files after the commit\&. It is incorrect to apply each change to each file sequentially\&. For example, this patch will swap a and b:
  4254. .sp
  4255. .if n \{\
  4256. .RS 4
  4257. .\}
  4258. .nf
  4259. diff \-\-git a/a b/b
  4260. rename from a
  4261. rename to b
  4262. diff \-\-git a/b b/a
  4263. rename from b
  4264. rename to a
  4265. .fi
  4266. .if n \{\
  4267. .RE
  4268. .\}
  4269. .RE
  4270. .sp
  4271. .RS 4
  4272. .ie n \{\
  4273. \h'-04' 5.\h'+01'\c
  4274. .\}
  4275. .el \{\
  4276. .sp -1
  4277. .IP "  5." 4.2
  4278. .\}
  4279. Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in
  4280. \fBgitattributes\fR(5)
  4281. for details of how to tailor this to specific languages\&.
  4282. .RE
  4283. .SH "COMBINED DIFF FORMAT"
  4284. .sp
  4285. Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&.
  4286. .sp
  4287. A "combined diff" format looks like this:
  4288. .sp
  4289. .if n \{\
  4290. .RS 4
  4291. .\}
  4292. .nf
  4293. diff \-\-combined describe\&.c
  4294. index fabadb8,cc95eb0\&.\&.4866510
  4295. \-\-\- a/describe\&.c
  4296. +++ b/describe\&.c
  4297. @@@ \-98,20 \-98,12 +98,20 @@@
  4298.         return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
  4299.   }
  4301. \- static void describe(char *arg)
  4302.  \-static void describe(struct commit *cmit, int last_one)
  4303. ++static void describe(char *arg, int last_one)
  4304.   {
  4305.  +      unsigned char sha1[20];
  4306.  +      struct commit *cmit;
  4307.         struct commit_list *list;
  4308.         static int initialized = 0;
  4309.         struct commit_name *n;
  4311.  +      if (get_sha1(arg, sha1) < 0)
  4312.  +              usage(describe_usage);
  4313.  +      cmit = lookup_commit_reference(sha1);
  4314.  +      if (!cmit)
  4315.  +              usage(describe_usage);
  4316.  +
  4317.         if (!initialized) {
  4318.                 initialized = 1;
  4319.                 for_each_ref(get_name);
  4320. .fi
  4321. .if n \{\
  4322. .RE
  4323. .\}
  4324. .sp
  4325. .RS 4
  4326. .ie n \{\
  4327. \h'-04' 1.\h'+01'\c
  4328. .\}
  4329. .el \{\
  4330. .sp -1
  4331. .IP "  1." 4.2
  4332. .\}
  4333. It is preceded by a "git diff" header, that looks like this (when the
  4334. \fB\-c\fR
  4335. option is used):
  4336. .sp
  4337. .if n \{\
  4338. .RS 4
  4339. .\}
  4340. .nf
  4341. diff \-\-combined file
  4342. .fi
  4343. .if n \{\
  4344. .RE
  4345. .\}
  4346. .sp
  4347. or like this (when the
  4348. \fB\-\-cc\fR
  4349. option is used):
  4350. .sp
  4351. .if n \{\
  4352. .RS 4
  4353. .\}
  4354. .nf
  4355. diff \-\-cc file
  4356. .fi
  4357. .if n \{\
  4358. .RE
  4359. .\}
  4360. .RE
  4361. .sp
  4362. .RS 4
  4363. .ie n \{\
  4364. \h'-04' 2.\h'+01'\c
  4365. .\}
  4366. .el \{\
  4367. .sp -1
  4368. .IP "  2." 4.2
  4369. .\}
  4370. It is followed by one or more extended header lines (this example shows a merge with two parents):
  4371. .sp
  4372. .if n \{\
  4373. .RS 4
  4374. .\}
  4375. .nf
  4376. \fBindex\fR \fI<hash>\fR\fB,\fR\fI<hash>\fR`\&.\&.\fB__\fR\fI<hash>\fR\fB__\fR
  4377. {empty}`mode \fI<mode>\fR\fB,\fR\fI<mode>\fR``\&.\&.``\fI<mode>\fR
  4378. \fBnew\fR \fBfile\fR \fBmode\fR \fI<mode>\fR
  4379. \fBdeleted\fR \fBfile\fR \fBmode\fR \fI<mode>\fR\fB,\fR\fI<mode>\fR
  4380. .fi
  4381. .if n \{\
  4382. .RE
  4383. .\}
  4384. The
  4385. \fBmode\fR
  4386. \fI<mode>\fR\fB,\fR\fI<mode>\fR\fB\&.\&.\fR\fI<mode>\fR
  4387. line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two
  4388. \fI<tree\-ish>\fR
  4389. and are not used by combined diff format\&.
  4390. .RE
  4391. .sp
  4392. .RS 4
  4393. .ie n \{\
  4394. \h'-04' 3.\h'+01'\c
  4395. .\}
  4396. .el \{\
  4397. .sp -1
  4398. .IP "  3." 4.2
  4399. .\}
  4400. It is followed by a two\-line from\-file/to\-file header:
  4401. .sp
  4402. .if n \{\
  4403. .RS 4
  4404. .\}
  4405. .nf
  4406. \-\-\- a/file
  4407. +++ b/file
  4408. .fi
  4409. .if n \{\
  4410. .RE
  4411. .\}
  4412. .sp
  4413. Similar to the two\-line header for the traditional
  4414. \fIunified\fR
  4415. diff format,
  4416. \fB/dev/null\fR
  4417. is used to signal created or deleted files\&.
  4418. .sp
  4419. However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit:
  4420. .sp
  4421. .if n \{\
  4422. .RS 4
  4423. .\}
  4424. .nf
  4425. \-\-\- a/file
  4426. \-\-\- a/file
  4427. \-\-\- a/file
  4428. +++ b/file
  4429. .fi
  4430. .if n \{\
  4431. .RE
  4432. .\}
  4433. .sp
  4434. This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents\&.
  4435. .RE
  4436. .sp
  4437. .RS 4
  4438. .ie n \{\
  4439. \h'-04' 4.\h'+01'\c
  4440. .\}
  4441. .el \{\
  4442. .sp -1
  4443. .IP "  4." 4.2
  4444. .\}
  4445. Chunk header format is modified to prevent people from accidentally feeding it to
  4446. \fBpatch\fR
  4447. \fB\-p1\fR\&. Combined diff format was created for review of merge commit changes, and was not meant to be applied\&. The change is similar to the change in the extended
  4448. \fIindex\fR
  4449. header:
  4450. .sp
  4451. .if n \{\
  4452. .RS 4
  4453. .\}
  4454. .nf
  4455. @@@ <from\-file\-range> <from\-file\-range> <to\-file\-range> @@@
  4456. .fi
  4457. .if n \{\
  4458. .RE
  4459. .\}
  4460. .sp
  4461. There are (number of parents + 1)
  4462. \fB@\fR
  4463. characters in the chunk header for combined diff format\&.
  4464. .RE
  4465. .sp
  4466. Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \fB\-\fR (minus \(em appears in A but removed in B), \fB+\fR (plus \(em missing in A but added to B), or " " (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&...\: with one file X, and shows how X differs from each of fileN\&. One column for each of fileN is prepended to the output line to note how X\(cqs line is different from it\&.
  4467. .sp
  4468. A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&.
  4469. .sp
  4470. In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&.
  4471. .sp
  4472. When shown by \fBgit\fR \fBdiff\-tree\fR \fB\-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit\fR \fBdiff\-files\fR \fB\-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&.
  4473. .SH "EXAMPLES"
  4474. .PP
  4475. \fBgit\fR \fBlog\fR \fB\-\-no\-merges\fR
  4476. .RS 4
  4477. Show the whole commit history, but skip any merges
  4478. .RE
  4479. .PP
  4480. \fBgit\fR \fBlog\fR \fBv2\&.6\&.12\fR\fB\&.\&.\fR \fBinclude/scsi\fR \fBdrivers/scsi\fR
  4481. .RS 4
  4482. Show all commits since version
  4483. \fIv2\&.6\&.12\fR
  4484. that changed any file in the
  4485. \fBinclude/scsi\fR
  4486. or
  4487. \fBdrivers/scsi\fR
  4488. subdirectories
  4489. .RE
  4490. .PP
  4491. \fBgit\fR \fBlog\fR \fB\-\-since=\fR"2 \fBweeks\fR \fBago\fR" \fB\-\-\fR \fBgitk\fR
  4492. .RS 4
  4493. Show the changes during the last two weeks to the file
  4494. \fIgitk\fR\&. The
  4495. \fB\-\-\fR
  4496. is necessary to avoid confusion with the
  4497. \fBbranch\fR
  4498. named
  4499. \fIgitk\fR
  4500. .RE
  4501. .PP
  4502. \fBgit\fR \fBlog\fR \fB\-\-name\-status\fR \fBrelease\fR\fB\&.\&.\fR\fBtest\fR
  4503. .RS 4
  4504. Show the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths each commit modifies\&.
  4505. .RE
  4506. .PP
  4507. \fBgit\fR \fBlog\fR \fB\-\-follow\fR \fBbuiltin/rev\-list\&.c\fR
  4508. .RS 4
  4509. Shows the commits that changed
  4510. \fBbuiltin/rev\-list\&.c\fR, including those commits that occurred before the file was given its present name\&.
  4511. .RE
  4512. .PP
  4513. \fBgit\fR \fBlog\fR \fB\-\-branches\fR \fB\-\-not\fR \fB\-\-remotes=origin\fR
  4514. .RS 4
  4515. Shows all commits that are in any of local branches but not in any of remote\-tracking branches for
  4516. \fIorigin\fR
  4517. (what you have that origin doesn\(cqt)\&.
  4518. .RE
  4519. .PP
  4520. \fBgit\fR \fBlog\fR \fBmaster\fR \fB\-\-not\fR \fB\-\-remotes=\fR*/master
  4521. .RS 4
  4522. Shows all commits that are in local master but not in any remote repository master branches\&.
  4523. .RE
  4524. .PP
  4525. \fBgit\fR \fBlog\fR \fB\-p\fR \fB\-m\fR \fB\-\-first\-parent\fR
  4526. .RS 4
  4527. Shows the history including change diffs, but only from the
  4528. \(lqmain branch\(rq
  4529. perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges\&. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch\&.
  4530. .RE
  4531. .PP
  4532. \fBgit\fR \fBlog\fR \fB\-L\fR \*(Aq/int \fBmain/\fR\*(Aq,/^}/:main\&.\fBc\fR
  4533. .RS 4
  4534. Shows how the function
  4535. \fBmain\fR() in the file
  4536. \fBmain\&.c\fR
  4537. evolved over time\&.
  4538. .RE
  4539. .PP
  4540. \fBgit\fR \fBlog\fR \fB\-3\fR
  4541. .RS 4
  4542. Limits the number of commits to show to 3\&.
  4543. .RE
  4544. .SH "DISCUSSION"
  4545. .sp
  4546. Git is to some extent character encoding agnostic\&.
  4547. .sp
  4548. .RS 4
  4549. .ie n \{\
  4550. \h'-04'\(bu\h'+03'\c
  4551. .\}
  4552. .el \{\
  4553. .sp -1
  4554. .IP \(bu 2.3
  4555. .\}
  4556. The contents of the blob objects are uninterpreted sequences of bytes\&. There is no encoding translation at the core level\&.
  4557. .RE
  4558. .sp
  4559. .RS 4
  4560. .ie n \{\
  4561. \h'-04'\(bu\h'+03'\c
  4562. .\}
  4563. .el \{\
  4564. .sp -1
  4565. .IP \(bu 2.3
  4566. .\}
  4567. Path names are encoded in UTF\-8 normalization form C\&. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables and config files (\&.\fBgit/config\fR
  4568. (see
  4569. \fBgit-config\fR(1)),
  4570. \fBgitignore\fR(5),
  4571. \fBgitattributes\fR(5)
  4572. and
  4573. \fBgitmodules\fR(5))\&.
  4574. .sp
  4575. Note that Git at the core level treats path names simply as sequences of non\-NUL bytes, there are no path name encoding conversions (except on Mac and Windows)\&. Therefore, using non\-ASCII path names will mostly work even on platforms and file systems that use legacy extended ASCII encodings\&. However, repositories created on such systems will not work properly on UTF\-8\-based systems (e\&.g\&. Linux, Mac, Windows) and vice versa\&. Additionally, many Git\-based tools simply assume path names to be UTF\-8 and will fail to display other encodings correctly\&.
  4576. .RE
  4577. .sp
  4578. .RS 4
  4579. .ie n \{\
  4580. \h'-04'\(bu\h'+03'\c
  4581. .\}
  4582. .el \{\
  4583. .sp -1
  4584. .IP \(bu 2.3
  4585. .\}
  4586. Commit log messages are typically encoded in UTF\-8, but other extended ASCII encodings are also supported\&. This includes ISO\-8859\-x, CP125x and many others, but
  4587. \fInot\fR
  4588. UTF\-16/32, EBCDIC and CJK multi\-byte encodings (GBK, Shift\-JIS, Big5, EUC\-x, CP9xx etc\&.)\&.
  4589. .RE
  4590. .sp
  4591. Although we encourage that the commit log messages are encoded in UTF\-8, both the core and Git Porcelain are designed not to force UTF\-8 on projects\&. If all participants of a particular project find it more convenient to use legacy encodings, Git does not forbid it\&. However, there are a few things to keep in mind\&.
  4592. .sp
  4593. .RS 4
  4594. .ie n \{\
  4595. \h'-04' 1.\h'+01'\c
  4596. .\}
  4597. .el \{\
  4598. .sp -1
  4599. .IP "  1." 4.2
  4600. .\}
  4601. \fBgit\fR
  4602. \fBcommit\fR
  4603. and
  4604. \fBgit\fR
  4605. \fBcommit\-tree\fR
  4606. issue a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have
  4607. \fBi18n\&.commitEncoding\fR
  4608. in \&.\fBgit/config\fR
  4609. file, like this:
  4610. .sp
  4611. .if n \{\
  4612. .RS 4
  4613. .\}
  4614. .nf
  4615. [i18n]
  4616.         commitEncoding = ISO\-8859\-1
  4617. .fi
  4618. .if n \{\
  4619. .RE
  4620. .\}
  4621. .sp
  4622. Commit objects created with the above setting record the value of
  4623. \fBi18n\&.commitEncoding\fR
  4624. in their
  4625. \fBencoding\fR
  4626. header\&. This is to help other people who look at them later\&. Lack of this header implies that the commit log message is encoded in UTF\-8\&.
  4627. .RE
  4628. .sp
  4629. .RS 4
  4630. .ie n \{\
  4631. \h'-04' 2.\h'+01'\c
  4632. .\}
  4633. .el \{\
  4634. .sp -1
  4635. .IP "  2." 4.2
  4636. .\}
  4637. \fBgit\fR
  4638. \fBlog\fR,
  4639. \fBgit\fR
  4640. \fBshow\fR,
  4641. \fBgit\fR
  4642. \fBblame\fR
  4643. and friends look at the
  4644. \fBencoding\fR
  4645. header of a commit object, and try to re\-code the log message into UTF\-8 unless otherwise specified\&. You can specify the desired output encoding with
  4646. \fBi18n\&.logOutputEncoding\fR
  4647. in \&.\fBgit/config\fR
  4648. file, like this:
  4649. .sp
  4650. .if n \{\
  4651. .RS 4
  4652. .\}
  4653. .nf
  4654. [i18n]
  4655.         logOutputEncoding = ISO\-8859\-1
  4656. .fi
  4657. .if n \{\
  4658. .RE
  4659. .\}
  4660. .sp
  4661. If you do not have this configuration variable, the value of
  4662. \fBi18n\&.commitEncoding\fR
  4663. is used instead\&.
  4664. .RE
  4665. .sp
  4666. Note that we deliberately chose not to re\-code the commit log message when a commit is made to force UTF\-8 at the commit object level, because re\-coding to UTF\-8 is not necessarily a reversible operation\&.
  4667. .SH "CONFIGURATION"
  4668. .sp
  4669. See \fBgit-config\fR(1) for core variables and \fBgit-diff\fR(1) for settings related to diff generation\&.
  4670. .PP
  4671. format\&.pretty
  4672. .RS 4
  4673. Default for the
  4674. \fB\-\-format\fR
  4675. option\&. (See
  4676. \fIPretty Formats\fR
  4677. above\&.) Defaults to
  4678. \fBmedium\fR\&.
  4679. .RE
  4680. .PP
  4681. i18n\&.logOutputEncoding
  4682. .RS 4
  4683. Encoding to use when displaying logs\&. (See
  4684. \fIDiscussion\fR
  4685. above\&.) Defaults to the value of
  4686. \fBi18n\&.commitEncoding\fR
  4687. if set, and UTF\-8 otherwise\&.
  4688. .RE
  4689. .sp
  4690. Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there:
  4691. .PP
  4692. log\&.abbrevCommit
  4693. .RS 4
  4694. If true, makes
  4695. \fBgit-log\fR(1),
  4696. \fBgit-show\fR(1), and
  4697. \fBgit-whatchanged\fR(1)
  4698. assume
  4699. \fB\-\-abbrev\-commit\fR\&. You may override this option with
  4700. \fB\-\-no\-abbrev\-commit\fR\&.
  4701. .RE
  4702. .PP
  4703. log\&.date
  4704. .RS 4
  4705. Set the default date\-time mode for the
  4706. \fIlog\fR
  4707. command\&. Setting a value for log\&.date is similar to using
  4708. \fIgit log\fR\*(Aqs
  4709. \fB\-\-date\fR
  4710. option\&. See
  4711. \fBgit-log\fR(1)
  4712. for details\&.
  4713. .sp
  4714. If the format is set to "auto:foo" and the pager is in use, format "foo" will be used for the date format\&. Otherwise, "default" will be used\&.
  4715. .RE
  4716. .PP
  4717. log\&.decorate
  4718. .RS 4
  4719. Print out the ref names of any commits that are shown by the log command\&. If
  4720. \fIshort\fR
  4721. is specified, the ref name prefixes
  4722. \fIrefs/heads/\fR,
  4723. \fIrefs/tags/\fR
  4724. and
  4725. \fIrefs/remotes/\fR
  4726. will not be printed\&. If
  4727. \fIfull\fR
  4728. is specified, the full ref name (including prefix) will be printed\&. If
  4729. \fIauto\fR
  4730. is specified, then if the output is going to a terminal, the ref names are shown as if
  4731. \fIshort\fR
  4732. were given, otherwise no ref names are shown\&. This is the same as the
  4733. \fB\-\-decorate\fR
  4734. option of the
  4735. \fBgit\fR
  4736. \fBlog\fR\&.
  4737. .RE
  4738. .PP
  4739. log\&.initialDecorationSet
  4740. .RS 4
  4741. By default,
  4742. \fBgit\fR
  4743. \fBlog\fR
  4744. only shows decorations for certain known ref namespaces\&. If
  4745. \fIall\fR
  4746. is specified, then show all refs as decorations\&.
  4747. .RE
  4748. .PP
  4749. log\&.excludeDecoration
  4750. .RS 4
  4751. Exclude the specified patterns from the log decorations\&. This is similar to the
  4752. \fB\-\-decorate\-refs\-exclude\fR
  4753. command\-line option, but the config option can be overridden by the
  4754. \fB\-\-decorate\-refs\fR
  4755. option\&.
  4756. .RE
  4757. .PP
  4758. log\&.diffMerges
  4759. .RS 4
  4760. Set diff format to be used when
  4761. \fB\-\-diff\-merges=on\fR
  4762. is specified, see
  4763. \fB\-\-diff\-merges\fR
  4764. in
  4765. \fBgit-log\fR(1)
  4766. for details\&. Defaults to
  4767. \fBseparate\fR\&.
  4768. .RE
  4769. .PP
  4770. log\&.follow
  4771. .RS 4
  4772. If
  4773. \fBtrue\fR,
  4774. \fBgit\fR
  4775. \fBlog\fR
  4776. will act as if the
  4777. \fB\-\-follow\fR
  4778. option was used when a single <path> is given\&. This has the same limitations as
  4779. \fB\-\-follow\fR, i\&.e\&. it cannot be used to follow multiple files and does not work well on non\-linear history\&.
  4780. .RE
  4781. .PP
  4782. log\&.graphColors
  4783. .RS 4
  4784. A list of colors, separated by commas, that can be used to draw history lines in
  4785. \fBgit\fR
  4786. \fBlog\fR
  4787. \fB\-\-graph\fR\&.
  4788. .RE
  4789. .PP
  4790. log\&.showRoot
  4791. .RS 4
  4792. If true, the initial commit will be shown as a big creation event\&. This is equivalent to a diff against an empty tree\&. Tools like
  4793. \fBgit-log\fR(1)
  4794. or
  4795. \fBgit-whatchanged\fR(1), which normally hide the root commit will now show it\&. True by default\&.
  4796. .RE
  4797. .PP
  4798. log\&.showSignature
  4799. .RS 4
  4800. If true, makes
  4801. \fBgit-log\fR(1),
  4802. \fBgit-show\fR(1), and
  4803. \fBgit-whatchanged\fR(1)
  4804. assume
  4805. \fB\-\-show\-signature\fR\&.
  4806. .RE
  4807. .PP
  4808. log\&.mailmap
  4809. .RS 4
  4810. If true, makes
  4811. \fBgit-log\fR(1),
  4812. \fBgit-show\fR(1), and
  4813. \fBgit-whatchanged\fR(1)
  4814. assume
  4815. \fB\-\-use\-mailmap\fR, otherwise assume
  4816. \fB\-\-no\-use\-mailmap\fR\&. True by default\&.
  4817. .RE
  4818. .PP
  4819. \fBnotes\&.mergeStrategy\fR
  4820. .RS 4
  4821. Which merge strategy to choose by default when resolving notes conflicts\&. Must be one of
  4822. \fBmanual\fR,
  4823. \fBours\fR,
  4824. \fBtheirs\fR,
  4825. \fBunion\fR, or
  4826. \fBcat_sort_uniq\fR\&. Defaults to
  4827. \fBmanual\fR\&. See the "NOTES MERGE STRATEGIES" section of
  4828. \fBgit-notes\fR(1)
  4829. for more information on each strategy\&.
  4830. .sp
  4831. This setting can be overridden by passing the
  4832. \fB\-\-strategy\fR
  4833. option to
  4834. \fBgit-notes\fR(1)\&.
  4835. .RE
  4836. .PP
  4837. \fBnotes\&.\fR\fI<name>\fR\fB\&.mergeStrategy\fR
  4838. .RS 4
  4839. Which merge strategy to choose when doing a notes merge into
  4840. \fBrefs/notes/\fR\fI<name>\fR\&. This overrides the more general
  4841. \fBnotes\&.mergeStrategy\fR\&. See the "NOTES MERGE STRATEGIES" section in
  4842. \fBgit-notes\fR(1)
  4843. for more information on the available strategies\&.
  4844. .RE
  4845. .PP
  4846. \fBnotes\&.displayRef\fR
  4847. .RS 4
  4848. Which ref (or refs, if a glob or specified more than once), in addition to the default set by
  4849. \fBcore\&.notesRef\fR
  4850. or
  4851. \fBGIT_NOTES_REF\fR, to read notes from when showing commit messages with the
  4852. \fBgit\fR
  4853. \fBlog\fR
  4854. family of commands\&.
  4855. .sp
  4856. This setting can be overridden with the
  4857. \fBGIT_NOTES_DISPLAY_REF\fR
  4858. environment variable, which must be a colon separated list of refs or globs\&.
  4859. .sp
  4860. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&.
  4861. .sp
  4862. This setting can be disabled by the
  4863. \fB\-\-no\-notes\fR
  4864. option to the
  4865. \fBgit-log\fR(1)
  4866. family of commands, or by the
  4867. \fB\-\-notes=\fR\fI<ref>\fR
  4868. option accepted by those commands\&.
  4869. .sp
  4870. The effective value of
  4871. \fBcore\&.notesRef\fR
  4872. (possibly overridden by
  4873. \fBGIT_NOTES_REF\fR) is also implicitly added to the list of refs to be displayed\&.
  4874. .RE
  4875. .PP
  4876. \fBnotes\&.rewrite\&.\fR\fI<command>\fR
  4877. .RS 4
  4878. When rewriting commits with
  4879. \fI<command>\fR
  4880. (currently
  4881. \fBamend\fR
  4882. or
  4883. \fBrebase\fR), if this variable is
  4884. \fBfalse\fR, git will not copy notes from the original to the rewritten commit\&. Defaults to
  4885. \fBtrue\fR\&. See also
  4886. \fBnotes\&.rewriteRef\fR
  4887. below\&.
  4888. .sp
  4889. This setting can be overridden with the
  4890. \fBGIT_NOTES_REWRITE_REF\fR
  4891. environment variable, which must be a colon separated list of refs or globs\&.
  4892. .RE
  4893. .PP
  4894. \fBnotes\&.rewriteMode\fR
  4895. .RS 4
  4896. When copying notes during a rewrite (see the
  4897. \fBnotes\&.rewrite\&.\fR\fI<command>\fR
  4898. option), determines what to do if the target commit already has a note\&. Must be one of
  4899. \fBoverwrite\fR,
  4900. \fBconcatenate\fR,
  4901. \fBcat_sort_uniq\fR, or
  4902. \fBignore\fR\&. Defaults to
  4903. \fBconcatenate\fR\&.
  4904. .sp
  4905. This setting can be overridden with the
  4906. \fBGIT_NOTES_REWRITE_MODE\fR
  4907. environment variable\&.
  4908. .RE
  4909. .PP
  4910. \fBnotes\&.rewriteRef\fR
  4911. .RS 4
  4912. When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied\&. May be a glob, in which case notes in all matching refs will be copied\&. You may also specify this configuration several times\&.
  4913. .sp
  4914. Does not have a default value; you must configure this variable to enable note rewriting\&. Set it to
  4915. \fBrefs/notes/commits\fR
  4916. to enable rewriting for the default commit notes\&.
  4917. .sp
  4918. Can be overridden with the
  4919. \fBGIT_NOTES_REWRITE_REF\fR
  4920. environment variable\&. See
  4921. \fBnotes\&.rewrite\&.\fR\fI<command>\fR
  4922. above for a further description of its format\&.
  4923. .RE
  4924. .SH "GIT"
  4925. .sp
  4926. Part of the \fBgit\fR(1) suite