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 | |
Junio C Hamano | 693e709 | 2012-09-12 22:56:53 | [diff] [blame] | 16 | -<number>:: |
| 17 | -n <number>:: |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 18 | --max-count=<number>:: |
Junio C Hamano | c5be4cc | 2011-03-09 07:20:43 | [diff] [blame] | 19 | Limit the number of commits to output. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 20 | |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 21 | --skip=<number>:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 22 | Skip 'number' commits before starting to show the commit output. |
| 23 | |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 24 | --since=<date>:: |
| 25 | --after=<date>:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 26 | Show commits more recent than a specific date. |
| 27 | |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 28 | --until=<date>:: |
| 29 | --before=<date>:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 30 | Show commits older than a specific date. |
| 31 | |
Junio C Hamano | 4f1d8c4 | 2008-03-03 02:01:16 | [diff] [blame] | 32 | ifdef::git-rev-list[] |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 33 | --max-age=<timestamp>:: |
| 34 | --min-age=<timestamp>:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 35 | Limit the commits output to specified time range. |
Junio C Hamano | 4f1d8c4 | 2008-03-03 02:01:16 | [diff] [blame] | 36 | endif::git-rev-list[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 37 | |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 38 | --author=<pattern>:: |
| 39 | --committer=<pattern>:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 40 | Limit the commits output to ones with author/committer |
Junio C Hamano | 8ce35d7 | 2012-09-18 22:30:42 | [diff] [blame] | 41 | header lines that match the specified pattern (regular |
| 42 | expression). With more than one `--author=<pattern>`, |
| 43 | commits whose author matches any of the given patterns are |
| 44 | chosen (similarly for multiple `--committer=<pattern>`). |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 45 | |
Junio C Hamano | 9954ed7 | 2012-10-03 04:54:00 | [diff] [blame] | 46 | --grep-reflog=<pattern>:: |
Junio C Hamano | 9954ed7 | 2012-10-03 04:54:00 | [diff] [blame] | 47 | Limit the commits output to ones with reflog entries that |
| 48 | match the specified pattern (regular expression). With |
| 49 | more than one `--grep-reflog`, commits whose reflog message |
| 50 | matches any of the given patterns are chosen. It is an |
| 51 | error to use this option unless `--walk-reflogs` is in use. |
| 52 | |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 53 | --grep=<pattern>:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 54 | Limit the commits output to ones with log message that |
Junio C Hamano | 8ce35d7 | 2012-09-18 22:30:42 | [diff] [blame] | 55 | matches the specified pattern (regular expression). With |
| 56 | more than one `--grep=<pattern>`, commits whose message |
| 57 | matches any of the given patterns are chosen (but see |
| 58 | `--all-match`). |
Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 59 | ifndef::git-rev-list[] |
Junio C Hamano | 9954ed7 | 2012-10-03 04:54:00 | [diff] [blame] | 60 | + |
Junio C Hamano | b3f862c | 2019-12-05 22:22:00 | [diff] [blame] | 61 | When `--notes` is in effect, the message from the notes is |
Junio C Hamano | 8152abf | 2015-04-28 22:48:02 | [diff] [blame] | 62 | matched as if it were part of the log message. |
Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 63 | endif::git-rev-list[] |
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 | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 69 | --invert-grep:: |
| 70 | Limit the commits output to ones with log message that do not |
| 71 | match the pattern specified with `--grep=<pattern>`. |
| 72 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 73 | -i:: |
| 74 | --regexp-ignore-case:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 75 | Match the regular expression limiting patterns without regard to letter |
| 76 | case. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 77 | |
Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 78 | --basic-regexp:: |
Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 79 | Consider the limiting patterns to be basic regular expressions; |
| 80 | this is the default. |
| 81 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 82 | -E:: |
| 83 | --extended-regexp:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 84 | Consider the limiting patterns to be extended regular expressions |
| 85 | instead of the default basic regular expressions. |
| 86 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 87 | -F:: |
| 88 | --fixed-strings:: |
Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 89 | Consider the limiting patterns to be fixed strings (don't interpret |
| 90 | pattern as a regular expression). |
| 91 | |
Junio C Hamano | a275c1f | 2017-06-19 20:10:12 | [diff] [blame] | 92 | -P:: |
Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 93 | --perl-regexp:: |
Junio C Hamano | 222ed82 | 2017-06-02 06:24:06 | [diff] [blame] | 94 | Consider the limiting patterns to be Perl-compatible regular |
| 95 | expressions. |
| 96 | + |
| 97 | Support for these types of regular expressions is an optional |
| 98 | compile-time dependency. If Git wasn't compiled with support for them |
| 99 | providing this option will cause it to die. |
Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 100 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 101 | --remove-empty:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 102 | Stop when a given path disappears from the tree. |
| 103 | |
Junio C Hamano | 934e178 | 2009-07-16 06:59:15 | [diff] [blame] | 104 | --merges:: |
Junio C Hamano | f32ce26 | 2011-03-27 07:35:11 | [diff] [blame] | 105 | 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] | 106 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 107 | --no-merges:: |
Junio C Hamano | f32ce26 | 2011-03-27 07:35:11 | [diff] [blame] | 108 | Do not print commits with more than one parent. This is |
| 109 | exactly the same as `--max-parents=1`. |
| 110 | |
| 111 | --min-parents=<number>:: |
| 112 | --max-parents=<number>:: |
| 113 | --no-min-parents:: |
| 114 | --no-max-parents:: |
Junio C Hamano | c5bb3b3 | 2013-08-05 22:43:36 | [diff] [blame] | 115 | 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] | 116 | commits. In particular, `--max-parents=1` is the same as `--no-merges`, |
| 117 | `--min-parents=2` is the same as `--merges`. `--max-parents=0` |
| 118 | gives all root commits and `--min-parents=3` all octopus merges. |
| 119 | + |
| 120 | `--no-min-parents` and `--no-max-parents` reset these limits (to no limit) |
| 121 | again. Equivalent forms are `--min-parents=0` (any commit has 0 or more |
| 122 | parents) and `--max-parents=-1` (negative numbers denote no upper limit). |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 123 | |
| 124 | --first-parent:: |
| 125 | Follow only the first parent commit upon seeing a merge |
| 126 | commit. This option can give a better overview when |
| 127 | viewing the evolution of a particular topic branch, |
| 128 | because merges into a topic branch tend to be only about |
| 129 | adjusting to updated upstream from time to time, and |
| 130 | this option allows you to ignore the individual commits |
Junio C Hamano | 255163d | 2020-08-18 00:37:23 | [diff] [blame] | 131 | brought in to your history by such a merge. |
Junio C Hamano | 8c860d6 | 2021-02-06 01:37:47 | [diff] [blame] | 132 | ifdef::git-log[] |
Junio C Hamano | a372d5b | 2021-02-26 01:34:37 | [diff] [blame] | 133 | + |
| 134 | This option also changes default diff format for merge commits |
| 135 | to `first-parent`, see `--diff-merges=first-parent` for details. |
Junio C Hamano | 8c860d6 | 2021-02-06 01:37:47 | [diff] [blame] | 136 | endif::git-log[] |
| 137 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 138 | --not:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 139 | Reverses the meaning of the '{caret}' prefix (or lack thereof) |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 140 | for all following revision specifiers, up to the next `--not`. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 141 | |
| 142 | --all:: |
Junio C Hamano | e89102f | 2017-02-15 23:18:15 | [diff] [blame] | 143 | Pretend as if all the refs in `refs/`, along with `HEAD`, are |
| 144 | listed on the command line as '<commit>'. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 145 | |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 146 | --branches[=<pattern>]:: |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 147 | Pretend as if all the refs in `refs/heads` are listed |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 148 | on the command line as '<commit>'. If '<pattern>' is given, limit |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 149 | branches to ones matching given shell glob. If pattern lacks '?', |
Junio C Hamano | 81d540a | 2012-03-02 19:52:47 | [diff] [blame] | 150 | '{asterisk}', or '[', '/{asterisk}' at the end is implied. |
Junio C Hamano | 5081985 | 2008-11-19 02:07:56 | [diff] [blame] | 151 | |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 152 | --tags[=<pattern>]:: |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 153 | Pretend as if all the refs in `refs/tags` are listed |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 154 | on the command line as '<commit>'. If '<pattern>' is given, limit |
Junio C Hamano | 81d540a | 2012-03-02 19:52:47 | [diff] [blame] | 155 | tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}', |
| 156 | or '[', '/{asterisk}' at the end is implied. |
Junio C Hamano | 5081985 | 2008-11-19 02:07:56 | [diff] [blame] | 157 | |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 158 | --remotes[=<pattern>]:: |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 159 | Pretend as if all the refs in `refs/remotes` are listed |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 160 | on the command line as '<commit>'. If '<pattern>' is given, limit |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 161 | remote-tracking branches to ones matching given shell glob. |
Junio C Hamano | 81d540a | 2012-03-02 19:52:47 | [diff] [blame] | 162 | If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied. |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 163 | |
Junio C Hamano | d2179ef | 2010-10-22 04:12:17 | [diff] [blame] | 164 | --glob=<glob-pattern>:: |
| 165 | Pretend as if all the refs matching shell glob '<glob-pattern>' |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 166 | are listed on the command line as '<commit>'. Leading 'refs/', |
Junio C Hamano | 81d540a | 2012-03-02 19:52:47 | [diff] [blame] | 167 | is automatically prepended if missing. If pattern lacks '?', '{asterisk}', |
| 168 | or '[', '/{asterisk}' at the end is implied. |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 169 | |
Junio C Hamano | f079f70 | 2013-12-06 23:43:18 | [diff] [blame] | 170 | --exclude=<glob-pattern>:: |
| 171 | |
| 172 | Do not include refs matching '<glob-pattern>' that the next `--all`, |
| 173 | `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise |
| 174 | consider. Repetitions of this option accumulate exclusion patterns |
| 175 | up to the next `--all`, `--branches`, `--tags`, `--remotes`, or |
| 176 | `--glob` option (other options or arguments do not clear |
Junio C Hamano | fb5ffde | 2014-11-04 22:38:56 | [diff] [blame] | 177 | accumulated patterns). |
Junio C Hamano | f079f70 | 2013-12-06 23:43:18 | [diff] [blame] | 178 | + |
| 179 | The patterns given should not begin with `refs/heads`, `refs/tags`, or |
| 180 | `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, |
| 181 | respectively, and they must begin with `refs/` when applied to `--glob` |
| 182 | or `--all`. If a trailing '/{asterisk}' is intended, it must be given |
| 183 | explicitly. |
| 184 | |
Junio C Hamano | 2a4bcbc | 2014-10-29 20:07:39 | [diff] [blame] | 185 | --reflog:: |
| 186 | Pretend as if all objects mentioned by reflogs are listed on the |
| 187 | command line as `<commit>`. |
| 188 | |
Junio C Hamano | a42e033 | 2019-07-19 19:49:37 | [diff] [blame] | 189 | --alternate-refs:: |
| 190 | Pretend as if all objects mentioned as ref tips of alternate |
| 191 | repositories were listed on the command line. An alternate |
| 192 | repository is any repository whose object directory is specified |
| 193 | in `objects/info/alternates`. The set of included objects may |
| 194 | be modified by `core.alternateRefsCommand`, etc. See |
| 195 | linkgit:git-config[1]. |
| 196 | |
Junio C Hamano | 8d57fa9 | 2017-09-19 05:01:08 | [diff] [blame] | 197 | --single-worktree:: |
| 198 | By default, all working trees will be examined by the |
| 199 | following options when there are more than one (see |
| 200 | linkgit:git-worktree[1]): `--all`, `--reflog` and |
| 201 | `--indexed-objects`. |
| 202 | This option forces them to examine the current working tree |
| 203 | only. |
| 204 | |
Junio C Hamano | 084228c | 2011-05-30 08:13:52 | [diff] [blame] | 205 | --ignore-missing:: |
Junio C Hamano | 084228c | 2011-05-30 08:13:52 | [diff] [blame] | 206 | Upon seeing an invalid object name in the input, pretend as if |
| 207 | the bad input was not given. |
Junio C Hamano | 5081985 | 2008-11-19 02:07:56 | [diff] [blame] | 208 | |
Junio C Hamano | 5706e0b | 2009-11-24 10:54:16 | [diff] [blame] | 209 | ifndef::git-rev-list[] |
| 210 | --bisect:: |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 211 | Pretend as if the bad bisection ref `refs/bisect/bad` |
Junio C Hamano | 5706e0b | 2009-11-24 10:54:16 | [diff] [blame] | 212 | 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] | 213 | bisection refs `refs/bisect/good-*` on the command |
Junio C Hamano | 255163d | 2020-08-18 00:37:23 | [diff] [blame] | 214 | line. |
Junio C Hamano | 5706e0b | 2009-11-24 10:54:16 | [diff] [blame] | 215 | endif::git-rev-list[] |
| 216 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 217 | --stdin:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 218 | In addition to the '<commit>' listed on the command |
Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 219 | line, read them from the standard input. If a `--` separator is |
Junio C Hamano | 5706e0b | 2009-11-24 10:54:16 | [diff] [blame] | 220 | seen, stop reading commits and start reading paths to limit the |
| 221 | result. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 222 | |
Junio C Hamano | 5706e0b | 2009-11-24 10:54:16 | [diff] [blame] | 223 | ifdef::git-rev-list[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 224 | --quiet:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 225 | Don't print anything to standard output. This form |
| 226 | is primarily meant to allow the caller to |
| 227 | test the exit status to see if a range of objects is fully |
| 228 | connected (or not). It is faster than redirecting stdout |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 229 | to `/dev/null` as the output does not have to be formatted. |
Junio C Hamano | a372d5b | 2021-02-26 01:34:37 | [diff] [blame] | 230 | |
| 231 | --disk-usage:: |
| 232 | Suppress normal output; instead, print the sum of the bytes used |
| 233 | for on-disk storage by the selected commits or objects. This is |
| 234 | equivalent to piping the output into `git cat-file |
| 235 | --batch-check='%(objectsize:disk)'`, except that it runs much |
| 236 | faster (especially with `--use-bitmap-index`). See the `CAVEATS` |
| 237 | section in linkgit:git-cat-file[1] for the limitations of what |
| 238 | "on-disk storage" means. |
Junio C Hamano | 69cd7c5 | 2008-06-04 07:52:59 | [diff] [blame] | 239 | endif::git-rev-list[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 240 | |
Junio C Hamano | 9a2fb2d | 2011-03-23 05:40:15 | [diff] [blame] | 241 | --cherry-mark:: |
Junio C Hamano | 9a2fb2d | 2011-03-23 05:40:15 | [diff] [blame] | 242 | Like `--cherry-pick` (see below) but mark equivalent commits |
| 243 | with `=` rather than omitting them, and inequivalent ones with `+`. |
| 244 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 245 | --cherry-pick:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 246 | Omit any commit that introduces the same change as |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 247 | another commit on the ``other side'' when the set of |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 248 | commits are limited with symmetric difference. |
| 249 | + |
| 250 | For example, if you have two branches, `A` and `B`, a usual way |
| 251 | to list all commits on only one side of them is with |
Junio C Hamano | 5cd1518 | 2011-04-05 00:21:10 | [diff] [blame] | 252 | `--left-right` (see the example below in the description of |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 253 | the `--left-right` option). However, it shows the commits that were |
| 254 | cherry-picked from the other branch (for example, ``3rd on b'' may be |
| 255 | 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] | 256 | excluded from the output. |
| 257 | |
Junio C Hamano | 9a2fb2d | 2011-03-23 05:40:15 | [diff] [blame] | 258 | --left-only:: |
| 259 | --right-only:: |
Junio C Hamano | cd45166 | 2016-09-13 00:54:09 | [diff] [blame] | 260 | List only commits on the respective side of a symmetric difference, |
Junio C Hamano | 9a2fb2d | 2011-03-23 05:40:15 | [diff] [blame] | 261 | i.e. only those which would be marked `<` resp. `>` by |
| 262 | `--left-right`. |
| 263 | + |
| 264 | For example, `--cherry-pick --right-only A...B` omits those |
| 265 | 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] | 266 | `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] | 267 | More precisely, `--cherry-pick --right-only --no-merges` gives the exact |
| 268 | list. |
| 269 | |
| 270 | --cherry:: |
Junio C Hamano | 9a2fb2d | 2011-03-23 05:40:15 | [diff] [blame] | 271 | A synonym for `--right-only --cherry-mark --no-merges`; useful to |
| 272 | limit the output to the commits on our side and mark those that |
| 273 | have been applied to the other side of a forked history with |
| 274 | `git log --cherry upstream...mybranch`, similar to |
| 275 | `git cherry upstream mybranch`. |
| 276 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 277 | -g:: |
| 278 | --walk-reflogs:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 279 | Instead of walking the commit ancestry chain, walk |
| 280 | reflog entries from the most recent one to older ones. |
| 281 | When this option is used you cannot specify commits to |
| 282 | exclude (that is, '{caret}commit', 'commit1..commit2', |
Junio C Hamano | d75148a | 2014-04-08 19:48:38 | [diff] [blame] | 283 | and 'commit1\...commit2' notations cannot be used). |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 284 | + |
Junio C Hamano | b489685 | 2019-12-10 23:15:09 | [diff] [blame] | 285 | With `--pretty` format other than `oneline` and `reference` (for obvious reasons), |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 286 | this causes the output to have two extra lines of information |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 287 | taken from the reflog. The reflog designator in the output may be shown |
| 288 | as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the |
| 289 | reflog) or as `ref@{timestamp}` (with the timestamp for that entry), |
| 290 | depending on a few rules: |
| 291 | + |
| 292 | -- |
| 293 | 1. If the starting point is specified as `ref@{Nth}`, show the index |
Junio C Hamano | 2567b32 | 2019-02-05 23:33:56 | [diff] [blame] | 294 | format. |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 295 | + |
| 296 | 2. If the starting point was specified as `ref@{now}`, show the |
Junio C Hamano | 2567b32 | 2019-02-05 23:33:56 | [diff] [blame] | 297 | timestamp format. |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 298 | + |
| 299 | 3. If neither was used, but `--date` was given on the command line, show |
Junio C Hamano | 2567b32 | 2019-02-05 23:33:56 | [diff] [blame] | 300 | the timestamp in the format requested by `--date`. |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 301 | + |
| 302 | 4. Otherwise, show the index format. |
| 303 | -- |
| 304 | + |
| 305 | Under `--pretty=oneline`, the commit message is |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 306 | prefixed with this information on the same line. |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 307 | This option cannot be combined with `--reverse`. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 308 | See also linkgit:git-reflog[1]. |
Junio C Hamano | b489685 | 2019-12-10 23:15:09 | [diff] [blame] | 309 | + |
| 310 | Under `--pretty=reference`, this information will not be shown at all. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 311 | |
| 312 | --merge:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 313 | After a failed merge, show refs that touch files having a |
| 314 | conflict and don't exist on all heads to merge. |
| 315 | |
| 316 | --boundary:: |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 317 | Output excluded boundary commits. Boundary commits are |
| 318 | prefixed with `-`. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 319 | |
Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 320 | ifdef::git-rev-list[] |
| 321 | --use-bitmap-index:: |
| 322 | |
| 323 | Try to speed up the traversal using the pack bitmap index (if |
| 324 | one is available). Note that when traversing with `--objects`, |
| 325 | trees and blobs will not have their associated path printed. |
Junio C Hamano | e48a113 | 2016-08-03 22:40:21 | [diff] [blame] | 326 | |
| 327 | --progress=<header>:: |
| 328 | Show progress reports on stderr as objects are considered. The |
| 329 | `<header>` text will be printed with each progress update. |
Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 330 | endif::git-rev-list[] |
| 331 | |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 332 | History Simplification |
| 333 | ~~~~~~~~~~~~~~~~~~~~~~ |
| 334 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 335 | Sometimes you are only interested in parts of the history, for example the |
| 336 | commits modifying a particular <path>. But there are two parts of |
| 337 | 'History Simplification', one part is selecting the commits and the other |
| 338 | is how to do it, as there are various strategies to simplify the history. |
| 339 | |
| 340 | The following options select the commits to be shown: |
| 341 | |
| 342 | <paths>:: |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 343 | Commits modifying the given <paths> are selected. |
| 344 | |
| 345 | --simplify-by-decoration:: |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 346 | Commits that are referred by some branch or tag are selected. |
| 347 | |
| 348 | Note that extra commits can be shown to give a meaningful history. |
| 349 | |
| 350 | The following options affect the way the simplification is performed: |
| 351 | |
| 352 | Default mode:: |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 353 | Simplifies the history to the simplest history explaining the |
| 354 | final state of the tree. Simplest because it prunes some side |
| 355 | branches if the end result is the same (i.e. merging branches |
| 356 | with the same content) |
| 357 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 358 | --show-pulls:: |
| 359 | Include all commits from the default mode, but also any merge |
| 360 | commits that are not TREESAME to the first parent but are |
| 361 | TREESAME to a later parent. This mode is helpful for showing |
| 362 | the merge commits that "first introduced" a change to a branch. |
| 363 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 364 | --full-history:: |
Junio C Hamano | 15567bc | 2011-07-23 00:51:59 | [diff] [blame] | 365 | Same as the default mode, but does not prune some history. |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 366 | |
| 367 | --dense:: |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 368 | Only the selected commits are shown, plus some to have a |
| 369 | meaningful history. |
| 370 | |
| 371 | --sparse:: |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 372 | All commits in the simplified history are shown. |
| 373 | |
| 374 | --simplify-merges:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 375 | Additional option to `--full-history` to remove some needless |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 376 | merges from the resulting history, as there are no selected |
| 377 | commits contributing to this merge. |
| 378 | |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 379 | --ancestry-path:: |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 380 | When given a range of commits to display (e.g. 'commit1..commit2' |
| 381 | or 'commit2 {caret}commit1'), only display commits that exist |
| 382 | directly on the ancestry chain between the 'commit1' and |
| 383 | 'commit2', i.e. commits that are both descendants of 'commit1', |
| 384 | and ancestors of 'commit2'. |
| 385 | |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 386 | A more detailed explanation follows. |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 387 | |
| 388 | Suppose you specified `foo` as the <paths>. We shall call commits |
| 389 | that modify `foo` !TREESAME, and the rest TREESAME. (In a diff |
| 390 | filtered for `foo`, they look different and equal, respectively.) |
| 391 | |
| 392 | In the following, we will always refer to the same example history to |
| 393 | illustrate the differences between simplification settings. We assume |
| 394 | that you are filtering for a file `foo` in this commit graph: |
| 395 | ----------------------------------------------------------------------- |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 396 | .-A---M---N---O---P---Q |
| 397 | / / / / / / |
| 398 | I B C D E Y |
| 399 | \ / / / / / |
| 400 | `-------------' X |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 401 | ----------------------------------------------------------------------- |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 402 | 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] | 403 | each merge. The commits are: |
| 404 | |
| 405 | * `I` is the initial commit, in which `foo` exists with contents |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 406 | ``asdf'', and a file `quux` exists with contents ``quux''. Initial |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 407 | commits are compared to an empty tree, so `I` is !TREESAME. |
| 408 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 409 | * In `A`, `foo` contains just ``foo''. |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 410 | |
| 411 | * `B` contains the same change as `A`. Its merge `M` is trivial and |
| 412 | hence TREESAME to all parents. |
| 413 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 414 | * `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] | 415 | so it is not TREESAME to any parent. |
| 416 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 417 | * `D` sets `foo` to ``baz''. Its merge `O` combines the strings from |
| 418 | `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] | 419 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 420 | * `E` changes `quux` to ``xyzzy'', and its merge `P` combines the |
| 421 | 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] | 422 | |
Junio C Hamano | d7fccbf | 2013-07-25 03:24:57 | [diff] [blame] | 423 | * `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] | 424 | modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and |
| 425 | `Q` is TREESAME to `P`, but not to `Y`. |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 426 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 427 | `rev-list` walks backwards through history, including or excluding |
| 428 | commits based on whether `--full-history` and/or parent rewriting |
| 429 | (via `--parents` or `--children`) are used. The following settings |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 430 | are available. |
| 431 | |
| 432 | Default mode:: |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 433 | Commits are included if they are not TREESAME to any parent |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 434 | (though this can be changed, see `--sparse` below). If the |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 435 | commit was a merge, and it was TREESAME to one parent, follow |
| 436 | only that parent. (Even if there are several TREESAME |
| 437 | parents, follow only one of them.) Otherwise, follow all |
| 438 | parents. |
| 439 | + |
| 440 | This results in: |
| 441 | + |
| 442 | ----------------------------------------------------------------------- |
| 443 | .-A---N---O |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 444 | / / / |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 445 | I---------D |
| 446 | ----------------------------------------------------------------------- |
| 447 | + |
| 448 | Note how the rule to only follow the TREESAME parent, if one is |
| 449 | available, removed `B` from consideration entirely. `C` was |
| 450 | considered via `N`, but is TREESAME. Root commits are compared to an |
| 451 | empty tree, so `I` is !TREESAME. |
| 452 | + |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 453 | Parent/child relations are only visible with `--parents`, but that does |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 454 | not affect the commits selected in default mode, so we have shown the |
| 455 | parent lines. |
| 456 | |
| 457 | --full-history without parent rewriting:: |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 458 | This mode differs from the default in one point: always follow |
| 459 | all parents of a merge, even if it is TREESAME to one of them. |
| 460 | Even if more than one side of the merge has commits that are |
| 461 | included, this does not imply that the merge itself is! In |
| 462 | the example, we get |
| 463 | + |
| 464 | ----------------------------------------------------------------------- |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 465 | I A B N D O P Q |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 466 | ----------------------------------------------------------------------- |
| 467 | + |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 468 | `M` was excluded because it is TREESAME to both parents. `E`, |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 469 | `C` and `B` were all walked, but only `B` was !TREESAME, so the others |
| 470 | do not appear. |
| 471 | + |
| 472 | Note that without parent rewriting, it is not really possible to talk |
| 473 | about the parent/child relationships between the commits, so we show |
| 474 | them disconnected. |
| 475 | |
| 476 | --full-history with parent rewriting:: |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 477 | Ordinary commits are only included if they are !TREESAME |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 478 | (though this can be changed, see `--sparse` below). |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 479 | + |
| 480 | Merges are always included. However, their parent list is rewritten: |
| 481 | Along each parent, prune away commits that are not included |
| 482 | themselves. This results in |
| 483 | + |
| 484 | ----------------------------------------------------------------------- |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 485 | .-A---M---N---O---P---Q |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 486 | / / / / / |
| 487 | I B / D / |
| 488 | \ / / / / |
| 489 | `-------------' |
| 490 | ----------------------------------------------------------------------- |
| 491 | + |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 492 | Compare to `--full-history` without rewriting above. Note that `E` |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 493 | was pruned away because it is TREESAME, but the parent list of P was |
| 494 | 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] | 495 | `N`, and `X`, `Y` and `Q`. |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 496 | |
| 497 | In addition to the above settings, you can change whether TREESAME |
| 498 | affects inclusion: |
| 499 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 500 | --dense:: |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 501 | Commits that are walked are included if they are not TREESAME |
| 502 | to any parent. |
| 503 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 504 | --sparse:: |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 505 | All commits that are walked are included. |
| 506 | + |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 507 | Note that without `--full-history`, this still simplifies merges: if |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 508 | one of the parents is TREESAME, we follow only that one, so the other |
| 509 | sides of the merge are never walked. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 510 | |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 511 | --simplify-merges:: |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 512 | First, build a history graph in the same way that |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 513 | `--full-history` with parent rewriting does (see above). |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 514 | + |
| 515 | Then simplify each commit `C` to its replacement `C'` in the final |
| 516 | history according to the following rules: |
| 517 | + |
| 518 | -- |
| 519 | * Set `C'` to `C`. |
| 520 | + |
| 521 | * Replace each parent `P` of `C'` with its simplification `P'`. In |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 522 | the process, drop parents that are ancestors of other parents or that are |
| 523 | root commits TREESAME to an empty tree, and remove duplicates, but take care |
| 524 | to never drop all parents that we are TREESAME to. |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 525 | + |
| 526 | * If after this parent rewriting, `C'` is a root or merge commit (has |
| 527 | zero or >1 parents), a boundary commit, or !TREESAME, it remains. |
| 528 | Otherwise, it is replaced with its only parent. |
| 529 | -- |
| 530 | + |
| 531 | The effect of this is best shown by way of comparing to |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 532 | `--full-history` with parent rewriting. The example turns into: |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 533 | + |
| 534 | ----------------------------------------------------------------------- |
| 535 | .-A---M---N---O |
| 536 | / / / |
| 537 | I B D |
| 538 | \ / / |
| 539 | `---------' |
| 540 | ----------------------------------------------------------------------- |
| 541 | + |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 542 | Note the major differences in `N`, `P`, and `Q` over `--full-history`: |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 543 | + |
| 544 | -- |
| 545 | * `N`'s parent list had `I` removed, because it is an ancestor of the |
| 546 | other parent `M`. Still, `N` remained because it is !TREESAME. |
| 547 | + |
| 548 | * `P`'s parent list similarly had `I` removed. `P` was then |
| 549 | removed completely, because it had one parent and is TREESAME. |
Junio C Hamano | 27159f8 | 2013-06-14 17:19:22 | [diff] [blame] | 550 | + |
| 551 | * `Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it |
| 552 | was a TREESAME root. `Q` was then removed completely, because it had one |
| 553 | parent and is TREESAME. |
Junio C Hamano | a2f4662 | 2008-09-03 05:20:31 | [diff] [blame] | 554 | -- |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 555 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 556 | There is another simplification mode available: |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 557 | |
| 558 | --ancestry-path:: |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 559 | Limit the displayed commits to those directly on the ancestry |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 560 | chain between the ``from'' and ``to'' commits in the given commit |
| 561 | range. I.e. only display commits that are ancestor of the ``to'' |
| 562 | commit and descendants of the ``from'' commit. |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 563 | + |
| 564 | As an example use case, consider the following commit history: |
| 565 | + |
| 566 | ----------------------------------------------------------------------- |
| 567 | D---E-------F |
| 568 | / \ \ |
| 569 | B---C---G---H---I---J |
| 570 | / \ |
| 571 | A-------K---------------L--M |
| 572 | ----------------------------------------------------------------------- |
| 573 | + |
| 574 | A regular 'D..M' computes the set of commits that are ancestors of `M`, |
| 575 | but excludes the ones that are ancestors of `D`. This is useful to see |
| 576 | 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] | 577 | 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] | 578 | example would be all the commits, except `A` and `B` (and `D` itself, |
| 579 | of course). |
| 580 | + |
| 581 | When we want to find out what commits in `M` are contaminated with the |
| 582 | bug introduced by `D` and need fixing, however, we might want to view |
| 583 | 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] | 584 | excluding `C` and `K`. This is exactly what the `--ancestry-path` |
Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 585 | option does. Applied to the 'D..M' range, it results in: |
| 586 | + |
| 587 | ----------------------------------------------------------------------- |
| 588 | E-------F |
| 589 | \ \ |
| 590 | G---H---I---J |
| 591 | \ |
| 592 | L--M |
| 593 | ----------------------------------------------------------------------- |
| 594 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 595 | Before discussing another option, `--show-pulls`, we need to |
| 596 | create a new example history. |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 597 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 598 | A common problem users face when looking at simplified history is that a |
| 599 | commit they know changed a file somehow does not appear in the file's |
| 600 | simplified history. Let's demonstrate a new example and show how options |
| 601 | such as `--full-history` and `--simplify-merges` works in that case: |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 602 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 603 | ----------------------------------------------------------------------- |
| 604 | .-A---M-----C--N---O---P |
| 605 | / / \ \ \/ / / |
| 606 | I B \ R-'`-Z' / |
| 607 | \ / \/ / |
| 608 | \ / /\ / |
| 609 | `---X--' `---Y--' |
| 610 | ----------------------------------------------------------------------- |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 611 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 612 | For this example, suppose `I` created `file.txt` which was modified by |
| 613 | `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, |
| 614 | and `Y` do not change `file.txt`. The merge commit `M` was created by |
| 615 | resolving the merge conflict to include both changes from `A` and `B` |
| 616 | and hence is not TREESAME to either. The merge commit `R`, however, was |
| 617 | created by ignoring the contents of `file.txt` at `M` and taking only |
| 618 | the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not |
| 619 | `M`. Finally, the natural merge resolution to create `N` is to take the |
| 620 | contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. |
| 621 | The merge commits `O` and `P` are TREESAME to their first parents, but |
| 622 | not to their second parents, `Z` and `Y` respectively. |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 623 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 624 | When using the default mode, `N` and `R` both have a TREESAME parent, so |
| 625 | those edges are walked and the others are ignored. The resulting history |
| 626 | graph is: |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 627 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 628 | ----------------------------------------------------------------------- |
| 629 | I---X |
| 630 | ----------------------------------------------------------------------- |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 631 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 632 | When using `--full-history`, Git walks every edge. This will discover |
| 633 | the commits `A` and `B` and the merge `M`, but also will reveal the |
| 634 | merge commits `O` and `P`. With parent rewriting, the resulting graph is: |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 635 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 636 | ----------------------------------------------------------------------- |
| 637 | .-A---M--------N---O---P |
| 638 | / / \ \ \/ / / |
| 639 | I B \ R-'`--' / |
| 640 | \ / \/ / |
| 641 | \ / /\ / |
| 642 | `---X--' `------' |
| 643 | ----------------------------------------------------------------------- |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 644 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 645 | Here, the merge commits `O` and `P` contribute extra noise, as they did |
| 646 | not actually contribute a change to `file.txt`. They only merged a topic |
| 647 | that was based on an older version of `file.txt`. This is a common |
| 648 | issue in repositories using a workflow where many contributors work in |
| 649 | parallel and merge their topic branches along a single trunk: manu |
| 650 | unrelated merges appear in the `--full-history` results. |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 651 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 652 | When using the `--simplify-merges` option, the commits `O` and `P` |
| 653 | disappear from the results. This is because the rewritten second parents |
| 654 | of `O` and `P` are reachable from their first parents. Those edges are |
| 655 | removed and then the commits look like single-parent commits that are |
| 656 | TREESAME to their parent. This also happens to the commit `N`, resulting |
| 657 | in a history view as follows: |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 658 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 659 | ----------------------------------------------------------------------- |
| 660 | .-A---M--. |
| 661 | / / \ |
| 662 | I B R |
| 663 | \ / / |
| 664 | \ / / |
| 665 | `---X--' |
| 666 | ----------------------------------------------------------------------- |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 667 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 668 | In this view, we see all of the important single-parent changes from |
| 669 | `A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the |
| 670 | not-so-carefully-resolved merge `R`. This is usually enough information |
| 671 | to determine why the commits `A` and `B` "disappeared" from history in |
| 672 | the default view. However, there are a few issues with this approach. |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 673 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 674 | The first issue is performance. Unlike any previous option, the |
| 675 | `--simplify-merges` option requires walking the entire commit history |
| 676 | before returning a single result. This can make the option difficult to |
| 677 | use for very large repositories. |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 678 | |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 679 | The second issue is one of auditing. When many contributors are working |
| 680 | on the same repository, it is important which merge commits introduced |
| 681 | a change into an important branch. The problematic merge `R` above is |
| 682 | not likely to be the merge commit that was used to merge into an |
| 683 | important branch. Instead, the merge `N` was used to merge `R` and `X` |
| 684 | into the important branch. This commit may have information about why |
| 685 | the change `X` came to override the changes from `A` and `B` in its |
| 686 | commit message. |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 687 | |
| 688 | --show-pulls:: |
| 689 | In addition to the commits shown in the default history, show |
| 690 | each merge commit that is not TREESAME to its first parent but |
| 691 | is TREESAME to a later parent. |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 692 | + |
Junio C Hamano | 0cb719f | 2020-05-31 20:04:39 | [diff] [blame] | 693 | When a merge commit is included by `--show-pulls`, the merge is |
Junio C Hamano | 67bf224 | 2020-04-22 21:41:44 | [diff] [blame] | 694 | treated as if it "pulled" the change from another branch. When using |
| 695 | `--show-pulls` on this example (and no other options) the resulting |
| 696 | graph is: |
| 697 | + |
| 698 | ----------------------------------------------------------------------- |
| 699 | I---X---R---N |
| 700 | ----------------------------------------------------------------------- |
| 701 | + |
| 702 | Here, the merge commits `R` and `N` are included because they pulled |
| 703 | the commits `X` and `R` into the base branch, respectively. These |
| 704 | merges are the reason the commits `A` and `B` do not appear in the |
| 705 | default history. |
| 706 | + |
| 707 | When `--show-pulls` is paired with `--simplify-merges`, the |
| 708 | graph includes all of the necessary information: |
| 709 | + |
| 710 | ----------------------------------------------------------------------- |
| 711 | .-A---M--. N |
| 712 | / / \ / |
| 713 | I B R |
| 714 | \ / / |
| 715 | \ / / |
| 716 | `---X--' |
| 717 | ----------------------------------------------------------------------- |
| 718 | + |
| 719 | Notice that since `M` is reachable from `R`, the edge from `N` to `M` |
| 720 | was simplified away. However, `N` still appears in the history as an |
| 721 | important commit because it "pulled" the change `R` into the main |
| 722 | branch. |
| 723 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 724 | The `--simplify-by-decoration` option allows you to view only the |
Junio C Hamano | 2836349 | 2008-11-14 08:26:31 | [diff] [blame] | 725 | big picture of the topology of the history, by omitting commits |
| 726 | that are not referenced by tags. Commits are marked as !TREESAME |
| 727 | (in other words, kept after history simplification rules described |
| 728 | above) if (1) they are referenced by tags, or (2) they change the |
| 729 | contents of the paths given on the command line. All other |
| 730 | commits are marked as TREESAME (subject to be simplified away). |
| 731 | |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 732 | ifndef::git-shortlog[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 733 | ifdef::git-rev-list[] |
Junio C Hamano | a76cb0d | 2008-08-13 20:04:10 | [diff] [blame] | 734 | Bisection Helpers |
| 735 | ~~~~~~~~~~~~~~~~~ |
| 736 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 737 | --bisect:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 738 | Limit output to the one commit object which is roughly halfway between |
| 739 | included and excluded commits. Note that the bad bisection ref |
| 740 | `refs/bisect/bad` is added to the included commits (if it |
| 741 | exists) and the good bisection refs `refs/bisect/good-*` are |
| 742 | added to the excluded commits (if they exist). Thus, supposing there |
| 743 | are no refs in `refs/bisect/`, if |
| 744 | + |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 745 | ----------------------------------------------------------------------- |
Junio C Hamano | 175a1bd | 2008-11-10 00:08:57 | [diff] [blame] | 746 | $ git rev-list --bisect foo ^bar ^baz |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 747 | ----------------------------------------------------------------------- |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 748 | + |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 749 | outputs 'midpoint', the output of the two commands |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 750 | + |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 751 | ----------------------------------------------------------------------- |
Junio C Hamano | 175a1bd | 2008-11-10 00:08:57 | [diff] [blame] | 752 | $ git rev-list foo ^midpoint |
| 753 | $ git rev-list midpoint ^bar ^baz |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 754 | ----------------------------------------------------------------------- |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 755 | + |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 756 | would be of roughly the same length. Finding the change which |
| 757 | introduces a regression is thus reduced to a binary search: repeatedly |
| 758 | generate and test new 'midpoint's until the commit chain is of length |
Junio C Hamano | 255163d | 2020-08-18 00:37:23 | [diff] [blame] | 759 | one. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 760 | |
| 761 | --bisect-vars:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 762 | This calculates the same as `--bisect`, except that refs in |
| 763 | `refs/bisect/` are not used, and except that this outputs |
| 764 | text ready to be eval'ed by the shell. These lines will assign the |
| 765 | name of the midpoint revision to the variable `bisect_rev`, and the |
| 766 | expected number of commits to be tested after `bisect_rev` is tested |
| 767 | to `bisect_nr`, the expected number of commits to be tested if |
| 768 | `bisect_rev` turns out to be good to `bisect_good`, the expected |
| 769 | number of commits to be tested if `bisect_rev` turns out to be bad to |
| 770 | `bisect_bad`, and the number of commits we are bisecting right now to |
| 771 | `bisect_all`. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 772 | |
| 773 | --bisect-all:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 774 | This outputs all the commit objects between the included and excluded |
| 775 | commits, ordered by their distance to the included and excluded |
| 776 | commits. Refs in `refs/bisect/` are not used. The farthest |
| 777 | from them is displayed first. (This is the only one displayed by |
| 778 | `--bisect`.) |
Junio C Hamano | 792c5a9 | 2009-03-08 08:45:13 | [diff] [blame] | 779 | + |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 780 | This is useful because it makes it easy to choose a good commit to |
| 781 | test when you want to avoid to test some of them for some reason (they |
| 782 | may not compile for example). |
Junio C Hamano | 792c5a9 | 2009-03-08 08:45:13 | [diff] [blame] | 783 | + |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 784 | This option can be used along with `--bisect-vars`, in this case, |
| 785 | after all the sorted commit objects, there will be the same text as if |
| 786 | `--bisect-vars` had been used alone. |
| 787 | endif::git-rev-list[] |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 788 | endif::git-shortlog[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 789 | |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 790 | ifndef::git-shortlog[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 791 | Commit Ordering |
| 792 | ~~~~~~~~~~~~~~~ |
| 793 | |
| 794 | By default, the commits are shown in reverse chronological order. |
| 795 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 796 | --date-order:: |
Junio C Hamano | d031611 | 2012-08-22 19:55:29 | [diff] [blame] | 797 | Show no parents before all of its children are shown, but |
| 798 | otherwise show commits in the commit timestamp order. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 799 | |
Junio C Hamano | a195230 | 2013-07-01 21:31:18 | [diff] [blame] | 800 | --author-date-order:: |
| 801 | Show no parents before all of its children are shown, but |
| 802 | otherwise show commits in the author timestamp order. |
| 803 | |
Junio C Hamano | d031611 | 2012-08-22 19:55:29 | [diff] [blame] | 804 | --topo-order:: |
| 805 | Show no parents before all of its children are shown, and |
| 806 | avoid showing commits on multiple lines of history |
| 807 | intermixed. |
| 808 | + |
| 809 | For example, in a commit history like this: |
| 810 | + |
| 811 | ---------------------------------------------------------------- |
| 812 | |
| 813 | ---1----2----4----7 |
| 814 | \ \ |
| 815 | 3----5----6----8--- |
| 816 | |
| 817 | ---------------------------------------------------------------- |
| 818 | + |
| 819 | where the numbers denote the order of commit timestamps, `git |
| 820 | rev-list` and friends with `--date-order` show the commits in the |
| 821 | timestamp order: 8 7 6 5 4 3 2 1. |
| 822 | + |
| 823 | With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 |
| 824 | 3 1); some older commits are shown before newer ones in order to |
| 825 | avoid showing the commits from two parallel development track mixed |
| 826 | together. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 827 | |
| 828 | --reverse:: |
Junio C Hamano | f3ca7b8 | 2016-10-03 22:27:02 | [diff] [blame] | 829 | Output the commits chosen to be shown (see Commit Limiting |
| 830 | section above) in reverse order. Cannot be combined with |
| 831 | `--walk-reflogs`. |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 832 | endif::git-shortlog[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 833 | |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 834 | ifndef::git-shortlog[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 835 | Object Traversal |
| 836 | ~~~~~~~~~~~~~~~~ |
| 837 | |
Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 838 | These options are mostly targeted for packing of Git repositories. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 839 | |
Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 840 | ifdef::git-rev-list[] |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 841 | --objects:: |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 842 | Print the object IDs of any object referenced by the listed |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 843 | commits. `--objects foo ^bar` thus means ``send me |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 844 | 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] | 845 | object _bar_ but not _foo_''. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 846 | |
Junio C Hamano | 68e72b7 | 2017-12-28 23:20:52 | [diff] [blame] | 847 | --in-commit-order:: |
| 848 | Print tree and blob ids in order of the commits. The tree |
| 849 | and blob ids are printed after they are first referenced |
| 850 | by a commit. |
| 851 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 852 | --objects-edge:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 853 | Similar to `--objects`, but also print the IDs of excluded |
| 854 | commits prefixed with a ``-'' character. This is used by |
Junio C Hamano | 629edff | 2015-01-12 23:46:02 | [diff] [blame] | 855 | linkgit:git-pack-objects[1] to build a ``thin'' pack, which records |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 856 | objects in deltified form based on objects contained in these |
| 857 | excluded commits to reduce network traffic. |
| 858 | |
Junio C Hamano | 629edff | 2015-01-12 23:46:02 | [diff] [blame] | 859 | --objects-edge-aggressive:: |
| 860 | Similar to `--objects-edge`, but it tries harder to find excluded |
| 861 | commits at the cost of increased time. This is used instead of |
| 862 | `--objects-edge` to build ``thin'' packs for shallow repositories. |
| 863 | |
Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 864 | --indexed-objects:: |
| 865 | Pretend as if all trees and blobs used by the index are listed |
| 866 | on the command line. Note that you probably want to use |
| 867 | `--objects`, too. |
| 868 | |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 869 | --unpacked:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 870 | Only useful with `--objects`; print the object IDs that are not |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 871 | in packs. |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 872 | |
Junio C Hamano | c9f11c2 | 2019-07-10 02:54:04 | [diff] [blame] | 873 | --object-names:: |
| 874 | Only useful with `--objects`; print the names of the object IDs |
| 875 | that are found. This is the default behavior. |
| 876 | |
| 877 | --no-object-names:: |
| 878 | Only useful with `--objects`; does not print the names of the object |
| 879 | IDs that are found. This inverts `--object-names`. This flag allows |
| 880 | the output to be more easily parsed by commands such as |
| 881 | linkgit:git-cat-file[1]. |
| 882 | |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 883 | --filter=<filter-spec>:: |
| 884 | Only useful with one of the `--objects*`; omits objects (usually |
| 885 | blobs) from the list of printed objects. The '<filter-spec>' |
| 886 | may be one of the following: |
| 887 | + |
| 888 | The form '--filter=blob:none' omits all blobs. |
| 889 | + |
| 890 | The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes |
| 891 | or units. n may be zero. The suffixes k, m, and g can be used to name |
| 892 | units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same |
| 893 | as 'blob:limit=1024'. |
| 894 | + |
Junio C Hamano | be601db | 2021-05-07 04:20:28 | [diff] [blame] | 895 | The form '--filter=object:type=(tag|commit|tree|blob)' omits all objects |
| 896 | which are not of the requested type. |
| 897 | + |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 898 | The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout |
| 899 | specification contained in the blob (or blob-expression) '<blob-ish>' |
Junio C Hamano | 20cf493 | 2021-07-28 21:02:52 | [diff] [blame] | 900 | to omit blobs that would not be required for a sparse checkout on |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 901 | the requested refs. |
| 902 | + |
Junio C Hamano | 94d00a5 | 2018-10-30 07:34:40 | [diff] [blame] | 903 | The form '--filter=tree:<depth>' omits all blobs and trees whose depth |
| 904 | from the root tree is >= <depth> (minimum depth if an object is located |
Junio C Hamano | 2567b32 | 2019-02-05 23:33:56 | [diff] [blame] | 905 | at multiple depths in the commits traversed). <depth>=0 will not include |
| 906 | any trees or blobs unless included explicitly in the command-line (or |
| 907 | standard input when --stdin is used). <depth>=1 will include only the |
| 908 | tree and blobs which are referenced directly by a commit reachable from |
| 909 | <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 |
| 910 | while also including trees and blobs one more level removed from an |
| 911 | explicitly-given commit or tree. |
Junio C Hamano | 0887d04 | 2019-06-03 19:55:17 | [diff] [blame] | 912 | + |
| 913 | Note that the form '--filter=sparse:path=<path>' that wants to read |
| 914 | from an arbitrary path on the filesystem has been dropped for security |
| 915 | reasons. |
Junio C Hamano | cb70539 | 2019-09-18 19:30:01 | [diff] [blame] | 916 | + |
| 917 | Multiple '--filter=' flags can be specified to combine filters. Only |
| 918 | objects which are accepted by every filter are included. |
| 919 | + |
| 920 | The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be |
| 921 | used to combined several filters, but this is harder than just repeating |
| 922 | the '--filter' flag and is usually not necessary. Filters are joined by |
| 923 | '{plus}' and individual filters are %-encoded (i.e. URL-encoded). |
| 924 | Besides the '{plus}' and '%' characters, the following characters are |
| 925 | reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+'`+ |
| 926 | as well as all characters with ASCII code <= `0x20`, which includes |
| 927 | space and newline. |
| 928 | + |
| 929 | Other arbitrary characters can also be encoded. For instance, |
| 930 | 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are |
| 931 | equivalent. |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 932 | |
| 933 | --no-filter:: |
| 934 | Turn off any previous `--filter=` argument. |
| 935 | |
Junio C Hamano | be601db | 2021-05-07 04:20:28 | [diff] [blame] | 936 | --filter-provided-objects:: |
| 937 | Filter the list of explicitly provided objects, which would otherwise |
| 938 | always be printed even if they did not match any of the filters. Only |
| 939 | useful with `--filter=`. |
| 940 | |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 941 | --filter-print-omitted:: |
| 942 | Only useful with `--filter=`; prints a list of the objects omitted |
Junio C Hamano | 6b7d215 | 2019-04-16 12:51:15 | [diff] [blame] | 943 | by the filter. Object IDs are prefixed with a ``~'' character. |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 944 | |
| 945 | --missing=<missing-action>:: |
| 946 | A debug option to help with future "partial clone" development. |
| 947 | This option specifies how missing objects are handled. |
| 948 | + |
| 949 | The form '--missing=error' requests that rev-list stop with an error if |
| 950 | a missing object is encountered. This is the default action. |
| 951 | + |
| 952 | The form '--missing=allow-any' will allow object traversal to continue |
| 953 | if a missing object is encountered. Missing objects will silently be |
| 954 | omitted from the results. |
| 955 | + |
Junio C Hamano | 640779d | 2018-02-14 01:29:14 | [diff] [blame] | 956 | The form '--missing=allow-promisor' is like 'allow-any', but will only |
| 957 | allow object traversal to continue for EXPECTED promisor missing objects. |
| 958 | Unexpected missing objects will raise an error. |
| 959 | + |
Junio C Hamano | 0f1291d | 2017-12-27 19:58:35 | [diff] [blame] | 960 | The form '--missing=print' is like 'allow-any', but will also print a |
| 961 | list of the missing objects. Object IDs are prefixed with a ``?'' character. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 962 | |
Junio C Hamano | 640779d | 2018-02-14 01:29:14 | [diff] [blame] | 963 | --exclude-promisor-objects:: |
| 964 | (For internal use only.) Prefilter object traversal at |
| 965 | promisor boundary. This is used with partial clone. This is |
| 966 | stronger than `--missing=allow-promisor` because it limits the |
| 967 | traversal, rather than just silencing errors about missing |
| 968 | objects. |
Junio C Hamano | 46fbbcb | 2018-11-07 03:54:16 | [diff] [blame] | 969 | endif::git-rev-list[] |
Junio C Hamano | 640779d | 2018-02-14 01:29:14 | [diff] [blame] | 970 | |
Junio C Hamano | 810dc8f | 2021-09-08 21:24:58 | [diff] [blame] | 971 | --unsorted-input:: |
| 972 | Show commits in the order they were given on the command line instead |
| 973 | of sorting them in reverse chronological order by commit time. Cannot |
| 974 | be combined with `--no-walk` or `--no-walk=sorted`. |
| 975 | |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 976 | --no-walk[=(sorted|unsorted)]:: |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 977 | Only show the given commits, but do not traverse their ancestors. |
| 978 | This has no effect if a range is specified. If the argument |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 979 | `unsorted` is given, the commits are shown in the order they were |
| 980 | given on the command line. Otherwise (if `sorted` or no argument |
| 981 | was given), the commits are shown in reverse chronological order |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 982 | by commit time. |
Junio C Hamano | 810dc8f | 2021-09-08 21:24:58 | [diff] [blame] | 983 | Cannot be combined with `--graph`. Cannot be combined with |
| 984 | `--unsorted-input` if `sorted` or no argument was given. |
Junio C Hamano | b0e0295 | 2008-01-19 08:02:00 | [diff] [blame] | 985 | |
| 986 | --do-walk:: |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 987 | Overrides a previous `--no-walk`. |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 988 | endif::git-shortlog[] |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 989 | |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 990 | ifndef::git-shortlog[] |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 991 | Commit Formatting |
| 992 | ~~~~~~~~~~~~~~~~~ |
| 993 | |
| 994 | ifdef::git-rev-list[] |
| 995 | Using these options, linkgit:git-rev-list[1] will act similar to the |
| 996 | more specialized family of commit log tools: linkgit:git-log[1], |
| 997 | linkgit:git-show[1], and linkgit:git-whatchanged[1] |
| 998 | endif::git-rev-list[] |
| 999 | |
| 1000 | include::pretty-options.txt[] |
| 1001 | |
| 1002 | --relative-date:: |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1003 | Synonym for `--date=relative`. |
| 1004 | |
Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1005 | --date=<format>:: |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1006 | Only takes effect for dates shown in human-readable format, such |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 1007 | as when using `--pretty`. `log.date` config variable sets a default |
Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1008 | value for the log command's `--date` option. By default, dates |
| 1009 | are shown in the original time zone (either committer's or |
| 1010 | author's). If `-local` is appended to the format (e.g., |
| 1011 | `iso-local`), the user's local time zone is used instead. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1012 | + |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1013 | -- |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1014 | `--date=relative` shows dates relative to the current time, |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 1015 | e.g. ``2 hours ago''. The `-local` option has no effect for |
| 1016 | `--date=relative`. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1017 | |
Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1018 | `--date=local` is an alias for `--date=default-local`. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1019 | |
Junio C Hamano | ac12f0e | 2014-09-19 22:32:51 | [diff] [blame] | 1020 | `--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. |
| 1021 | The differences to the strict ISO 8601 format are: |
| 1022 | |
| 1023 | - a space instead of the `T` date/time delimiter |
| 1024 | - a space between time and time zone |
| 1025 | - no colon between hours and minutes of the time zone |
| 1026 | |
Junio C Hamano | ac12f0e | 2014-09-19 22:32:51 | [diff] [blame] | 1027 | `--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict |
| 1028 | ISO 8601 format. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1029 | |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1030 | `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 1031 | format, often found in email messages. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1032 | |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 1033 | `--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1034 | |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 1035 | `--date=raw` shows the date as seconds since the epoch (1970-01-01 |
| 1036 | 00:00:00 UTC), followed by a space, and then the timezone as an offset |
| 1037 | from UTC (a `+` or `-` with four digits; the first two are hours, and |
| 1038 | the second two are minutes). I.e., as if the timestamp were formatted |
| 1039 | with `strftime("%s %z")`). |
| 1040 | Note that the `-local` option does not affect the seconds-since-epoch |
| 1041 | value (which is always measured in UTC), but does switch the accompanying |
| 1042 | timezone value. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1043 | |
Junio C Hamano | 23168ef | 2019-02-07 07:20:47 | [diff] [blame] | 1044 | `--date=human` shows the timezone if the timezone does not match the |
| 1045 | current time-zone, and doesn't print the whole date if that matches |
| 1046 | (ie skip printing year for dates that are "this year", but also skip |
| 1047 | the whole date itself if it's in the last few days and we can just say |
| 1048 | what weekday it was). For older dates the hour and minute is also |
| 1049 | omitted. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1050 | |
Junio C Hamano | e548d1b | 2016-08-08 22:26:49 | [diff] [blame] | 1051 | `--date=unix` shows the date as a Unix epoch timestamp (seconds since |
| 1052 | 1970). As with `--raw`, this is always in UTC and therefore `-local` |
| 1053 | has no effect. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1054 | |
Junio C Hamano | 55d9191 | 2017-06-22 22:32:46 | [diff] [blame] | 1055 | `--date=format:...` feeds the format `...` to your system `strftime`, |
| 1056 | except for %z and %Z, which are handled internally. |
Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 1057 | Use `--date=format:%c` to show the date in your system locale's |
| 1058 | preferred format. See the `strftime` manual for a complete list of |
Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1059 | format placeholders. When using `-local`, the correct syntax is |
| 1060 | `--date=format-local:...`. |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1061 | |
Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1062 | `--date=default` is the default format, and is similar to |
| 1063 | `--date=rfc2822`, with a few exceptions: |
Junio C Hamano | b551377 | 2019-04-22 03:38:39 | [diff] [blame] | 1064 | -- |
Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1065 | - there is no comma after the day-of-week |
| 1066 | |
| 1067 | - the time zone is omitted when the local time zone is used |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1068 | |
| 1069 | ifdef::git-rev-list[] |
| 1070 | --header:: |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1071 | Print the contents of the commit in raw-format; each record is |
| 1072 | separated with a NUL character. |
Junio C Hamano | 20cf493 | 2021-07-28 21:02:52 | [diff] [blame] | 1073 | |
| 1074 | --no-commit-header:: |
| 1075 | Suppress the header line containing "commit" and the object ID printed before |
| 1076 | the specified format. This has no effect on the built-in formats; only custom |
| 1077 | formats are affected. |
| 1078 | |
| 1079 | --commit-header:: |
| 1080 | Overrides a previous `--no-commit-header`. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1081 | endif::git-rev-list[] |
| 1082 | |
| 1083 | --parents:: |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1084 | Print also the parents of the commit (in the form "commit parent..."). |
Junio C Hamano | ce019c0 | 2017-10-30 05:57:46 | [diff] [blame] | 1085 | Also enables parent rewriting, see 'History Simplification' above. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1086 | |
| 1087 | --children:: |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1088 | Print also the children of the commit (in the form "commit child..."). |
Junio C Hamano | ce019c0 | 2017-10-30 05:57:46 | [diff] [blame] | 1089 | Also enables parent rewriting, see 'History Simplification' above. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1090 | |
| 1091 | ifdef::git-rev-list[] |
| 1092 | --timestamp:: |
| 1093 | Print the raw commit timestamp. |
| 1094 | endif::git-rev-list[] |
| 1095 | |
| 1096 | --left-right:: |
Junio C Hamano | cd45166 | 2016-09-13 00:54:09 | [diff] [blame] | 1097 | Mark which side of a symmetric difference a commit is reachable from. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1098 | Commits from the left side are prefixed with `<` and those from |
| 1099 | the right with `>`. If combined with `--boundary`, those |
| 1100 | commits are prefixed with `-`. |
| 1101 | + |
| 1102 | For example, if you have this topology: |
| 1103 | + |
| 1104 | ----------------------------------------------------------------------- |
| 1105 | y---b---b branch B |
| 1106 | / \ / |
| 1107 | / . |
| 1108 | / / \ |
| 1109 | o---x---a---a branch A |
| 1110 | ----------------------------------------------------------------------- |
| 1111 | + |
| 1112 | you would get an output like this: |
| 1113 | + |
| 1114 | ----------------------------------------------------------------------- |
| 1115 | $ git rev-list --left-right --boundary --pretty=oneline A...B |
| 1116 | |
| 1117 | >bbbbbbb... 3rd on b |
| 1118 | >bbbbbbb... 2nd on b |
| 1119 | <aaaaaaa... 3rd on a |
| 1120 | <aaaaaaa... 2nd on a |
| 1121 | -yyyyyyy... 1st on b |
| 1122 | -xxxxxxx... 1st on a |
| 1123 | ----------------------------------------------------------------------- |
| 1124 | |
| 1125 | --graph:: |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1126 | Draw a text-based graphical representation of the commit history |
| 1127 | on the left hand side of the output. This may cause extra lines |
| 1128 | to be printed in between commits, in order for the graph history |
| 1129 | to be drawn properly. |
Junio C Hamano | ef57d1e | 2015-03-25 21:23:00 | [diff] [blame] | 1130 | Cannot be combined with `--no-walk`. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1131 | + |
Junio C Hamano | ce019c0 | 2017-10-30 05:57:46 | [diff] [blame] | 1132 | This enables parent rewriting, see 'History Simplification' above. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1133 | + |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 1134 | This implies the `--topo-order` option by default, but the |
| 1135 | `--date-order` option may also be specified. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1136 | |
Junio C Hamano | 624dd4c | 2014-04-03 21:56:30 | [diff] [blame] | 1137 | --show-linear-break[=<barrier>]:: |
| 1138 | When --graph is not used, all history branches are flattened |
| 1139 | which can make it hard to see that the two consecutive commits |
| 1140 | do not belong to a linear branch. This option puts a barrier |
| 1141 | in between them in that case. If `<barrier>` is specified, it |
| 1142 | is the string that will be shown instead of the default one. |
| 1143 | |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1144 | ifdef::git-rev-list[] |
| 1145 | --count:: |
| 1146 | Print a number stating how many commits would have been |
| 1147 | listed, and suppress all other output. When used together |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 1148 | with `--left-right`, instead print the counts for left and |
Junio C Hamano | b77f819 | 2011-05-05 01:30:38 | [diff] [blame] | 1149 | right commits, separated by a tab. When used together with |
Junio C Hamano | b73af6c | 2013-12-03 22:07:11 | [diff] [blame] | 1150 | `--cherry-mark`, omit patch equivalent commits from these |
Junio C Hamano | b77f819 | 2011-05-05 01:30:38 | [diff] [blame] | 1151 | counts and print the count for equivalent commits separated |
| 1152 | by a tab. |
Junio C Hamano | d2c978f | 2011-03-20 19:42:22 | [diff] [blame] | 1153 | endif::git-rev-list[] |
Junio C Hamano | 8ef91f3 | 2019-12-01 22:58:27 | [diff] [blame] | 1154 | endif::git-shortlog[] |