blob: 735cf07b20e17e29d96f701d97768ae610aea590 [file] [log] [blame]
Junio C Hamanob0e02952008-01-19 08:02:001Commit Formatting
2~~~~~~~~~~~~~~~~~
3
4ifdef::git-rev-list[]
5Using these options, linkgit:git-rev-list[1] will act similar to the
6more specialized family of commit log tools: linkgit:git-log[1],
7linkgit:git-show[1], and linkgit:git-whatchanged[1]
8endif::git-rev-list[]
9
10include::pretty-options.txt[]
11
12--relative-date::
13
14Synonym for `--date=relative`.
15
Junio C Hamanob713ff12008-05-24 01:12:3016--date={relative,local,default,iso,rfc,short}::
Junio C Hamanob0e02952008-01-19 08:02:0017
18Only takes effect for dates shown in human-readable format, such
Junio C Hamanob713ff12008-05-24 01:12:3019as when using "--pretty". `log.date` config variable sets a default
20value for log command's --date option.
Junio C Hamanob0e02952008-01-19 08:02:0021+
22`--date=relative` shows dates relative to the current time,
23e.g. "2 hours ago".
24+
25`--date=local` shows timestamps in user's local timezone.
26+
27`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.
28+
29`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
30format, often found in E-mail messages.
31+
32`--date=short` shows only date but not time, in `YYYY-MM-DD` format.
33+
34`--date=default` shows timestamps in the original timezone
35(either committer's or author's).
36
Junio C Hamano69cd7c52008-06-04 07:52:5937ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0038--header::
39
40Print the contents of the commit in raw-format; each record is
41separated with a NUL character.
Junio C Hamano69cd7c52008-06-04 07:52:5942endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0043
44--parents::
45
Junio C Hamanoa76cb0d2008-08-13 20:04:1046Print the parents of the commit. Also enables parent
47rewriting, see 'History Simplification' below.
Junio C Hamanob0e02952008-01-19 08:02:0048
Junio C Hamano46a38aa2008-07-14 03:13:2749--children::
50
Junio C Hamanoa76cb0d2008-08-13 20:04:1051Print the children of the commit. Also enables parent
52rewriting, see 'History Simplification' below.
Junio C Hamano46a38aa2008-07-14 03:13:2753
Junio C Hamano69cd7c52008-06-04 07:52:5954ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0055--timestamp::
56Print the raw commit timestamp.
Junio C Hamano69cd7c52008-06-04 07:52:5957endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:0058
59--left-right::
60
61Mark which side of a symmetric diff a commit is reachable from.
62Commits from the left side are prefixed with `<` and those from
63the right with `>`. If combined with `--boundary`, those
64commits are prefixed with `-`.
65+
66For example, if you have this topology:
67+
68-----------------------------------------------------------------------
69 y---b---b branch B
70 / \ /
71 / .
72 / / \
73 o---x---a---a branch A
74-----------------------------------------------------------------------
75+
Junio C Hamanoc96fb5a2008-08-12 06:59:3876you would get an output like this:
Junio C Hamanob0e02952008-01-19 08:02:0077+
78-----------------------------------------------------------------------
79$ git rev-list --left-right --boundary --pretty=oneline A...B
80
81>bbbbbbb... 3rd on b
82>bbbbbbb... 2nd on b
83<aaaaaaa... 3rd on a
84<aaaaaaa... 2nd on a
85-yyyyyyy... 1st on b
86-xxxxxxx... 1st on a
87-----------------------------------------------------------------------
88
Junio C Hamanofeeb1be2008-05-22 00:53:3589--graph::
90
91Draw a text-based graphical representation of the commit history
92on the left hand side of the output. This may cause extra lines
93to be printed in between commits, in order for the graph history
94to be drawn properly.
95+
96This implies the '--topo-order' option by default, but the
97'--date-order' option may also be specified.
98
Junio C Hamanoa76cb0d2008-08-13 20:04:1099ifndef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00100Diff Formatting
101~~~~~~~~~~~~~~~
102
103Below are listed options that control the formatting of diff output.
104Some of them are specific to linkgit:git-rev-list[1], however other diff
105options may be given. See linkgit:git-diff-files[1] for more options.
106
107-c::
108
109This flag changes the way a merge commit is displayed. It shows
110the differences from each of the parents to the merge result
111simultaneously instead of showing pairwise diff between a parent
112and the result one at a time. Furthermore, it lists only files
113which were modified from all parents.
114
115--cc::
116
117This flag implies the '-c' options and further compresses the
Junio C Hamanoccc2f762008-07-24 04:03:33118patch output by omitting uninteresting hunks whose contents in
119the parents have only two variants and the merge result picks
120one of them without modification.
Junio C Hamanob0e02952008-01-19 08:02:00121
122-r::
123
124Show recursive diffs.
125
126-t::
127
128Show the tree objects in the diff output. This implies '-r'.
Junio C Hamanoa76cb0d2008-08-13 20:04:10129endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00130
131Commit Limiting
132~~~~~~~~~~~~~~~
133
134Besides specifying a range of commits that should be listed using the
135special notations explained in the description, additional commit
136limiting may be applied.
137
138--
139
Junio C Hamanoeb415992008-06-08 22:49:47140-n 'number'::
141--max-count='number'::
Junio C Hamanob0e02952008-01-19 08:02:00142
143Limit the number of commits output.
144
145--skip='number'::
146
147Skip 'number' commits before starting to show the commit output.
148
Junio C Hamanoeb415992008-06-08 22:49:47149--since='date'::
150--after='date'::
Junio C Hamanob0e02952008-01-19 08:02:00151
152Show commits more recent than a specific date.
153
Junio C Hamanoeb415992008-06-08 22:49:47154--until='date'::
155--before='date'::
Junio C Hamanob0e02952008-01-19 08:02:00156
157Show commits older than a specific date.
158
Junio C Hamano4f1d8c42008-03-03 02:01:16159ifdef::git-rev-list[]
Junio C Hamanoeb415992008-06-08 22:49:47160--max-age='timestamp'::
161--min-age='timestamp'::
Junio C Hamanob0e02952008-01-19 08:02:00162
163Limit the commits output to specified time range.
Junio C Hamano4f1d8c42008-03-03 02:01:16164endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00165
Junio C Hamanoeb415992008-06-08 22:49:47166--author='pattern'::
167--committer='pattern'::
Junio C Hamanob0e02952008-01-19 08:02:00168
169Limit the commits output to ones with author/committer
170header lines that match the specified pattern (regular expression).
171
172--grep='pattern'::
173
174Limit the commits output to ones with log message that
175matches the specified pattern (regular expression).
176
Junio C Hamanoeb415992008-06-08 22:49:47177-i::
178--regexp-ignore-case::
Junio C Hamanob0e02952008-01-19 08:02:00179
180Match the regexp limiting patterns without regard to letters case.
181
Junio C Hamanoeb415992008-06-08 22:49:47182-E::
183--extended-regexp::
Junio C Hamanob0e02952008-01-19 08:02:00184
185Consider the limiting patterns to be extended regular expressions
186instead of the default basic regular expressions.
187
Junio C Hamanoeb415992008-06-08 22:49:47188-F::
189--fixed-strings::
Junio C Hamano24bc09a2008-02-28 00:27:44190
191Consider the limiting patterns to be fixed strings (don't interpret
192pattern as a regular expression).
193
Junio C Hamanob0e02952008-01-19 08:02:00194--remove-empty::
195
196Stop when a given path disappears from the tree.
197
Junio C Hamanob0e02952008-01-19 08:02:00198--no-merges::
199
200Do not print commits with more than one parent.
201
202--first-parent::
203Follow only the first parent commit upon seeing a merge
204commit. This option can give a better overview when
205viewing the evolution of a particular topic branch,
206because merges into a topic branch tend to be only about
207adjusting to updated upstream from time to time, and
208this option allows you to ignore the individual commits
209brought in to your history by such a merge.
210
211--not::
212
213Reverses the meaning of the '{caret}' prefix (or lack thereof)
214for all following revision specifiers, up to the next '--not'.
215
216--all::
217
218Pretend as if all the refs in `$GIT_DIR/refs/` are listed on the
219command line as '<commit>'.
220
Junio C Hamano69cd7c52008-06-04 07:52:59221ifdef::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00222--stdin::
223
224In addition to the '<commit>' listed on the command
225line, read them from the standard input.
226
227--quiet::
228
229Don't print anything to standard output. This form
230is primarily meant to allow the caller to
231test the exit status to see if a range of objects is fully
232connected (or not). It is faster than redirecting stdout
233to /dev/null as the output does not have to be formatted.
Junio C Hamano69cd7c52008-06-04 07:52:59234endif::git-rev-list[]
Junio C Hamanob0e02952008-01-19 08:02:00235
236--cherry-pick::
237
238Omit any commit that introduces the same change as
239another commit on the "other side" when the set of
240commits are limited with symmetric difference.
241+
242For example, if you have two branches, `A` and `B`, a usual way
243to list all commits on only one side of them is with
244`--left-right`, like the example above in the description of
245that option. It however shows the commits that were cherry-picked
246from the other branch (for example, "3rd on b" may be cherry-picked
247from branch A). With this option, such pairs of commits are
248excluded from the output.
249
Junio C Hamanoeb415992008-06-08 22:49:47250-g::
251--walk-reflogs::
Junio C Hamanob0e02952008-01-19 08:02:00252
253Instead of walking the commit ancestry chain, walk
254reflog entries from the most recent one to older ones.
255When this option is used you cannot specify commits to
256exclude (that is, '{caret}commit', 'commit1..commit2',
257nor 'commit1...commit2' notations cannot be used).
258+
259With '\--pretty' format other than oneline (for obvious reasons),
260this causes the output to have two extra lines of information
261taken from the reflog. By default, 'commit@\{Nth}' notation is
262used in the output. When the starting commit is specified as
Junio C Hamano1d368882008-08-11 22:03:10263'commit@\{now}', output also uses 'commit@\{timestamp}' notation
Junio C Hamanob0e02952008-01-19 08:02:00264instead. Under '\--pretty=oneline', the commit message is
265prefixed with this information on the same line.
Junio C Hamano1d368882008-08-11 22:03:10266This option cannot be combined with '\--reverse'.
Junio C Hamanob0e02952008-01-19 08:02:00267See also linkgit:git-reflog[1].
268
269--merge::
270
271After a failed merge, show refs that touch files having a
272conflict and don't exist on all heads to merge.
273
274--boundary::
275
276Output uninteresting commits at the boundary, which are usually
277not shown.
278
Junio C Hamanoa76cb0d2008-08-13 20:04:10279--
280
281History Simplification
282~~~~~~~~~~~~~~~~~~~~~~
283
284When optional paths are given, 'git-rev-list' simplifies commits with
285various strategies, according to the options you have selected.
286
287Suppose you specified `foo` as the <paths>. We shall call commits
288that modify `foo` !TREESAME, and the rest TREESAME. (In a diff
289filtered for `foo`, they look different and equal, respectively.)
290
291In the following, we will always refer to the same example history to
292illustrate the differences between simplification settings. We assume
293that you are filtering for a file `foo` in this commit graph:
294-----------------------------------------------------------------------
295 .-A---M---N---O---P
296 / / / / /
297I B C D E
298 \ / / / /
299 `-------------'
300-----------------------------------------------------------------------
301The horizontal line of history A--P is taken to be the first parent of
302each merge. The commits are:
303
304* `I` is the initial commit, in which `foo` exists with contents
305 "asdf", and a file `quux` exists with contents "quux". Initial
306 commits are compared to an empty tree, so `I` is !TREESAME.
307
308* In `A`, `foo` contains just "foo".
309
310* `B` contains the same change as `A`. Its merge `M` is trivial and
311 hence TREESAME to all parents.
312
313* `C` does not change `foo`, but its merge `N` changes it to "foobar",
314 so it is not TREESAME to any parent.
315
316* `D` sets `foo` to "baz". Its merge `O` combines the strings from
317 `N` and `D` to "foobarbaz"; i.e., it is not TREESAME to any parent.
318
319* `E` changes `quux` to "xyzzy", and its merge `P` combines the
320 strings to "quux xyzzy". Despite appearing interesting, `P` is
321 TREESAME to all parents.
322
323'rev-list' walks backwards through history, including or excluding
324commits based on whether '\--full-history' and/or parent rewriting
325(via '\--parents' or '\--children') are used. The following settings
326are available.
327
328Default mode::
329
330Commits are included if they are not TREESAME to any parent
331(though this can be changed, see '\--sparse' below). If the
332commit was a merge, and it was TREESAME to one parent, follow
333only that parent. (Even if there are several TREESAME
334parents, follow only one of them.) Otherwise, follow all
335parents.
336+
337This results in:
338+
339-----------------------------------------------------------------------
340 .-A---N---O
341 / /
342I---------D
343-----------------------------------------------------------------------
344+
345Note how the rule to only follow the TREESAME parent, if one is
346available, removed `B` from consideration entirely. `C` was
347considered via `N`, but is TREESAME. Root commits are compared to an
348empty tree, so `I` is !TREESAME.
349+
350Parent/child relations are only visible with --parents, but that does
351not affect the commits selected in default mode, so we have shown the
352parent lines.
353
354--full-history without parent rewriting::
355
356This mode differs from the default in one point: always follow
357all parents of a merge, even if it is TREESAME to one of them.
358Even if more than one side of the merge has commits that are
359included, this does not imply that the merge itself is! In
360the example, we get
361+
362-----------------------------------------------------------------------
363I A B N D O
364-----------------------------------------------------------------------
365+
366`P` and `M` were excluded because they are TREESAME to a parent. `E`,
367`C` and `B` were all walked, but only `B` was !TREESAME, so the others
368do not appear.
369+
370Note that without parent rewriting, it is not really possible to talk
371about the parent/child relationships between the commits, so we show
372them disconnected.
373
374--full-history with parent rewriting::
375
376Ordinary commits are only included if they are !TREESAME
377(though this can be changed, see '\--sparse' below).
378+
379Merges are always included. However, their parent list is rewritten:
380Along each parent, prune away commits that are not included
381themselves. This results in
382+
383-----------------------------------------------------------------------
384 .-A---M---N---O---P
385 / / / / /
386I B / D /
387 \ / / / /
388 `-------------'
389-----------------------------------------------------------------------
390+
391Compare to '\--full-history' without rewriting above. Note that `E`
392was pruned away because it is TREESAME, but the parent list of P was
393rewritten to contain `E`'s parent `I`. The same happened for `C` and
394`N`. Note also that `P` was included despite being TREESAME.
395
396In addition to the above settings, you can change whether TREESAME
397affects inclusion:
398
Junio C Hamanoeb415992008-06-08 22:49:47399--dense::
Junio C Hamanoa76cb0d2008-08-13 20:04:10400
401Commits that are walked are included if they are not TREESAME
402to any parent.
403
Junio C Hamanoeb415992008-06-08 22:49:47404--sparse::
Junio C Hamanob0e02952008-01-19 08:02:00405
Junio C Hamanoa76cb0d2008-08-13 20:04:10406All commits that are walked are included.
407+
408Note that without '\--full-history', this still simplifies merges: if
409one of the parents is TREESAME, we follow only that one, so the other
410sides of the merge are never walked.
Junio C Hamanob0e02952008-01-19 08:02:00411
Junio C Hamanob0e02952008-01-19 08:02:00412
413ifdef::git-rev-list[]
Junio C Hamanoa76cb0d2008-08-13 20:04:10414Bisection Helpers
415~~~~~~~~~~~~~~~~~
416
Junio C Hamanob0e02952008-01-19 08:02:00417--bisect::
418
419Limit output to the one commit object which is roughly halfway between
420the included and excluded commits. Thus, if
421
422-----------------------------------------------------------------------
423$ git-rev-list --bisect foo ^bar ^baz
424-----------------------------------------------------------------------
425
426outputs 'midpoint', the output of the two commands
427
428-----------------------------------------------------------------------
429$ git-rev-list foo ^midpoint
430$ git-rev-list midpoint ^bar ^baz
431-----------------------------------------------------------------------
432
433would be of roughly the same length. Finding the change which
434introduces a regression is thus reduced to a binary search: repeatedly
435generate and test new 'midpoint's until the commit chain is of length
436one.
437
438--bisect-vars::
439
440This calculates the same as `--bisect`, but outputs text ready
441to be eval'ed by the shell. These lines will assign the name of
442the midpoint revision to the variable `bisect_rev`, and the
443expected number of commits to be tested after `bisect_rev` is
444tested to `bisect_nr`, the expected number of commits to be
445tested if `bisect_rev` turns out to be good to `bisect_good`,
446the expected number of commits to be tested if `bisect_rev`
447turns out to be bad to `bisect_bad`, and the number of commits
448we are bisecting right now to `bisect_all`.
449
450--bisect-all::
451
452This outputs all the commit objects between the included and excluded
453commits, ordered by their distance to the included and excluded
454commits. The farthest from them is displayed first. (This is the only
455one displayed by `--bisect`.)
456
457This is useful because it makes it easy to choose a good commit to
458test when you want to avoid to test some of them for some reason (they
459may not compile for example).
460
461This option can be used along with `--bisect-vars`, in this case,
462after all the sorted commit objects, there will be the same text as if
463`--bisect-vars` had been used alone.
464endif::git-rev-list[]
465
Junio C Hamanob0e02952008-01-19 08:02:00466
467Commit Ordering
468~~~~~~~~~~~~~~~
469
470By default, the commits are shown in reverse chronological order.
471
472--topo-order::
473
474This option makes them appear in topological order (i.e.
475descendant commits are shown before their parents).
476
477--date-order::
478
479This option is similar to '--topo-order' in the sense that no
480parent comes before all of its children, but otherwise things
481are still ordered in the commit timestamp order.
482
483--reverse::
484
485Output the commits in reverse order.
486Cannot be combined with '\--walk-reflogs'.
487
488Object Traversal
489~~~~~~~~~~~~~~~~
490
491These options are mostly targeted for packing of git repositories.
492
493--objects::
494
495Print the object IDs of any object referenced by the listed
496commits. '--objects foo ^bar' thus means "send me
497all object IDs which I need to download if I have the commit
498object 'bar', but not 'foo'".
499
500--objects-edge::
501
502Similar to '--objects', but also print the IDs of excluded
503commits prefixed with a "-" character. This is used by
504linkgit:git-pack-objects[1] to build "thin" pack, which records
505objects in deltified form based on objects contained in these
506excluded commits to reduce network traffic.
507
508--unpacked::
509
510Only useful with '--objects'; print the object IDs that are not
511in packs.
512
513--no-walk::
514
515Only show the given revs, but do not traverse their ancestors.
516
517--do-walk::
518
519Overrides a previous --no-walk.