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