Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 1 | Commit Limiting |
| 2 | ~~~~~~~~~~~~~~~ |
| 3 | |
| 4 | Besides specifying a range of commits that should be listed using the |
| 5 | special notations explained in the description, additional commit |
Junio C Hamano | a23e313 | 2012-09-13 18:54:30 -0700 | [diff] [blame] | 6 | limiting may be applied. |
| 7 | |
| 8 | Using more options generally further limits the output (e.g. |
| 9 | `--since=<date1>` limits to commits newer than `<date1>`, and using it |
| 10 | with `--grep=<pattern>` further limits to commits whose log message |
| 11 | has a line that matches `<pattern>`), unless otherwise noted. |
| 12 | |
| 13 | Note that these are applied before commit |
| 14 | ordering and formatting options, such as `--reverse`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 15 | |
| 16 | -- |
| 17 | |
Nguyễn Thái Ngọc Duy | 70c2a25 | 2012-09-06 21:28:03 +0700 | [diff] [blame] | 18 | -<number>:: |
| 19 | -n <number>:: |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 20 | --max-count=<number>:: |
Michael J Gruber | 841d811 | 2011-03-08 09:31:24 +0100 | [diff] [blame] | 21 | Limit the number of commits to output. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 22 | |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 23 | --skip=<number>:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 24 | Skip 'number' commits before starting to show the commit output. |
| 25 | |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 26 | --since=<date>:: |
| 27 | --after=<date>:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 28 | Show commits more recent than a specific date. |
| 29 | |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 30 | --until=<date>:: |
| 31 | --before=<date>:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 32 | Show commits older than a specific date. |
| 33 | |
Jakub Narebski | 56b6d01 | 2008-03-02 15:11:35 +0100 | [diff] [blame] | 34 | ifdef::git-rev-list[] |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 35 | --max-age=<timestamp>:: |
| 36 | --min-age=<timestamp>:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 37 | Limit the commits output to specified time range. |
Jakub Narebski | 56b6d01 | 2008-03-02 15:11:35 +0100 | [diff] [blame] | 38 | endif::git-rev-list[] |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 39 | |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 40 | --author=<pattern>:: |
| 41 | --committer=<pattern>:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 42 | Limit the commits output to ones with author/committer |
Junio C Hamano | a23e313 | 2012-09-13 18:54:30 -0700 | [diff] [blame] | 43 | header lines that match the specified pattern (regular |
| 44 | expression). With more than one `--author=<pattern>`, |
| 45 | commits whose author matches any of the given patterns are |
| 46 | chosen (similarly for multiple `--committer=<pattern>`). |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 47 | |
Nguyễn Thái Ngọc Duy | 72fd13f | 2012-09-29 11:41:28 +0700 | [diff] [blame] | 48 | --grep-reflog=<pattern>:: |
Nguyễn Thái Ngọc Duy | 72fd13f | 2012-09-29 11:41:28 +0700 | [diff] [blame] | 49 | Limit the commits output to ones with reflog entries that |
| 50 | match the specified pattern (regular expression). With |
| 51 | more than one `--grep-reflog`, commits whose reflog message |
Junio C Hamano | baa6378 | 2012-09-29 11:59:52 -0700 | [diff] [blame] | 52 | matches any of the given patterns are chosen. It is an |
| 53 | error to use this option unless `--walk-reflogs` is in use. |
Nguyễn Thái Ngọc Duy | 72fd13f | 2012-09-29 11:41:28 +0700 | [diff] [blame] | 54 | |
Matthieu Moy | 982962c | 2009-04-07 19:24:33 +0200 | [diff] [blame] | 55 | --grep=<pattern>:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 56 | Limit the commits output to ones with log message that |
Junio C Hamano | a23e313 | 2012-09-13 18:54:30 -0700 | [diff] [blame] | 57 | matches the specified pattern (regular expression). With |
| 58 | more than one `--grep=<pattern>`, commits whose message |
| 59 | matches any of the given patterns are chosen (but see |
| 60 | `--all-match`). |
Jeff King | 2aea7a5 | 2015-08-23 13:56:40 -0400 | [diff] [blame] | 61 | ifndef::git-rev-list[] |
Nguyễn Thái Ngọc Duy | 38cfe91 | 2012-09-29 11:41:29 +0700 | [diff] [blame] | 62 | + |
Michael J Gruber | 7348cde | 2015-04-17 16:28:56 +0200 | [diff] [blame] | 63 | When `--show-notes` is in effect, the message from the notes is |
| 64 | matched as if it were part of the log message. |
Jeff King | 2aea7a5 | 2015-08-23 13:56:40 -0400 | [diff] [blame] | 65 | endif::git-rev-list[] |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 66 | |
Mikael Magnusson | 7756ba7 | 2008-11-02 19:32:46 +0100 | [diff] [blame] | 67 | --all-match:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 68 | Limit the commits output to ones that match all given `--grep`, |
Junio C Hamano | a23e313 | 2012-09-13 18:54:30 -0700 | [diff] [blame] | 69 | instead of ones that match at least one. |
Mikael Magnusson | 7756ba7 | 2008-11-02 19:32:46 +0100 | [diff] [blame] | 70 | |
Christoph Junghans | 22dfa8a | 2015-01-12 18:33:32 -0700 | [diff] [blame] | 71 | --invert-grep:: |
| 72 | Limit the commits output to ones with log message that do not |
| 73 | match the pattern specified with `--grep=<pattern>`. |
| 74 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 75 | -i:: |
| 76 | --regexp-ignore-case:: |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 77 | Match the regular expression limiting patterns without regard to letter |
| 78 | case. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 79 | |
Junio C Hamano | 727b6fc | 2012-10-03 15:01:34 -0700 | [diff] [blame] | 80 | --basic-regexp:: |
Junio C Hamano | 727b6fc | 2012-10-03 15:01:34 -0700 | [diff] [blame] | 81 | Consider the limiting patterns to be basic regular expressions; |
| 82 | this is the default. |
| 83 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 84 | -E:: |
| 85 | --extended-regexp:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 86 | Consider the limiting patterns to be extended regular expressions |
| 87 | instead of the default basic regular expressions. |
| 88 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 89 | -F:: |
| 90 | --fixed-strings:: |
Jakub Narebski | dc1c0ff | 2008-02-26 13:22:05 +0100 | [diff] [blame] | 91 | Consider the limiting patterns to be fixed strings (don't interpret |
| 92 | pattern as a regular expression). |
| 93 | |
Junio C Hamano | 727b6fc | 2012-10-03 15:01:34 -0700 | [diff] [blame] | 94 | --perl-regexp:: |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 95 | Consider the limiting patterns to be Perl-compatible regular expressions. |
Junio C Hamano | 727b6fc | 2012-10-03 15:01:34 -0700 | [diff] [blame] | 96 | Requires libpcre to be compiled in. |
| 97 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 98 | --remove-empty:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 99 | Stop when a given path disappears from the tree. |
| 100 | |
SZEDER Gábor | 2657420 | 2009-07-13 17:11:44 +0200 | [diff] [blame] | 101 | --merges:: |
Michael J Gruber | 6a6ebde | 2011-03-23 10:38:51 +0100 | [diff] [blame] | 102 | Print only merge commits. This is exactly the same as `--min-parents=2`. |
SZEDER Gábor | 2657420 | 2009-07-13 17:11:44 +0200 | [diff] [blame] | 103 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 104 | --no-merges:: |
Michael J Gruber | 6a6ebde | 2011-03-23 10:38:51 +0100 | [diff] [blame] | 105 | Do not print commits with more than one parent. This is |
| 106 | exactly the same as `--max-parents=1`. |
| 107 | |
| 108 | --min-parents=<number>:: |
| 109 | --max-parents=<number>:: |
| 110 | --no-min-parents:: |
| 111 | --no-max-parents:: |
Torstein Hegge | 5104d21 | 2013-08-02 20:40:07 +0200 | [diff] [blame] | 112 | Show only commits which have at least (or at most) that many parent |
Michael J Gruber | 6a6ebde | 2011-03-23 10:38:51 +0100 | [diff] [blame] | 113 | commits. In particular, `--max-parents=1` is the same as `--no-merges`, |
| 114 | `--min-parents=2` is the same as `--merges`. `--max-parents=0` |
| 115 | gives all root commits and `--min-parents=3` all octopus merges. |
| 116 | + |
| 117 | `--no-min-parents` and `--no-max-parents` reset these limits (to no limit) |
| 118 | again. Equivalent forms are `--min-parents=0` (any commit has 0 or more |
| 119 | parents) and `--max-parents=-1` (negative numbers denote no upper limit). |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 120 | |
| 121 | --first-parent:: |
| 122 | Follow only the first parent commit upon seeing a merge |
| 123 | commit. This option can give a better overview when |
| 124 | viewing the evolution of a particular topic branch, |
| 125 | because merges into a topic branch tend to be only about |
| 126 | adjusting to updated upstream from time to time, and |
| 127 | this option allows you to ignore the individual commits |
Kevin Daudt | f88851c | 2015-03-19 23:14:08 +0100 | [diff] [blame] | 128 | brought in to your history by such a merge. Cannot be |
| 129 | combined with --bisect. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 130 | |
| 131 | --not:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 132 | Reverses the meaning of the '{caret}' prefix (or lack thereof) |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 133 | for all following revision specifiers, up to the next `--not`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 134 | |
| 135 | --all:: |
Jeff King | cc1b8d8 | 2010-02-17 20:16:20 -0500 | [diff] [blame] | 136 | Pretend as if all the refs in `refs/` are listed on the |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 137 | command line as '<commit>'. |
| 138 | |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 139 | --branches[=<pattern>]:: |
Jeff King | cc1b8d8 | 2010-02-17 20:16:20 -0500 | [diff] [blame] | 140 | Pretend as if all the refs in `refs/heads` are listed |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 141 | on the command line as '<commit>'. If '<pattern>' is given, limit |
Ilari Liusvaara | b09fe97 | 2010-01-20 11:48:26 +0200 | [diff] [blame] | 142 | branches to ones matching given shell glob. If pattern lacks '?', |
Carlos Martín Nieto | e34bb2e | 2012-02-28 16:35:48 +0100 | [diff] [blame] | 143 | '{asterisk}', or '[', '/{asterisk}' at the end is implied. |
Mark Burton | c2e6385 | 2008-11-17 21:03:59 +0000 | [diff] [blame] | 144 | |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 145 | --tags[=<pattern>]:: |
Jeff King | cc1b8d8 | 2010-02-17 20:16:20 -0500 | [diff] [blame] | 146 | Pretend as if all the refs in `refs/tags` are listed |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 147 | on the command line as '<commit>'. If '<pattern>' is given, limit |
Carlos Martín Nieto | e34bb2e | 2012-02-28 16:35:48 +0100 | [diff] [blame] | 148 | tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}', |
| 149 | or '[', '/{asterisk}' at the end is implied. |
Mark Burton | c2e6385 | 2008-11-17 21:03:59 +0000 | [diff] [blame] | 150 | |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 151 | --remotes[=<pattern>]:: |
Jeff King | cc1b8d8 | 2010-02-17 20:16:20 -0500 | [diff] [blame] | 152 | Pretend as if all the refs in `refs/remotes` are listed |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 153 | on the command line as '<commit>'. If '<pattern>' is given, limit |
Matthieu Moy | 0e615b2 | 2010-11-02 16:31:20 +0100 | [diff] [blame] | 154 | remote-tracking branches to ones matching given shell glob. |
Carlos Martín Nieto | e34bb2e | 2012-02-28 16:35:48 +0100 | [diff] [blame] | 155 | If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied. |
Mark Burton | c2e6385 | 2008-11-17 21:03:59 +0000 | [diff] [blame] | 156 | |
Štěpán Němec | 62b4698 | 2010-10-08 19:31:15 +0200 | [diff] [blame] | 157 | --glob=<glob-pattern>:: |
| 158 | Pretend as if all the refs matching shell glob '<glob-pattern>' |
Ilari Liusvaara | d08bae7 | 2010-01-20 11:48:25 +0200 | [diff] [blame] | 159 | are listed on the command line as '<commit>'. Leading 'refs/', |
Carlos Martín Nieto | e34bb2e | 2012-02-28 16:35:48 +0100 | [diff] [blame] | 160 | is automatically prepended if missing. If pattern lacks '?', '{asterisk}', |
| 161 | or '[', '/{asterisk}' at the end is implied. |
Ilari Liusvaara | d08bae7 | 2010-01-20 11:48:25 +0200 | [diff] [blame] | 162 | |
Johannes Sixt | 574d370 | 2013-09-02 22:11:26 +0200 | [diff] [blame] | 163 | --exclude=<glob-pattern>:: |
| 164 | |
| 165 | Do not include refs matching '<glob-pattern>' that the next `--all`, |
| 166 | `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise |
| 167 | consider. Repetitions of this option accumulate exclusion patterns |
| 168 | up to the next `--all`, `--branches`, `--tags`, `--remotes`, or |
| 169 | `--glob` option (other options or arguments do not clear |
Thomas Ackermann | f745acb | 2014-11-03 21:37:07 +0100 | [diff] [blame] | 170 | accumulated patterns). |
Johannes Sixt | 574d370 | 2013-09-02 22:11:26 +0200 | [diff] [blame] | 171 | + |
| 172 | The patterns given should not begin with `refs/heads`, `refs/tags`, or |
| 173 | `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, |
| 174 | respectively, and they must begin with `refs/` when applied to `--glob` |
| 175 | or `--all`. If a trailing '/{asterisk}' is intended, it must be given |
| 176 | explicitly. |
| 177 | |
Jeff King | 41d018d | 2014-10-15 18:43:28 -0400 | [diff] [blame] | 178 | --reflog:: |
| 179 | Pretend as if all objects mentioned by reflogs are listed on the |
| 180 | command line as `<commit>`. |
| 181 | |
Junio C Hamano | cc243c3 | 2011-05-18 18:08:09 -0700 | [diff] [blame] | 182 | --ignore-missing:: |
Junio C Hamano | cc243c3 | 2011-05-18 18:08:09 -0700 | [diff] [blame] | 183 | Upon seeing an invalid object name in the input, pretend as if |
| 184 | the bad input was not given. |
Ilari Liusvaara | d08bae7 | 2010-01-20 11:48:25 +0200 | [diff] [blame] | 185 | |
Christian Couder | af06e93 | 2009-11-24 07:54:44 +0100 | [diff] [blame] | 186 | ifndef::git-rev-list[] |
| 187 | --bisect:: |
Jeff King | cc1b8d8 | 2010-02-17 20:16:20 -0500 | [diff] [blame] | 188 | Pretend as if the bad bisection ref `refs/bisect/bad` |
Christian Couder | af06e93 | 2009-11-24 07:54:44 +0100 | [diff] [blame] | 189 | was listed and as if it was followed by `--not` and the good |
Jeff King | cc1b8d8 | 2010-02-17 20:16:20 -0500 | [diff] [blame] | 190 | bisection refs `refs/bisect/good-*` on the command |
Kevin Daudt | f88851c | 2015-03-19 23:14:08 +0100 | [diff] [blame] | 191 | line. Cannot be combined with --first-parent. |
Christian Couder | af06e93 | 2009-11-24 07:54:44 +0100 | [diff] [blame] | 192 | endif::git-rev-list[] |
| 193 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 194 | --stdin:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 195 | In addition to the '<commit>' listed on the command |
Junio C Hamano | 60da8b1 | 2009-11-20 02:50:21 -0800 | [diff] [blame] | 196 | line, read them from the standard input. If a '--' separator is |
| 197 | seen, stop reading commits and start reading paths to limit the |
| 198 | result. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 199 | |
Junio C Hamano | 8b3dce5 | 2009-11-03 06:59:18 -0800 | [diff] [blame] | 200 | ifdef::git-rev-list[] |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 201 | --quiet:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 202 | Don't print anything to standard output. This form |
| 203 | is primarily meant to allow the caller to |
| 204 | test the exit status to see if a range of objects is fully |
| 205 | connected (or not). It is faster than redirecting stdout |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 206 | to `/dev/null` as the output does not have to be formatted. |
Junio C Hamano | adf60f1 | 2008-06-03 23:56:56 -0700 | [diff] [blame] | 207 | endif::git-rev-list[] |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 208 | |
Michael J Gruber | cb56e30 | 2011-03-07 13:31:41 +0100 | [diff] [blame] | 209 | --cherry-mark:: |
Michael J Gruber | cb56e30 | 2011-03-07 13:31:41 +0100 | [diff] [blame] | 210 | Like `--cherry-pick` (see below) but mark equivalent commits |
| 211 | with `=` rather than omitting them, and inequivalent ones with `+`. |
| 212 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 213 | --cherry-pick:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 214 | Omit any commit that introduces the same change as |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 215 | another commit on the ``other side'' when the set of |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 216 | commits are limited with symmetric difference. |
| 217 | + |
| 218 | For example, if you have two branches, `A` and `B`, a usual way |
| 219 | to list all commits on only one side of them is with |
Junio C Hamano | 3add01b | 2011-04-01 11:04:46 -0700 | [diff] [blame] | 220 | `--left-right` (see the example below in the description of |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 221 | the `--left-right` option). However, it shows the commits that were |
| 222 | cherry-picked from the other branch (for example, ``3rd on b'' may be |
| 223 | cherry-picked from branch A). With this option, such pairs of commits are |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 224 | excluded from the output. |
| 225 | |
Michael J Gruber | 59c8afd | 2011-02-21 17:09:12 +0100 | [diff] [blame] | 226 | --left-only:: |
| 227 | --right-only:: |
Michael J Gruber | 59c8afd | 2011-02-21 17:09:12 +0100 | [diff] [blame] | 228 | List only commits on the respective side of a symmetric range, |
| 229 | i.e. only those which would be marked `<` resp. `>` by |
| 230 | `--left-right`. |
| 231 | + |
| 232 | For example, `--cherry-pick --right-only A...B` omits those |
| 233 | commits from `B` which are in `A` or are patch-equivalent to a commit in |
Jeff King | 6cf378f | 2012-04-26 04:51:57 -0400 | [diff] [blame] | 234 | `A`. In other words, this lists the `+` commits from `git cherry A B`. |
Michael J Gruber | 59c8afd | 2011-02-21 17:09:12 +0100 | [diff] [blame] | 235 | More precisely, `--cherry-pick --right-only --no-merges` gives the exact |
| 236 | list. |
| 237 | |
Michael J Gruber | 94f605e | 2011-03-07 13:31:42 +0100 | [diff] [blame] | 238 | --cherry:: |
Michael J Gruber | 94f605e | 2011-03-07 13:31:42 +0100 | [diff] [blame] | 239 | A synonym for `--right-only --cherry-mark --no-merges`; useful to |
| 240 | limit the output to the commits on our side and mark those that |
| 241 | have been applied to the other side of a forked history with |
| 242 | `git log --cherry upstream...mybranch`, similar to |
| 243 | `git cherry upstream mybranch`. |
| 244 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 245 | -g:: |
| 246 | --walk-reflogs:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 247 | Instead of walking the commit ancestry chain, walk |
| 248 | reflog entries from the most recent one to older ones. |
| 249 | When this option is used you cannot specify commits to |
| 250 | exclude (that is, '{caret}commit', 'commit1..commit2', |
Justin Lebar | a58088a | 2014-03-31 15:11:44 -0700 | [diff] [blame] | 251 | and 'commit1\...commit2' notations cannot be used). |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 252 | + |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 253 | With `--pretty` format other than `oneline` (for obvious reasons), |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 254 | this causes the output to have two extra lines of information |
| 255 | taken from the reflog. By default, 'commit@\{Nth}' notation is |
| 256 | used in the output. When the starting commit is specified as |
Thomas Rast | 18a2197 | 2008-08-10 15:04:34 +0200 | [diff] [blame] | 257 | 'commit@\{now}', output also uses 'commit@\{timestamp}' notation |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 258 | instead. Under `--pretty=oneline`, the commit message is |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 259 | prefixed with this information on the same line. |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 260 | This option cannot be combined with `--reverse`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 261 | See also linkgit:git-reflog[1]. |
| 262 | |
| 263 | --merge:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 264 | After a failed merge, show refs that touch files having a |
| 265 | conflict and don't exist on all heads to merge. |
| 266 | |
| 267 | --boundary:: |
Kevin Bracey | e32db66 | 2013-05-16 18:32:33 +0300 | [diff] [blame] | 268 | Output excluded boundary commits. Boundary commits are |
| 269 | prefixed with `-`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 270 | |
Vicent Marti | aa32939 | 2013-12-21 09:00:12 -0500 | [diff] [blame] | 271 | ifdef::git-rev-list[] |
| 272 | --use-bitmap-index:: |
| 273 | |
| 274 | Try to speed up the traversal using the pack bitmap index (if |
| 275 | one is available). Note that when traversing with `--objects`, |
| 276 | trees and blobs will not have their associated path printed. |
| 277 | endif::git-rev-list[] |
| 278 | |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 279 | -- |
| 280 | |
| 281 | History Simplification |
| 282 | ~~~~~~~~~~~~~~~~~~~~~~ |
| 283 | |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 284 | Sometimes you are only interested in parts of the history, for example the |
| 285 | commits modifying a particular <path>. But there are two parts of |
| 286 | 'History Simplification', one part is selecting the commits and the other |
| 287 | is how to do it, as there are various strategies to simplify the history. |
| 288 | |
| 289 | The following options select the commits to be shown: |
| 290 | |
| 291 | <paths>:: |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 292 | Commits modifying the given <paths> are selected. |
| 293 | |
| 294 | --simplify-by-decoration:: |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 295 | Commits that are referred by some branch or tag are selected. |
| 296 | |
| 297 | Note that extra commits can be shown to give a meaningful history. |
| 298 | |
| 299 | The following options affect the way the simplification is performed: |
| 300 | |
| 301 | Default mode:: |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 302 | Simplifies the history to the simplest history explaining the |
| 303 | final state of the tree. Simplest because it prunes some side |
| 304 | branches if the end result is the same (i.e. merging branches |
| 305 | with the same content) |
| 306 | |
| 307 | --full-history:: |
Jack Nagel | df6b0ca | 2011-07-21 20:33:15 -0500 | [diff] [blame] | 308 | Same as the default mode, but does not prune some history. |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 309 | |
| 310 | --dense:: |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 311 | Only the selected commits are shown, plus some to have a |
| 312 | meaningful history. |
| 313 | |
| 314 | --sparse:: |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 315 | All commits in the simplified history are shown. |
| 316 | |
| 317 | --simplify-merges:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 318 | Additional option to `--full-history` to remove some needless |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 319 | merges from the resulting history, as there are no selected |
| 320 | commits contributing to this merge. |
| 321 | |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 322 | --ancestry-path:: |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 323 | When given a range of commits to display (e.g. 'commit1..commit2' |
| 324 | or 'commit2 {caret}commit1'), only display commits that exist |
| 325 | directly on the ancestry chain between the 'commit1' and |
| 326 | 'commit2', i.e. commits that are both descendants of 'commit1', |
| 327 | and ancestors of 'commit2'. |
| 328 | |
Santi Béjar | 7bc2508 | 2008-11-12 11:51:28 +0100 | [diff] [blame] | 329 | A more detailed explanation follows. |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 330 | |
| 331 | Suppose you specified `foo` as the <paths>. We shall call commits |
| 332 | that modify `foo` !TREESAME, and the rest TREESAME. (In a diff |
| 333 | filtered for `foo`, they look different and equal, respectively.) |
| 334 | |
| 335 | In the following, we will always refer to the same example history to |
| 336 | illustrate the differences between simplification settings. We assume |
| 337 | that you are filtering for a file `foo` in this commit graph: |
| 338 | ----------------------------------------------------------------------- |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 339 | .-A---M---N---O---P---Q |
| 340 | / / / / / / |
| 341 | I B C D E Y |
| 342 | \ / / / / / |
| 343 | `-------------' X |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 344 | ----------------------------------------------------------------------- |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 345 | The horizontal line of history A---Q is taken to be the first parent of |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 346 | each merge. The commits are: |
| 347 | |
| 348 | * `I` is the initial commit, in which `foo` exists with contents |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 349 | ``asdf'', and a file `quux` exists with contents ``quux''. Initial |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 350 | commits are compared to an empty tree, so `I` is !TREESAME. |
| 351 | |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 352 | * In `A`, `foo` contains just ``foo''. |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 353 | |
| 354 | * `B` contains the same change as `A`. Its merge `M` is trivial and |
| 355 | hence TREESAME to all parents. |
| 356 | |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 357 | * `C` does not change `foo`, but its merge `N` changes it to ``foobar'', |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 358 | so it is not TREESAME to any parent. |
| 359 | |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 360 | * `D` sets `foo` to ``baz''. Its merge `O` combines the strings from |
| 361 | `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent. |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 362 | |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 363 | * `E` changes `quux` to ``xyzzy'', and its merge `P` combines the |
| 364 | strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`. |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 365 | |
Ondřej Bílka | 17b83d7 | 2013-07-22 23:02:23 +0200 | [diff] [blame] | 366 | * `X` is an independent root commit that added a new file `side`, and `Y` |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 367 | modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and |
| 368 | `Q` is TREESAME to `P`, but not to `Y`. |
| 369 | |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 370 | `rev-list` walks backwards through history, including or excluding |
| 371 | commits based on whether `--full-history` and/or parent rewriting |
| 372 | (via `--parents` or `--children`) are used. The following settings |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 373 | are available. |
| 374 | |
| 375 | Default mode:: |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 376 | Commits are included if they are not TREESAME to any parent |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 377 | (though this can be changed, see `--sparse` below). If the |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 378 | commit was a merge, and it was TREESAME to one parent, follow |
| 379 | only that parent. (Even if there are several TREESAME |
| 380 | parents, follow only one of them.) Otherwise, follow all |
| 381 | parents. |
| 382 | + |
| 383 | This results in: |
| 384 | + |
| 385 | ----------------------------------------------------------------------- |
| 386 | .-A---N---O |
Johan Herland | f70d058 | 2010-06-04 01:17:33 +0200 | [diff] [blame] | 387 | / / / |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 388 | I---------D |
| 389 | ----------------------------------------------------------------------- |
| 390 | + |
| 391 | Note how the rule to only follow the TREESAME parent, if one is |
| 392 | available, removed `B` from consideration entirely. `C` was |
| 393 | considered via `N`, but is TREESAME. Root commits are compared to an |
| 394 | empty tree, so `I` is !TREESAME. |
| 395 | + |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 396 | Parent/child relations are only visible with `--parents`, but that does |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 397 | not affect the commits selected in default mode, so we have shown the |
| 398 | parent lines. |
| 399 | |
| 400 | --full-history without parent rewriting:: |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 401 | This mode differs from the default in one point: always follow |
| 402 | all parents of a merge, even if it is TREESAME to one of them. |
| 403 | Even if more than one side of the merge has commits that are |
| 404 | included, this does not imply that the merge itself is! In |
| 405 | the example, we get |
| 406 | + |
| 407 | ----------------------------------------------------------------------- |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 408 | I A B N D O P Q |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 409 | ----------------------------------------------------------------------- |
| 410 | + |
Kevin Bracey | d0af663 | 2013-05-16 18:32:34 +0300 | [diff] [blame] | 411 | `M` was excluded because it is TREESAME to both parents. `E`, |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 412 | `C` and `B` were all walked, but only `B` was !TREESAME, so the others |
| 413 | do not appear. |
| 414 | + |
| 415 | Note that without parent rewriting, it is not really possible to talk |
| 416 | about the parent/child relationships between the commits, so we show |
| 417 | them disconnected. |
| 418 | |
| 419 | --full-history with parent rewriting:: |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 420 | Ordinary commits are only included if they are !TREESAME |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 421 | (though this can be changed, see `--sparse` below). |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 422 | + |
| 423 | Merges are always included. However, their parent list is rewritten: |
| 424 | Along each parent, prune away commits that are not included |
| 425 | themselves. This results in |
| 426 | + |
| 427 | ----------------------------------------------------------------------- |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 428 | .-A---M---N---O---P---Q |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 429 | / / / / / |
| 430 | I B / D / |
| 431 | \ / / / / |
| 432 | `-------------' |
| 433 | ----------------------------------------------------------------------- |
| 434 | + |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 435 | Compare to `--full-history` without rewriting above. Note that `E` |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 436 | was pruned away because it is TREESAME, but the parent list of P was |
| 437 | rewritten to contain `E`'s parent `I`. The same happened for `C` and |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 438 | `N`, and `X`, `Y` and `Q`. |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 439 | |
| 440 | In addition to the above settings, you can change whether TREESAME |
| 441 | affects inclusion: |
| 442 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 443 | --dense:: |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 444 | Commits that are walked are included if they are not TREESAME |
| 445 | to any parent. |
| 446 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 447 | --sparse:: |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 448 | All commits that are walked are included. |
| 449 | + |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 450 | Note that without `--full-history`, this still simplifies merges: if |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 451 | one of the parents is TREESAME, we follow only that one, so the other |
| 452 | sides of the merge are never walked. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 453 | |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 454 | --simplify-merges:: |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 455 | First, build a history graph in the same way that |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 456 | `--full-history` with parent rewriting does (see above). |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 457 | + |
| 458 | Then simplify each commit `C` to its replacement `C'` in the final |
| 459 | history according to the following rules: |
| 460 | + |
| 461 | -- |
| 462 | * Set `C'` to `C`. |
| 463 | + |
| 464 | * Replace each parent `P` of `C'` with its simplification `P'`. In |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 465 | the process, drop parents that are ancestors of other parents or that are |
| 466 | root commits TREESAME to an empty tree, and remove duplicates, but take care |
| 467 | to never drop all parents that we are TREESAME to. |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 468 | + |
| 469 | * If after this parent rewriting, `C'` is a root or merge commit (has |
| 470 | zero or >1 parents), a boundary commit, or !TREESAME, it remains. |
| 471 | Otherwise, it is replaced with its only parent. |
| 472 | -- |
| 473 | + |
| 474 | The effect of this is best shown by way of comparing to |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 475 | `--full-history` with parent rewriting. The example turns into: |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 476 | + |
| 477 | ----------------------------------------------------------------------- |
| 478 | .-A---M---N---O |
| 479 | / / / |
| 480 | I B D |
| 481 | \ / / |
| 482 | `---------' |
| 483 | ----------------------------------------------------------------------- |
| 484 | + |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 485 | Note the major differences in `N`, `P`, and `Q` over `--full-history`: |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 486 | + |
| 487 | -- |
| 488 | * `N`'s parent list had `I` removed, because it is an ancestor of the |
| 489 | other parent `M`. Still, `N` remained because it is !TREESAME. |
| 490 | + |
| 491 | * `P`'s parent list similarly had `I` removed. `P` was then |
| 492 | removed completely, because it had one parent and is TREESAME. |
Kevin Bracey | 143f1ea | 2013-05-16 18:32:37 +0300 | [diff] [blame] | 493 | + |
| 494 | * `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it |
| 495 | was a TREESAME root. `Q` was then removed completely, because it had one |
| 496 | parent and is TREESAME. |
Thomas Rast | d266a98 | 2008-08-12 01:55:37 +0200 | [diff] [blame] | 497 | -- |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 498 | |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 499 | Finally, there is a fifth simplification mode available: |
| 500 | |
| 501 | --ancestry-path:: |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 502 | Limit the displayed commits to those directly on the ancestry |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 503 | chain between the ``from'' and ``to'' commits in the given commit |
| 504 | range. I.e. only display commits that are ancestor of the ``to'' |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 505 | commit and descendants of the ``from'' commit. |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 506 | + |
| 507 | As an example use case, consider the following commit history: |
| 508 | + |
| 509 | ----------------------------------------------------------------------- |
| 510 | D---E-------F |
| 511 | / \ \ |
| 512 | B---C---G---H---I---J |
| 513 | / \ |
| 514 | A-------K---------------L--M |
| 515 | ----------------------------------------------------------------------- |
| 516 | + |
| 517 | A regular 'D..M' computes the set of commits that are ancestors of `M`, |
| 518 | but excludes the ones that are ancestors of `D`. This is useful to see |
| 519 | what happened to the history leading to `M` since `D`, in the sense |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 520 | that ``what does `M` have that did not exist in `D`''. The result in this |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 521 | example would be all the commits, except `A` and `B` (and `D` itself, |
| 522 | of course). |
| 523 | + |
| 524 | When we want to find out what commits in `M` are contaminated with the |
| 525 | bug introduced by `D` and need fixing, however, we might want to view |
| 526 | only the subset of 'D..M' that are actually descendants of `D`, i.e. |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 527 | excluding `C` and `K`. This is exactly what the `--ancestry-path` |
Johan Herland | 57456ef | 2010-06-04 01:17:35 +0200 | [diff] [blame] | 528 | option does. Applied to the 'D..M' range, it results in: |
| 529 | + |
| 530 | ----------------------------------------------------------------------- |
| 531 | E-------F |
| 532 | \ \ |
| 533 | G---H---I---J |
| 534 | \ |
| 535 | L--M |
| 536 | ----------------------------------------------------------------------- |
| 537 | |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 538 | The `--simplify-by-decoration` option allows you to view only the |
Nanako Shiraishi | 3fcfd66 | 2008-11-10 18:58:17 +0900 | [diff] [blame] | 539 | big picture of the topology of the history, by omitting commits |
| 540 | that are not referenced by tags. Commits are marked as !TREESAME |
| 541 | (in other words, kept after history simplification rules described |
| 542 | above) if (1) they are referenced by tags, or (2) they change the |
| 543 | contents of the paths given on the command line. All other |
| 544 | commits are marked as TREESAME (subject to be simplified away). |
| 545 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 546 | ifdef::git-rev-list[] |
Thomas Rast | 70d9895 | 2008-08-12 01:55:36 +0200 | [diff] [blame] | 547 | Bisection Helpers |
| 548 | ~~~~~~~~~~~~~~~~~ |
| 549 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 550 | --bisect:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 551 | Limit output to the one commit object which is roughly halfway between |
| 552 | included and excluded commits. Note that the bad bisection ref |
| 553 | `refs/bisect/bad` is added to the included commits (if it |
| 554 | exists) and the good bisection refs `refs/bisect/good-*` are |
| 555 | added to the excluded commits (if they exist). Thus, supposing there |
| 556 | are no refs in `refs/bisect/`, if |
| 557 | + |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 558 | ----------------------------------------------------------------------- |
Christian Couder | 6514aa3 | 2008-11-09 14:46:35 +0100 | [diff] [blame] | 559 | $ git rev-list --bisect foo ^bar ^baz |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 560 | ----------------------------------------------------------------------- |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 561 | + |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 562 | outputs 'midpoint', the output of the two commands |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 563 | + |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 564 | ----------------------------------------------------------------------- |
Christian Couder | 6514aa3 | 2008-11-09 14:46:35 +0100 | [diff] [blame] | 565 | $ git rev-list foo ^midpoint |
| 566 | $ git rev-list midpoint ^bar ^baz |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 567 | ----------------------------------------------------------------------- |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 568 | + |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 569 | would be of roughly the same length. Finding the change which |
| 570 | introduces a regression is thus reduced to a binary search: repeatedly |
| 571 | generate and test new 'midpoint's until the commit chain is of length |
Kevin Daudt | f88851c | 2015-03-19 23:14:08 +0100 | [diff] [blame] | 572 | one. Cannot be combined with --first-parent. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 573 | |
| 574 | --bisect-vars:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 575 | This calculates the same as `--bisect`, except that refs in |
| 576 | `refs/bisect/` are not used, and except that this outputs |
| 577 | text ready to be eval'ed by the shell. These lines will assign the |
| 578 | name of the midpoint revision to the variable `bisect_rev`, and the |
| 579 | expected number of commits to be tested after `bisect_rev` is tested |
| 580 | to `bisect_nr`, the expected number of commits to be tested if |
| 581 | `bisect_rev` turns out to be good to `bisect_good`, the expected |
| 582 | number of commits to be tested if `bisect_rev` turns out to be bad to |
| 583 | `bisect_bad`, and the number of commits we are bisecting right now to |
| 584 | `bisect_all`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 585 | |
| 586 | --bisect-all:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 587 | This outputs all the commit objects between the included and excluded |
| 588 | commits, ordered by their distance to the included and excluded |
| 589 | commits. Refs in `refs/bisect/` are not used. The farthest |
| 590 | from them is displayed first. (This is the only one displayed by |
| 591 | `--bisect`.) |
Christian Couder | 3d2d4f9 | 2009-03-07 13:37:24 +0100 | [diff] [blame] | 592 | + |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 593 | This is useful because it makes it easy to choose a good commit to |
| 594 | test when you want to avoid to test some of them for some reason (they |
| 595 | may not compile for example). |
Christian Couder | 3d2d4f9 | 2009-03-07 13:37:24 +0100 | [diff] [blame] | 596 | + |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 597 | This option can be used along with `--bisect-vars`, in this case, |
| 598 | after all the sorted commit objects, there will be the same text as if |
| 599 | `--bisect-vars` had been used alone. |
| 600 | endif::git-rev-list[] |
| 601 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 602 | |
| 603 | Commit Ordering |
| 604 | ~~~~~~~~~~~~~~~ |
| 605 | |
| 606 | By default, the commits are shown in reverse chronological order. |
| 607 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 608 | --date-order:: |
Junio C Hamano | 3f0350c | 2012-08-15 13:02:48 -0700 | [diff] [blame] | 609 | Show no parents before all of its children are shown, but |
| 610 | otherwise show commits in the commit timestamp order. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 611 | |
Junio C Hamano | 81c6b38 | 2013-06-07 10:35:54 -0700 | [diff] [blame] | 612 | --author-date-order:: |
| 613 | Show no parents before all of its children are shown, but |
| 614 | otherwise show commits in the author timestamp order. |
| 615 | |
Junio C Hamano | 3f0350c | 2012-08-15 13:02:48 -0700 | [diff] [blame] | 616 | --topo-order:: |
| 617 | Show no parents before all of its children are shown, and |
| 618 | avoid showing commits on multiple lines of history |
| 619 | intermixed. |
| 620 | + |
| 621 | For example, in a commit history like this: |
| 622 | + |
| 623 | ---------------------------------------------------------------- |
| 624 | |
| 625 | ---1----2----4----7 |
| 626 | \ \ |
| 627 | 3----5----6----8--- |
| 628 | |
| 629 | ---------------------------------------------------------------- |
| 630 | + |
| 631 | where the numbers denote the order of commit timestamps, `git |
| 632 | rev-list` and friends with `--date-order` show the commits in the |
| 633 | timestamp order: 8 7 6 5 4 3 2 1. |
| 634 | + |
| 635 | With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 |
| 636 | 3 1); some older commits are shown before newer ones in order to |
| 637 | avoid showing the commits from two parallel development track mixed |
| 638 | together. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 639 | |
| 640 | --reverse:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 641 | Output the commits in reverse order. |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 642 | Cannot be combined with `--walk-reflogs`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 643 | |
| 644 | Object Traversal |
| 645 | ~~~~~~~~~~~~~~~~ |
| 646 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 647 | These options are mostly targeted for packing of Git repositories. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 648 | |
Junio C Hamano | 3cab02d | 2015-01-23 11:49:05 -0800 | [diff] [blame] | 649 | ifdef::git-rev-list[] |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 650 | --objects:: |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 651 | Print the object IDs of any object referenced by the listed |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 652 | commits. `--objects foo ^bar` thus means ``send me |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 653 | all object IDs which I need to download if I have the commit |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 654 | object _bar_ but not _foo_''. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 655 | |
| 656 | --objects-edge:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 657 | Similar to `--objects`, but also print the IDs of excluded |
| 658 | commits prefixed with a ``-'' character. This is used by |
brian m. carlson | 8297643 | 2014-12-20 22:51:11 +0000 | [diff] [blame] | 659 | linkgit:git-pack-objects[1] to build a ``thin'' pack, which records |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 660 | objects in deltified form based on objects contained in these |
| 661 | excluded commits to reduce network traffic. |
| 662 | |
brian m. carlson | 1684c1b | 2014-12-24 23:05:39 +0000 | [diff] [blame] | 663 | --objects-edge-aggressive:: |
| 664 | Similar to `--objects-edge`, but it tries harder to find excluded |
brian m. carlson | 2dacf26 | 2014-12-24 23:05:40 +0000 | [diff] [blame] | 665 | commits at the cost of increased time. This is used instead of |
| 666 | `--objects-edge` to build ``thin'' packs for shallow repositories. |
brian m. carlson | 1684c1b | 2014-12-24 23:05:39 +0000 | [diff] [blame] | 667 | |
Junio C Hamano | 3cab02d | 2015-01-23 11:49:05 -0800 | [diff] [blame] | 668 | --indexed-objects:: |
| 669 | Pretend as if all trees and blobs used by the index are listed |
| 670 | on the command line. Note that you probably want to use |
| 671 | `--objects`, too. |
| 672 | |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 673 | --unpacked:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 674 | Only useful with `--objects`; print the object IDs that are not |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 675 | in packs. |
Junio C Hamano | 3cab02d | 2015-01-23 11:49:05 -0800 | [diff] [blame] | 676 | endif::git-rev-list[] |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 677 | |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 678 | --no-walk[=(sorted|unsorted)]:: |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 679 | Only show the given commits, but do not traverse their ancestors. |
| 680 | This has no effect if a range is specified. If the argument |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 681 | `unsorted` is given, the commits are shown in the order they were |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 682 | given on the command line. Otherwise (if `sorted` or no argument |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 683 | was given), the commits are shown in reverse chronological order |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 684 | by commit time. |
Dongcan Jiang | 695985f | 2015-03-11 10:13:02 +0800 | [diff] [blame] | 685 | Cannot be combined with `--graph`. |
Miklos Vajna | fdcf39e | 2008-01-18 23:58:57 +0100 | [diff] [blame] | 686 | |
| 687 | --do-walk:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 688 | Overrides a previous `--no-walk`. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 689 | |
| 690 | Commit Formatting |
| 691 | ~~~~~~~~~~~~~~~~~ |
| 692 | |
| 693 | ifdef::git-rev-list[] |
| 694 | Using these options, linkgit:git-rev-list[1] will act similar to the |
| 695 | more specialized family of commit log tools: linkgit:git-log[1], |
| 696 | linkgit:git-show[1], and linkgit:git-whatchanged[1] |
| 697 | endif::git-rev-list[] |
| 698 | |
| 699 | include::pretty-options.txt[] |
| 700 | |
| 701 | --relative-date:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 702 | Synonym for `--date=relative`. |
| 703 | |
John Keeping | 4b1c5e1 | 2015-09-03 22:48:54 +0100 | [diff] [blame] | 704 | --date=<format>:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 705 | Only takes effect for dates shown in human-readable format, such |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 706 | as when using `--pretty`. `log.date` config variable sets a default |
Jeff King | add00ba | 2015-09-03 22:48:59 +0100 | [diff] [blame] | 707 | value for the log command's `--date` option. By default, dates |
| 708 | are shown in the original time zone (either committer's or |
| 709 | author's). If `-local` is appended to the format (e.g., |
| 710 | `iso-local`), the user's local time zone is used instead. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 711 | + |
| 712 | `--date=relative` shows dates relative to the current time, |
Jeff King | add00ba | 2015-09-03 22:48:59 +0100 | [diff] [blame] | 713 | e.g. ``2 hours ago''. The `-local` option cannot be used with |
| 714 | `--raw` or `--relative`. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 715 | + |
Jeff King | add00ba | 2015-09-03 22:48:59 +0100 | [diff] [blame] | 716 | `--date=local` is an alias for `--date=default-local`. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 717 | + |
Beat Bolli | 466fb67 | 2014-08-29 18:58:42 +0200 | [diff] [blame] | 718 | `--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. |
| 719 | The differences to the strict ISO 8601 format are: |
| 720 | |
| 721 | - a space instead of the `T` date/time delimiter |
| 722 | - a space between time and time zone |
| 723 | - no colon between hours and minutes of the time zone |
| 724 | |
| 725 | + |
| 726 | `--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict |
| 727 | ISO 8601 format. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 728 | + |
| 729 | `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 730 | format, often found in email messages. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 731 | + |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 732 | `--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 733 | + |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 734 | `--date=raw` shows the date in the internal raw Git format `%s %z` format. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 735 | + |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 736 | `--date=format:...` feeds the format `...` to your system `strftime`. |
| 737 | Use `--date=format:%c` to show the date in your system locale's |
| 738 | preferred format. See the `strftime` manual for a complete list of |
Jeff King | add00ba | 2015-09-03 22:48:59 +0100 | [diff] [blame] | 739 | format placeholders. When using `-local`, the correct syntax is |
| 740 | `--date=format-local:...`. |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 741 | + |
Jeff King | add00ba | 2015-09-03 22:48:59 +0100 | [diff] [blame] | 742 | `--date=default` is the default format, and is similar to |
| 743 | `--date=rfc2822`, with a few exceptions: |
| 744 | |
| 745 | - there is no comma after the day-of-week |
| 746 | |
| 747 | - the time zone is omitted when the local time zone is used |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 748 | |
| 749 | ifdef::git-rev-list[] |
| 750 | --header:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 751 | Print the contents of the commit in raw-format; each record is |
| 752 | separated with a NUL character. |
| 753 | endif::git-rev-list[] |
| 754 | |
| 755 | --parents:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 756 | Print also the parents of the commit (in the form "commit parent..."). |
| 757 | Also enables parent rewriting, see 'History Simplification' below. |
| 758 | |
| 759 | --children:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 760 | Print also the children of the commit (in the form "commit child..."). |
| 761 | Also enables parent rewriting, see 'History Simplification' below. |
| 762 | |
| 763 | ifdef::git-rev-list[] |
| 764 | --timestamp:: |
| 765 | Print the raw commit timestamp. |
| 766 | endif::git-rev-list[] |
| 767 | |
| 768 | --left-right:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 769 | Mark which side of a symmetric diff a commit is reachable from. |
| 770 | Commits from the left side are prefixed with `<` and those from |
| 771 | the right with `>`. If combined with `--boundary`, those |
| 772 | commits are prefixed with `-`. |
| 773 | + |
| 774 | For example, if you have this topology: |
| 775 | + |
| 776 | ----------------------------------------------------------------------- |
| 777 | y---b---b branch B |
| 778 | / \ / |
| 779 | / . |
| 780 | / / \ |
| 781 | o---x---a---a branch A |
| 782 | ----------------------------------------------------------------------- |
| 783 | + |
| 784 | you would get an output like this: |
| 785 | + |
| 786 | ----------------------------------------------------------------------- |
| 787 | $ git rev-list --left-right --boundary --pretty=oneline A...B |
| 788 | |
| 789 | >bbbbbbb... 3rd on b |
| 790 | >bbbbbbb... 2nd on b |
| 791 | <aaaaaaa... 3rd on a |
| 792 | <aaaaaaa... 2nd on a |
| 793 | -yyyyyyy... 1st on b |
| 794 | -xxxxxxx... 1st on a |
| 795 | ----------------------------------------------------------------------- |
| 796 | |
| 797 | --graph:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 798 | Draw a text-based graphical representation of the commit history |
| 799 | on the left hand side of the output. This may cause extra lines |
| 800 | to be printed in between commits, in order for the graph history |
| 801 | to be drawn properly. |
Dongcan Jiang | 695985f | 2015-03-11 10:13:02 +0800 | [diff] [blame] | 802 | Cannot be combined with `--no-walk`. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 803 | + |
| 804 | This enables parent rewriting, see 'History Simplification' below. |
| 805 | + |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 806 | This implies the `--topo-order` option by default, but the |
| 807 | `--date-order` option may also be specified. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 808 | |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 809 | --show-linear-break[=<barrier>]:: |
| 810 | When --graph is not used, all history branches are flattened |
| 811 | which can make it hard to see that the two consecutive commits |
| 812 | do not belong to a linear branch. This option puts a barrier |
| 813 | in between them in that case. If `<barrier>` is specified, it |
| 814 | is the string that will be shown instead of the default one. |
| 815 | |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 816 | ifdef::git-rev-list[] |
| 817 | --count:: |
| 818 | Print a number stating how many commits would have been |
| 819 | listed, and suppress all other output. When used together |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 820 | with `--left-right`, instead print the counts for left and |
Michael J Gruber | b388e14 | 2011-04-26 10:24:29 +0200 | [diff] [blame] | 821 | right commits, separated by a tab. When used together with |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 822 | `--cherry-mark`, omit patch equivalent commits from these |
Michael J Gruber | b388e14 | 2011-04-26 10:24:29 +0200 | [diff] [blame] | 823 | counts and print the count for equivalent commits separated |
| 824 | by a tab. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 825 | endif::git-rev-list[] |
| 826 | |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 827 | ifndef::git-rev-list[] |
| 828 | Diff Formatting |
| 829 | ~~~~~~~~~~~~~~~ |
| 830 | |
Jason St. John | 19d6eb4 | 2013-11-14 20:34:02 -0500 | [diff] [blame] | 831 | Listed below are options that control the formatting of diff output. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 832 | Some of them are specific to linkgit:git-rev-list[1], however other diff |
| 833 | options may be given. See linkgit:git-diff-files[1] for more options. |
| 834 | |
| 835 | -c:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 836 | With this option, diff output for a merge commit |
| 837 | shows the differences from each of the parents to the merge result |
| 838 | simultaneously instead of showing pairwise diff between a parent |
| 839 | and the result one at a time. Furthermore, it lists only files |
| 840 | which were modified from all parents. |
| 841 | |
| 842 | --cc:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 843 | This flag implies the `-c` option and further compresses the |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 844 | patch output by omitting uninteresting hunks whose contents in |
| 845 | the parents have only two variants and the merge result picks |
| 846 | one of them without modification. |
| 847 | |
| 848 | -m:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 849 | This flag makes the merge commits show the full diff like |
| 850 | regular commits; for each merge parent, a separate log entry |
| 851 | and diff is generated. An exception is that only diff against |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 852 | the first parent is shown when `--first-parent` option is given; |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 853 | in that case, the output represents the changes the merge |
| 854 | brought _into_ the then-current branch. |
| 855 | |
| 856 | -r:: |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 857 | Show recursive diffs. |
| 858 | |
| 859 | -t:: |
Jason St. John | 4528aa1 | 2013-11-14 20:34:01 -0500 | [diff] [blame] | 860 | Show the tree objects in the diff output. This implies `-r`. |
Michael J Gruber | f98fd43 | 2011-03-08 09:31:26 +0100 | [diff] [blame] | 861 | endif::git-rev-list[] |