IT评测·应用市场-qidao123.com

标题: Git log详解 [打印本页]
作者: 一给    时间: 2024-9-18 06:47
标题: Git log详解
用途

git log下令重要用于查察Git版本演变汗青（也就是提交汗青），同时根据追加的参数和选项不同，也会有不同的展示效果。
但默认git log下令显示出的x效果着实太丑，欠好好打扮一下根本没法见人，打扮好了用alias下令拍个照片，就正式出道了！
用法

  1. <em>git log</em> [<options>] [<revision-range>] [[--] <path>…​]
复制代码
功能形貌

（1）不带参数
如果不带任何参数，它会列出全部汗青记录，近来的排在最上方，显示提交对象的哈希值，作者、提交日期、和提交分析
如果记录过多，则按上下键，Enter（向下显示一行），空格（显示下一页），来控制显示。
按q键退出汗青记录列表。
 
（2）常用显示参数
-p：按补丁格式显示每个更新的差异，比下一条--stat下令信息更全。
--stat：显示每次提交修改文件的统计信息，每个提交都列出了修改过的文件，以及此中添加和移除的行数，并在最后列出全部增减行数小计。
--shortstat：只显示--stat中最后的行数添加、修改、删除的统计。
--name-only：仅在提交信息后，显示已修改的文件清单。
--name-status：显示新增、修改、删除的文件清单。
--abbrev-commit：仅显示SHA-1校验和的前几个字符，而非全部的40个字符。
--relative-date：使用较短的相对时间，而不是完备格式显示日期（好比“2 weeks ago”）。
--graph：在日记旁以 ASCII 图形显示分支与归并汗青。
--online：列表的形式查察汗青版本记录，--pretty=oneline --abbrev-commit 实用的简写。
--pretty：使用其他格式显示汗青提交信息。可用的选项包罗oneline、short、full、fuller和 format（用来界说自己的格式）。
（3）--pretty参数
--pretty：自界说格式化显示汗青提交信息。
选项有：
1）--pretty=oneline：一行显示，只显示哈希值和提交分析（--online本身也可以作为单独的属性）。
2）--pretty=format:” "：控制显示信息的格式。
序号    格式    分析
1    %H    提交的完备哈希值(commit-id)。
2    %h    提交的简写哈希值。
3    %T    树的完备哈希值（tree）。
4    %t    树的简写哈希值。
5    %P    父提交（parent）的完备哈希值。
6    %p    父提交的简写哈希值。
7    %an    作者名字（author）。
8    %ae    作者的电子邮件地址。
9    %ad    作者修订日期（可以用 --date=选项 来定制格式）。
10    %ar    作者修订日期，按多久以前的方式显示。
11    %cn    提交者的名字(committer)。
12    %ce    提交者的电子邮件地址。
13    %cd    提交日期（可以用 --date=选项 来定制格式）。
14    %cr    提交日期，按多久以前的方式显示。
15    %s    提交分析。
选项

3）--pretty=format:” "：控制显示信息的颜色。
颜色格式：
％Cred：将颜色切换为红色
％Cgreen：将颜色切换为绿色
％Cblue：将颜色切换为蓝色
%Creset：空格
举例：
执行下令：git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %C(cyan)%s %C(magenta)(%cr) %C(bold blue)<%an>%Creset'
两种效果如下：
我们先进行断句分析：［%Cred%h］［%Creset -］［%C(yellow)%d ］［%Cblue%s］［%Cgreen(%cd)］［%C(bold blue)<%an>］
写法：一个颜色＋一个内容，比方%Cred%h，依次排写。
颜色以%C开头，后边接几种颜色，还可以设置字体，如果要设置字体的话，要一块加个括号。
能设置的颜色值包罗：reset（默认的灰色），normal，black，red，green，yellow，blue，magenta，cyan，white。（不能单独使用就加括号）
字体属性则有bold，dim，ul，blink，reverse。
内容可以是占位元字符，也可以是直接显示的普通字符（比方上面的-
（4）--date=参数
--date=(relative|local|default|iso|rfc|short|raw)
仅对以人类可读格式显示的日期见效，比方使用--pretty.log.date这个config变量设置日记的默认值。
--date有几个默认选项：
--date=relative：显示相对于当前时间的日期，比方"2小时前"。
--date=local：显示用户本地时区中的时间戳。
--date=iso或--date=iso8601：以ISO 8601格式显示时间戳。
--date=rfc或--date=rfc2822：以RFC 2822格式显示时间戳，通常在电子邮件中找到。
--date=short：仅以YYYY-MM-DD格式显示日期，而不显示时间。
--date=raw：以内部原始Git格式%s %z格式显示日期。
--date=default：显示原始时区(提交者或作者)的时间戳。
也可以自界说格式（必要git版本2.6.0以上）：
好比：--date=format:'%Y-%m-%d %H:%M:%S'，会格式化成：2016-01-13 11:32:13。
其他的格式化占位符如下：
%a：星期的缩写。
%A：星期的全名。
%b：月份的缩写。
%B：月份的全称。
%c：实用于区域设置的日期和时间表现。
%d：月中的天作为十进制数字（01 – 31）。
%H： 24小时制的小时（00 – 23）。
%I：2小时格式的小时（01 – 12）。
%j：一年中的天作为十进制数字（001 – 366）。
%m：以十进制数字表现的月份（01 – 12）。
%M：分钟以十进制数字表现（00 – 59）。
%p：当前语言情况的"上午/下战书"，12小时制的指示器。
%S：秒作为十进制数字（00 – 59）。
%U：一年中的周为十进制数字，周日为一周的第一天（00 – 53）。
%w：工作日为十进制数字（0 – 6；星期日为0）。
%W：一年中的星期作为十进制数字，星期一作为星期的第一天（00 – 53）
%x：当前语言情况的日期表现。
%X：当前语言情况的时间表现。
%y：无世纪的年份，为十进制数字（00 – 99），也就是年份没有前两位。
%Y：带世纪的年份，以十进制数表现。
%z，%Z：时区名称或时区缩写，取决于注册表设置； 如果时区未知，则没有字符。
%%：表现百分号。
（5）筛选参数
1）按数量
-n：显示前n条提交信息。
 
2）按日期
--after=
好比git log --after="2014-7-1”，显示2014年7月1号之后的commit(包含7月1号)。
后边的日期还可以用相对时间表现，好比"1 week ago"和”yesterday"，好比git log --after="yesterda
--before=：同上。
另外这两条下令可以同时使用表现时间段，好比git log --after="2014-7-1" --before="2014-7-4"
同理：--since、--until和--after、--before是一个意思。
--since, --after：仅显示指定时间之后的提交。
--until, --before：仅显示指定时间之前的提交。

3）按作者和提交者
--author=：仅显示作者匹配指定字符串的提交。
好比git log --author=“John"，显示John贡献的commit。
留意：作者名不必要准确匹配，只必要包含就行了。
而且可以使用正则表达式，好比git log --author="John|Mary”，搜索Marry和John贡献的commit。
而且这个--author不但包含作者名，还包含作者的email，所以你可以用这个搜索email。
--committer：仅显示提交者匹配指定字符串的提交。
4）按commit形貌
--grep=：仅显示提交分析中包含指定字符串的提交。
好比：git log --grep="JRA-224"
而且可以传入-i用来忽略巨细写。
留意：如果想同时使用--grep和--author，必须在附加一个--all-match参数。
 
5）按文件
--（空格）文件或--［后边没有文件］
 有时你可能只对某个文件的修改感兴趣，或你只想查察跟某个文件相关的汗青信息，你只必要插入你感兴趣文件的路径，［对，是路径，所以经常是不太好用］就可以了。
好比：git log -- foo.py bar.py ，只返回和foo.py文件或bar.py文件的相关commit。
这里的--是告诉Git，背面的参数是文件路径而不是branch（分支）的名字。 如果背面的文件路径不会和某个branch产生肴杂，你可以省略--，好比git log foo.py。
另外，后边的路径还支持正则，好比：git log *install.md ，是指定项目路径下的全部以install.md结尾文件的提交汗青。
另外，文件名应该放到参数的最后位置，通常在前面加上--并用空格隔开表现是文件。
另外，git log file/，可以查察file文件夹下全部文件的提交记录。
6）按分支
--：

--branchName branchName参数：为任意一个分支名字，查察某个分支上的提交记录。
必要放到参数中的最后位置处。
如果分支名与文件名相同，系统会提示错误，可通过--选项，来指定给定的参数，是分支名还是文件名。
好比：在当前分支中有一个名为v1的文件，同时还存在一个名为v1的分支。如下：
git log v1 --，此时的v1代表的是分支名字（--后边是空的）。
git log -- v1，此时的v1代表的是名为v1的文件。
git log v1 -- v1：代表v1分支下的v1文件。
7）按内容
-S"<string>"、-G"<string>"：仅显示添加或删除内容匹配指定字符串的提交。
 有时你想搜索，新增或删除某行代码相关的commit. 可以使用这条下令。
假设你想知道Hello,World!这句话，是什么时候加入到项目里去的，可以用：git log -S"Hello,World!"。
另外，如果你想使用正则表达式去匹配，而不是字符串，那么你可以使用-G代替-S。
这是一个非常有用的debug工具，使用他可以定位全部跟某行代码相关的commit，甚至可以查察某行是什么时候被copy的，什么时候移到另外一个文件中去的。
留意：-S后没有"="，与查询内容之间也没有空格符。
8）按范围
git log <since>..<until>：
 这个下令可以查察某个范围的commit。
这个下令非常有用当你使用branch做为range参数的时候. 能很方便的显示2个branch（分支）之间的不同。
好比：git log master..feature，master..feature这个range（范围），包含了在feature分支存在，而在master分支没有的全部commit。同样，如果是feature..master，意思是包含全部master分支有，但是feature分支没有的commit。
另外，如果是三个点，表现或的意思：git log master...test，意思是查询master或test分支中的提交记录。
9）过滤掉merge commit
--no-merges：
 默认情况下git log会输出merge commit（归并提交）。你可以通过--no-merges标记来过滤掉merge commit，比方：git log --no-merges。
另外，如果你只对merge commit感兴趣可以使用--merges参数，比方：git log --merges。
10）按标签tag
git log v1.0：
直接这样是查询标签之前的commit。
加两个点，比方：git log v1.0..，是查询从v1.0以后的提交汗青记录(不包含v1.0)。
11）按commit 
git log commit：查询commit之前的记录，包含commit。
git log commit1 commit2：查询commit1与commit2之间的记录，包罗commit1和commit2。
git log commit1..commit2：同上，但是不包罗commit1。
分析：
此中，commit可以是提交哈希值的简写模式，也可以使用HEAD代替。
HEAD代表最后一次提交，HEAD^为最后一个提交的父提交，等同于HEAD~1。
HEAD~2代表倒数第二次提交。
汗青简化

<paths>
--simplify-by-decoration
--show-pulls
--full-history
Same as the default mode, but does not prune some history.
--dense
Only the selected commits are shown, plus some to have a meaningful history.
--sparse
All commits in the simplified history are shown.
--simplify-merges
Additional option to --full-history to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge.
--ancestry-path[=<commit>]
When given a range of commits to display (e.g. commit1..commit2 or commit2 ^commit1), only display commits in that range that are ancestors of <commit>, descendants of <commit>, or <commit> itself. If no commit is specified, use commit1 (the excluded part of the range) as <commit>. Can be passed multiple times; if so, a commit is included if it is any of the commits given or if it is an ancestor or descendant of one of them.
A more detailed explanation follows.
Suppose you specified foo as the <paths>. We shall call commits that modify foo !TREESAME, and the rest TREESAME. (In a diff filtered for foo, they look different and equal, respectively.)
In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file foo in this commit graph:
  1.           .-A---M---N---O---P---Q
  2.          /     /   /   /   /   /
  3.         I     B   C   D   E   Y
  4.          \   /   /   /   /   /
  5.           `-------------'   X
复制代码
The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:

rev-list walks backwards through history, including or excluding commits based on whether --full-history and/or parent rewriting (via --parents or --children) are used. The following settings are available.
Default mode
Commits are included if they are not TREESAME to any parent (though this can be changed, see --sparse below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents.
This results in:
  1.           .-A---N---O
  2.          /     /   /
  3.         I---------D
复制代码
Note how the rule to only follow the TREESAME parent, if one is available, removed B from consideration entirely. C was considered via N, but is TREESAME. Root commits are compared to an empty tree, so I is !TREESAME.
Parent/child relations are only visible with --parents, but that does not affect the commits selected in default mode, so we have shown the parent lines.
--full-history without parent rewriting
This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get
  1.         I  A  B  N  D  O  P  Q
复制代码
M was excluded because it is TREESAME to both parents. E, C and B were all walked, but only B was !TREESAME, so the others do not appear.
Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected.
--full-history with parent rewriting
Ordinary commits are only included if they are !TREESAME (though this can be changed, see --sparse below).
Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in
  1.           .-A---M---N---O---P---Q
  2.          /     /   /   /   /
  3.         I     B   /   D   /
  4.          \   /   /   /   /
  5.           `-------------'
复制代码
Compare to --full-history without rewriting above. Note that E was pruned away because it is TREESAME, but the parent list of P was rewritten to contain E's parent I. The same happened for C and N, and X, Y and Q.
In addition to the above settings, you can change whether TREESAME affects inclusion:
--dense
Commits that are walked are included if they are not TREESAME to any parent.
--sparse
All commits that are walked are included.
Note that without --full-history, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked.
--simplify-merges
First, build a history graph in the same way that --full-history with parent rewriting does (see above).
Then simplify each commit C to its replacement C' in the final history according to the following rules:

The effect of this is best shown by way of comparing to --full-history with parent rewriting. The example turns into:
  1.           .-A---M---N---O
  2.          /     /       /
  3.         I     B       D
  4.          \   /       /
  5.           `---------'
复制代码
Note the major differences in N, P, and Q over --full-history:

There is another simplification mode available:
--ancestry-path[=<commit>]
Limit the displayed commits to those which are an ancestor of <commit>, or which are a descendant of <commit>, or are <commit> itself.
As an example use case, consider the following commit history:
  1.             D---E-------F
  2.            /     \       \
  3.           B---C---G---H---I---J
  4.          /                     \
  5.         A-------K---------------L--M
复制代码
A regular D..M computes the set of commits that are ancestors of M, but excludes the ones that are ancestors of D. This is useful to see what happened to the history leading to M since D, in the sense that “what does M have that did not exist in D”. The result in this example would be all the commits, except A and B (and D itself, of course).
When we want to find out what commits in M are contaminated with the bug introduced by D and need fixing, however, we might want to view only the subset of D..M that are actually descendants of D, i.e. excluding C and K. This is exactly what the --ancestry-path option does. Applied to the D..M range, it results in:
  1.                 E-------F
  2.                  \       \
  3.                   G---H---I---J
  4.                                \
  5.                                 L--M
复制代码
We can also use --ancestry-path=D instead of --ancestry-path which means the same thing when applied to the D..M range but is just more explicit.
If we instead are interested in a given topic within this range, and all commits affected by that topic, we may only want to view the subset of D..M which contain that topic in their ancestry path. So, using --ancestry-path=H D..M for example would result in:
  1.                 E
  2.                  \
  3.                   G---H---I---J
  4.                                \
  5.                                 L--M
复制代码
Whereas --ancestry-path=K D..M would result in
  1.                 K---------------L--M
复制代码
Before discussing another option, --show-pulls, we need to create a new example history.
A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file’s simplified history. Let’s demonstrate a new example and show how options such as --full-history and --simplify-merges works in that case:
  1.           .-A---M-----C--N---O---P
  2.          /     / \  \  \/   /   /
  3.         I     B   \  R-'`-Z'   /
  4.          \   /     \/         /
  5.           \ /      /\        /
  6.            `---X--'  `---Y--'
复制代码
For this example, suppose I created file.txt which was modified by A, B, and X in different ways. The single-parent commits C, Z, and Y do not change file.txt. The merge commit M was created by resolving the merge conflict to include both changes from A and B and hence is not TREESAME to either. The merge commit R, however, was created by ignoring the contents of file.txt at M and taking only the contents of file.txt at X. Hence, R is TREESAME to X but not M. Finally, the natural merge resolution to create N is to take the contents of file.txt at R, so N is TREESAME to R but not C. The merge commits O and P are TREESAME to their first parents, but not to their second parents, Z and Y respectively.
When using the default mode, N and R both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:
  1.         I---X
复制代码
When using --full-history, Git walks every edge. This will discover the commits A and B and the merge M, but also will reveal the merge commits O and P. With parent rewriting, the resulting graph is:
  1.           .-A---M--------N---O---P
  2.          /     / \  \  \/   /   /
  3.         I     B   \  R-'`--'   /
  4.          \   /     \/         /
  5.           \ /      /\        /
  6.            `---X--'  `------'
复制代码
Here, the merge commits O and P contribute extra noise, as they did not actually contribute a change to file.txt. They only merged a topic that was based on an older version of file.txt. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: many unrelated merges appear in the --full-history results.
When using the --simplify-merges option, the commits O and P disappear from the results. This is because the rewritten second parents of O and P are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit N, resulting in a history view as follows:
  1.           .-A---M--.
  2.          /     /    \
  3.         I     B      R
  4.          \   /      /
  5.           \ /      /
  6.            `---X--'
复制代码
In this view, we see all of the important single-parent changes from A, B, and X. We also see the carefully-resolved merge M and the not-so-carefully-resolved merge R. This is usually enough information to determine why the commits A and B "disappeared" from history in the default view. However, there are a few issues with this approach.
The first issue is performance. Unlike any previous option, the --simplify-merges option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories.
The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge R above is not likely to be the merge commit that was used to merge into an important branch. Instead, the merge N was used to merge R and X into the important branch. This commit may have information about why the change X came to override the changes from A and B in its commit message.
--show-pulls
In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent.
When a merge commit is included by --show-pulls, the merge is treated as if it "pulled" the change from another branch. When using --show-pulls on this example (and no other options) the resulting graph is:
  1.         I---X---R---N
复制代码
Here, the merge commits R and N are included because they pulled the commits X and R into the base branch, respectively. These merges are the reason the commits A and B do not appear in the default history.
When --show-pulls is paired with --simplify-merges, the graph includes all of the necessary information:
  1.           .-A---M--.   N
  2.          /     /    \ /
  3.         I     B      R
  4.          \   /      /
  5.           \ /      /
  6.            `---X--'
复制代码
Notice that since M is reachable from R, the edge from N to M was simplified away. However, N still appears in the history as an important commit because it "pulled" the change R into the main branch.
The --simplify-by-decoration option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away).
Commit Ordering

By default, the commits are shown in reverse chronological order.
--date-order
Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order.
--author-date-order
Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order.
--topo-order
Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed.
For example, in a commit history like this:
  1.     ---1----2----4----7
  2.         \              \
  3.          3----5----6----8---
复制代码
where the numbers denote the order of commit timestamps, git rev-list and friends with --date-order show the commits in the timestamp order: 8 7 6 5 4 3 2 1.
With --topo-order, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together.
--reverse
Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with --walk-reflogs.
Object Traversal

These options are mostly targeted for packing of Git repositories.
--no-walk[=(sorted|unsorted)]
Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument unsorted is given, the commits are shown in the order they were given on the command line. Otherwise (if sorted or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with --graph.
--do-walk
Overrides a previous --no-walk.
Commit Formatting

--pretty[=<format>]
--format=<format>
Pretty-print the contents of the commit logs in a given format, where <format> can be one of oneline, short, medium, full, fuller, reference, email, raw, format:<string> and tformat:<string>. When <format> is none of the above, and has %placeholder in it, it acts as if --pretty=tformat:<format> were given.
See the "RETTY FORMATS" section for some additional details for each format. When =<format> part is omitted, it defaults to medium.
Note: you can specify the default pretty format in the repository configuration (see git-config(1)).
--abbrev-commit
Instead of showing the full 40-byte hexadecimal commit object name, show a prefix that names the object uniquely. "--abbrev=<n>" (which also modifies diff output, if it is displayed) option can be used to specify the minimum length of the prefix.
This should make "--pretty=oneline" a whole lot more readable for people using 80-column terminals.
--no-abbrev-commit
Show the full 40-byte hexadecimal commit object name. This negates --abbrev-commit, either explicit or implied by other options such as "--oneline". It also overrides the log.abbrevCommit variable.
--oneline
This is a shorthand for "--pretty=oneline --abbrev-commit" used together.
--encoding=<encoding>
Commit objects record the character encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF-8. Note that if an object claims to be encoded in X and we are outputting in X, we will output the object verbatim; this means that invalid sequences in the original commit may be copied to the output. Likewise, if iconv(3) fails to convert the commit, we will quietly output the original object verbatim.
--expand-tabs=<n>
--expand-tabs
--no-expand-tabs
Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of <n>) in the log message before showing it in the output. --expand-tabs is a short-hand for --expand-tabs=8, and --no-expand-tabs is a short-hand for --expand-tabs=0, which disables tab expansion.
By default, tabs are expanded in pretty formats that indent the log message by 4 spaces (i.e. medium, which is the default, full, and fuller).
--notes[=<ref>]
Show the notes (see git-notes(1)) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when there is no --pretty, --format, or --oneline option given on the command line.
By default, the notes shown are from the notes refs listed in the core.notesRef and notes.displayRef variables (or corresponding environment overrides). See git-config(1) for more details.
With an optional <ref> argument, use the ref to find the notes to display. The ref can specify the full refname when it begins with refs/notes/; when it begins with notes/, refs/ and otherwise refs/notes/ is prefixed to form the full name of the ref.
Multiple --notes options can be combined to control which notes are being displayed. Examples: "--notes=foo" will show only notes from "refs/notes/foo"; "--notes=foo --notes" will show both notes from "refs/notes/foo" and from the default notes ref(s).
--no-notes
Do not show notes. This negates the above --notes option, by resetting the list of notes refs from which notes are shown. Options are parsed in the order given on the command line, so e.g. "--notes --notes=foo --no-notes --notes=bar" will only show notes from "refs/notes/bar".
--show-notes-by-default
Show the default notes unless options for displaying specific notes are given.
--show-notes[=<ref>]
--[no-]standard-notes
These options are deprecated. Use the above --notes/--no-notes options instead.
--show-signature
Check the validity of a signed commit object by passing the signature to gpg --verify and show the output.
--relative-date
Synonym for --date=relative.
--date=<format>
Only takes effect for dates shown in human-readable format, such as when using --pretty. log.date config variable sets a default value for the log command’s --date option. By default, dates are shown in the original time zone (either committer’s or author’s). If -local is appended to the format (e.g., iso-local), the user’s local time zone is used instead.
--date=relative shows dates relative to the current time, e.g. “2 hours ago”. The -local option has no effect for --date=relative.
--date=local is an alias for --date=default-local.
--date=iso (or --date=iso8601) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:

--date=iso-strict (or --date=iso8601-strict) shows timestamps in strict ISO 8601 format.
--date=rfc (or --date=rfc2822) shows timestamps in RFC 2822 format, often found in email messages.
--date=short shows only the date, but not the time, in YYYY-MM-DD format.
--date=raw shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a + or - with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with strftime("%s %z")). Note that the -local option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value.
--date=human shows the timezone if the timezone does not match the current time-zone, and doesn’t print the whole date if that matches (ie skip printing year for dates that are "this year", but also skip the whole date itself if it’s in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted.
--date=unix shows the date as a Unix epoch timestamp (seconds since 1970). As with --raw, this is always in UTC and therefore -local has no effect.
--date=format:... feeds the format ... to your system strftime, except for %s, %z, and %Z, which are handled internally. Use --date=format:%c to show the date in your system locale’s preferred format. See the strftime manual for a complete list of format placeholders. When using -local, the correct syntax is --date=format-local:....
--date=default is the default format, and is based on ctime(3) output. It shows a single line with three-letter day of the week, three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS" format, followed by 4-digit year, plus timezone information, unless the local time zone is used, e.g. Thu Jan 1 00:00:00 1970 +0000.
--parents
Print also the parents of the commit (in the form "commit parent…​"). Also enables parent rewriting, see History Simplification above.
--children
Print also the children of the commit (in the form "commit child…​"). Also enables parent rewriting, see History Simplification above.
--left-right
Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with < and those from the right with >. If combined with --boundary, those commits are prefixed with -.
For example, if you have this topology:
  1.              y---b---b  branch B
  2.             / \ /
  3.            /   .
  4.           /   / \
  5.          o---x---a---a  branch A
复制代码
you would get an output like this:
  1.         $ git rev-list --left-right --boundary --pretty=oneline A...B
  3.         >bbbbbbb... 3rd on b
  4.         >bbbbbbb... 2nd on b
  5.         <aaaaaaa... 3rd on a
  6.         <aaaaaaa... 2nd on a
  7.         -yyyyyyy... 1st on b
  8.         -xxxxxxx... 1st on a
复制代码
--graph
Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with --no-walk.
This enables parent rewriting, see History Simplification above.
This implies the --topo-order option by default, but the --date-order option may also be specified.
--show-linear-break[=<barrier>]
When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If <barrier> is specified, it is the string that will be shown instead of the default one.
PRETTY FORMATS

If the commit is a merge, and if the pretty-format is not oneline, email or raw, an additional line is inserted before the Author: line. This line begins with "Merge: " and the hashes of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the direct parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file.
There are several built-in formats, and you can define additional formats by setting a pretty.<name> config option to either another format name, or a format: string, as described below (see git-config(1)). Here are the details of the built-in formats:

NOTE
Some placeholders may depend on other options given to the revision traversal engine. For example, the %g* reflog options will insert an empty string unless we are traversing reflog entries (e.g., by git log -g). The %d and %D placeholders will use the "short" decoration format if --decorate was not already provided on the command line.
The boolean options accept an optional value [=<bool-value>]. The values true, false, on, off etc. are all accepted. See the "boolean" sub-section in "EXAMPLES" in git-config(1). If a boolean option is given with no value, it’s enabled.
If you add a + (plus sign) after % of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string.
If you add a - (minus sign) after % of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string.
If you add a ` ` (space) after % of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string.

DIFF FORMATTING

By default, git log does not generate any diff output. The options below can be used to show the changes made by each commit.
Note that unless one of --diff-merges variants (including short -m, -c, --cc, and --dd options) is explicitly given, merge commits will not show a diff, even if a diff format like --patch is selected, nor will they match search options like -S. The exception is when --first-parent is in use, in which case first-parent is the default format for merge commits.
-p
-u
--patch
Generate patch (see Generating patch text with -p).
-s
--no-patch
Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to squelch their output, or to cancel the effect of options like --patch, --stat earlier on the command line in an alias.
-m
Show diffs for merge commits in the default format. This is similar to --diff-merges=on, except -m will produce no output unless -p is given as well.
-c
Produce combined diff output for merge commits. Shortcut for --diff-merges=combined -p.
--cc
Produce dense combined diff output for merge commits. Shortcut for --diff-merges=dense-combined -p.
--dd
Produce diff with respect to first parent for both merge and regular commits. Shortcut for --diff-merges=first-parent -p.
--remerge-diff
Produce remerge-diff output for merge commits. Shortcut for --diff-merges=remerge -p.
--no-diff-merges
Synonym for --diff-merges=off.
--diff-merges=<format>
Specify diff format to be used for merge commits. Default is `off` unless --first-parent is in use, in which case first-parent is the default.
The following formats are supported:
off, none
Disable output of diffs for merge commits. Useful to override implied value.
on, m
Make diff output for merge commits to be shown in the default format. The default format can be changed using log.diffMerges configuration variable, whose default value is separate.
first-parent, 1
Show full diff with respect to first parent. This is the same format as --patch produces for non-merge commits.
separate
Show full diff with respect to each of parents. Separate log entry and diff is generated for each parent.
combined, c
Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents.
dense-combined, cc
Further compress output produced by --diff-merges=combined by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification.
remerge, r
Remerge two-parent merge commits to create a temporary tree object—​potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit.
The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented).
--combined-all-paths
This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when --diff-merges=[dense-]combined is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested).
-U<n>
--unified=<n>
Generate diffs with <n> lines of context instead of the usual three. Implies --patch.
--output=<file>
Output to a specific file instead of stdout.
--output-indicator-new=<char>
--output-indicator-old=<char>
--output-indicator-context=<char>
Specify the character used to indicate new, old or context lines in the generated patch. Normally they are +, - and ' ' respectively.
--raw
For each commit, show a summary of changes using the raw diff format. See the "RAW OUTPUT FORMAT" section of git-diff(1). This is different from showing the log itself in raw format, which you can achieve with --format=raw.
--patch-with-raw
Synonym for -p --raw.
-t
Show the tree objects in the diff output.
--indent-heuristic
Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.
--no-indent-heuristic
Disable the indent heuristic.
--minimal
Spend extra time to make sure the smallest possible diff is produced.
--patience
Generate a diff using the "patience diff" algorithm.
--histogram
Generate a diff using the "histogram diff" algorithm.
--anchored=<text>
Generate a diff using the "anchored diff" algorithm.
This option may be specified more than once.
If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.
--diff-algorithm={patience|minimal|histogram|myers}
Choose a diff algorithm. The variants are as follows:
default, myers
The basic greedy diff algorithm. Currently, this is the default.
minimal
Spend extra time to make sure the smallest possible diff is produced.
patience
Use "patience diff" algorithm when generating patches.
histogram
This algorithm extends the patience algorithm to "support low-occurrence common elements".
For instance, if you configured the diff.algorithm variable to a non-default value and want to use the default one, then you have to use --diff-algorithm=default option.
--stat[=<width>[,<name-width>[,<count>]]]
Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting diff.statNameWidth=<width>. The width of the graph part can be limited by using --stat-graph-width=<width> or by setting diff.statGraphWidth=<width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. By giving a third parameter <count>, you can limit the output to the first <count> lines, followed by ... if there are more.
These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.
--compact-summary
Output a condensed summary of extended header information such as file creations or deletions ("new" or "gone", optionally "+l" if it’s a symlink) and mode changes ("+x" or "-x" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.
--numstat
Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.
--shortstat
Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.
-X[<param1,param2,…​>]
--dirstat[=<param1,param2,…​>]
Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by passing it a comma separated list of parameters. The defaults are controlled by the diff.dirstat configuration variable (see git-config(1)). The following parameters are available:
changes
Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given.
lines
Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive --dirstat behavior than the changes behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other --*stat options.
files
Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest --dirstat behavior, since it does not have to look at the file contents at all.
cumulative
Count changes in a child directory for the parent directory as well. Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.
<limit>
An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output.
Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.
--cumulative
Synonym for --dirstat=cumulative
--dirstat-by-file[=<param1,param2>…​]
Synonym for --dirstat=files,<param1>,<param2>…​
--summary
Output a condensed summary of extended header information such as creations, renames and mode changes.
--patch-with-stat
Synonym for -p --stat.
-z
Separate the commits with NULs instead of newlines.
Also, when --raw or --numstat has been given, do not munge pathnames and use NULs as output field terminators.
Without this option, pathnames with "unusual" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1)).
--name-only
Show only names of changed files. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.
--name-status
Show only names and status of changed files. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.
--submodule[=<format>]
Specify how differences in submodules are shown. When specifying --submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to diff.submodule or the short format if the config option is unset.
--color[=<when>]
Show colored diff. --color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto.
--no-color
Turn off colored diff. It is the same as --color=never.
--color-moved[=<mode>]
Moved lines of code are colored differently. The <mode> defaults to no if the option is not given and to zebra if the option with no mode is given. The mode must be one of:
no
Moved lines are not highlighted.
default
Is a synonym for zebra. This may change to a more sensible mode in the future.
plain
Any line that is added in one location and was removed in another location will be colored with color.diff.newMoved. Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.
blocks
Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the color.diff.{old,new}Moved color. Adjacent blocks cannot be told apart.
zebra
Blocks of moved text are detected as in blocks mode. The blocks are painted using either the color.diff.{old,new}Moved color or color.diff.{old,new}MovedAlternative. The change between the two colors indicates that a new block was detected.
dimmed-zebra
Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.
--no-color-moved
Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.
--color-moved-ws=<modes>
This configures how whitespace is ignored when performing the move detection for --color-moved. These modes can be given as a comma separated list:
no
Do not ignore whitespace when performing move detection.
ignore-space-at-eol
Ignore changes in whitespace at EOL.
ignore-space-change
Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.
ignore-all-space
Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.
allow-indentation-change
Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes.
--no-color-moved-ws
Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.
--word-diff[=<mode>]
Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see --word-diff-regex below. The <mode> defaults to plain, and must be one of:
color
Highlight changed words using only colors. Implies --color.
plain
Show words as [-removed-] and {+added+}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.
porcelain
Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a +/-/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.
none
Disable word diff again.
Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled.
--word-diff-regex=<regex>
Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.
Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline.
For example, --word-diff-regex=. will treat each character as a word and, correspondingly, show differences character by character.
The regex can also be set via a diff driver or configuration option, see gitattributes(5) or git-config(1). Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings.
--color-words[=<regex>]
Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.
--no-renames
Turn off rename detection, even when the configuration file gives the default to do so.
--[no-]rename-empty
Whether to use empty blobs as rename source.
--check
Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code.
--ws-error-highlight=<kind>
Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, none resets previous values, default reset the list to new and all is a shorthand for old,new,context. When this option is not given, and the configuration variable diff.wsErrorHighlight is not set, only whitespace errors in new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.
--full-index
Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.
--binary
In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.
--abbrev[=<n>]
Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show the shortest prefix that is at least <n> hexdigits long that uniquely refers the object. In diff-patch output format, --full-index takes higher precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.
-B[<n>][/<m>]
--break-rewrites[=[<n>][/<m>]]
Break complete rewrite changes into pairs of delete and create. This serves two purposes:
It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number m controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).
When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number n controls this aspect of the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.
-M[<n>]
--find-renames[=<n>]
If generating diffs, detect and report renames for each commit. For following files across renames while traversing history, see --follow. If n is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file hasn’t changed. Without a % sign, the number is to be read as a fraction, with a decimal point before it. I.e., -M5 becomes 0.5, and is thus the same as -M50%. Similarly, -M05 is the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.
-C[<n>]
--find-copies[=<n>]
Detect copies as well as renames. See also --find-copies-harder. If n is specified, it has the same meaning as for -M<n>.
--find-copies-harder
For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.
-D
--irreversible-delete
Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch is not meant to be applied with patch or git apply; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option.
When used together with -B, omit also the preimage in the deletion part of a delete/create pair.
-l<num>
The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources. (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.
--diff-filter=[(A|C|D|M|R|T|U|X|B)…​
  • ]
    Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (i.e. regular file, symlink, submodule, …​) changed (T), are Unmerged (U), are Unknown (X), or have had their pairing Broken (B). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.
    Also, these upper-case letters can be downcased to exclude. E.g. --diff-filter=ad excludes added and deleted paths.
    Note that not all diffs can feature all types. For instance, copied and renamed entries cannot appear if detection for those types is disabled.
    -S<string>
    Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter’s use.
    It is useful when you’re looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into -S, and keep going until you get the very first version of the block.
    Binary files are searched as well.
    -G<regex>
    Look for differences whose patch text contains added/removed lines that match <regex>.
    To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same file:
    1. +    return frotz(nitfol, two->ptr, 1, 0);
    2. ...
    3. -    hit = frotz(nitfol, mf2.ptr, 1, 0);
    复制代码
    While git log -G"frotz\(nitfol" will show this commit, git log -S"frotz\(nitfol" --pickaxe-regex will not (because the number of occurrences of that string did not change).
    Unless --text is supplied patches of binary files without a textconv filter will be ignored.
    See the pickaxe entry in gitdiffcore(7) for more information.
    --find-object=<object-id>
    Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different in that it doesn’t search for a specific string but for a specific object id.
    The object can be a blob or a submodule commit. It implies the -t option in git-log to also find trees.
    --pickaxe-all
    When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change in <string>.
    --pickaxe-regex
    Treat the <string> given to -S as an extended POSIX regular expression to match.
    -O<orderfile>
    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable (see git-config(1)). To cancel diff.orderFile, use -O/dev/null.
    The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order.
    <orderfile> is parsed as follows:

    Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".
    --skip-to=<file>
    --rotate-to=<file>
    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.
    -R
    Swap two inputs; that is, show differences from index or on-disk file to tree contents.
    --relative[=<path>]
    --no-relative
    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.
    -a
    --text
    Treat all files as text.
    --ignore-cr-at-eol
    Ignore carriage-return at the end of line when doing a comparison.
    --ignore-space-at-eol
    Ignore changes in whitespace at EOL.
    -b
    --ignore-space-change
    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.
    -w
    --ignore-all-space
    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.
    --ignore-blank-lines
    Ignore changes whose lines are all blank.
    -I<regex>
    --ignore-matching-lines=<regex>
    Ignore changes whose all lines match <regex>. This option may be specified more than once.
    --inter-hunk-context=<lines>
    Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.
    -W
    --function-context
    Show whole function as context lines for each change. The function names are determined in the same way as git diff works out patch hunk headers (see Defining a custom hunk-header in gitattributes(5)).
    --ext-diff
    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.
    --no-ext-diff
    Disallow external diff drivers.
    --textconv
    --no-textconv
    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for git-diff(1) and git-log(1), but not for git-format-patch(1) or diff plumbing commands.
    --ignore-submodules[=<when>]
    Ignore changes to submodules in the diff generation. <when> can be either "none", "untracked", "dirty" or "all", which is the default. Using "none" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the ignore option in git-config(1) or gitmodules(5). When "untracked" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using "dirty" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using "all" hides all changes to submodules.
    --src-prefix=<prefix>
    Show the given source prefix instead of "a/".
    --dst-prefix=<prefix>
    Show the given destination prefix instead of "b/".
    --no-prefix
    Do not show any source or destination prefix.
    --default-prefix
    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix (see git-config(1)).
    --line-prefix=<prefix>
    Prepend an additional prefix to every line of output.
    --ita-invisible-in-index
    By default entries added by "git add -N" appear as an existing empty file in "git diff" and a new file in "git diff --cached". This option makes the entry appear as a new file in "git diff" and non-existent in "git diff --cached". This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.
    For more detailed explanation on these common options, see also gitdiffcore(7).
    Generating patch text with -p

    Running git-diff(1), git-log(1), git-show(1), git-diff-index(1), git-diff-tree(1), or git-diff-files(1) with the -p option produces patch text. You can customize the creation of patch text via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables (see git(1)), and the diff attribute (see gitattributes(5)).
    What the -p option produces is slightly different from the traditional diff format:
    Combined diff format

    Any diff-generating command can take the -c or --cc option to produce a combined diff when showing a merge. This is the default format when showing merges with git-diff(1) or git-show(1). Note also that you can give suitable --diff-merges option to any of these commands to force generation of diffs in a specific format.
    A "combined diff" format looks like this:
    1. diff --combined describe.c
    2. index fabadb8,cc95eb0..4866510
    3. --- a/describe.c
    4. +++ b/describe.c
    5. @@@ -98,20 -98,12 +98,20 @@@
    6.         return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
    7.   }
    9. - static void describe(char *arg)
    10. -static void describe(struct commit *cmit, int last_one)
    11. ++static void describe(char *arg, int last_one)
    12.   {
    13. +      unsigned char sha1[20];
    14. +      struct commit *cmit;
    15.         struct commit_list *list;
    16.         static int initialized = 0;
    17.         struct commit_name *n;
    19. +      if (get_sha1(arg, sha1) < 0)
    20. +              usage(describe_usage);
    21. +      cmit = lookup_commit_reference(sha1);
    22. +      if (!cmit)
    23. +              usage(describe_usage);
    24. +
    25.         if (!initialized) {
    26.                 initialized = 1;
    27.                 for_each_ref(get_name);
    复制代码
    Unlike the traditional unified diff format, which shows two files A and B with a single column that has - (minus — appears in A but removed in B), + (plus — missing in A but added to B), or " " (space — unchanged) prefix, this format compares two or more files file1, file2,…​ with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X’s line is different from it.
    A - character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).
    In the above example output, the function signature was changed from both files (hence two - removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with +).
    When shown by git diff-tree -c, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by git diff-files -c, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").
    EXAMPLES

    git log --no-merges
    Show the whole commit history, but skip any merges
    git log v2.6.12.. include/scsi drivers/scsi
    Show all commits since version v2.6.12 that changed any file in the include/scsi or drivers/scsi subdirectories
    git log --since="2 weeks ago" -- gitk
    Show the changes during the last two weeks to the file gitk. The -- is necessary to avoid confusion with the branch named gitk
    git log --name-status release..test
    Show the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths each commit modifies.
    git log --follow builtin/rev-list.c
    Shows the commits that changed builtin/rev-list.c, including those commits that occurred before the file was given its present name.
    git log --branches --not --remotes=origin
    Shows all commits that are in any of local branches but not in any of remote-tracking branches for origin (what you have that origin doesn’t).
    git log master --not --remotes=*/master
    Shows all commits that are in local master but not in any remote repository master branches.
    git log -p -m --first-parent
    Shows the history including change diffs, but only from the “main branch” perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch.
    git log -L '/int main/',/^}/:main.c
    Shows how the function main() in the file main.c evolved over time.
    git log -3
    Limits the number of commits to show to 3.
    DISCUSSION

    Git is to some extent character encoding agnostic.

    Although we encourage that the commit log messages are encoded in UTF-8, both the core and Git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, Git does not forbid it. However, there are a few things to keep in mind.
    Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a reversible operation.
    CONFIGURATION

    See git-config(1) for core variables and git-diff(1) for settings related to diff generation.
    format.pretty
    Default for the --format option. (See Pretty Formats above.) Defaults to medium.
    i18n.logOutputEncoding
    Encoding to use when displaying logs. (See Discussion above.) Defaults to the value of i18n.commitEncoding if set, and UTF-8 otherwise.
    Everything above this line in this section isn’t included from the git-config(1) documentation. The content that follows is the same as what’s found there:
    log.abbrevCommit
    If true, makes git-log(1), git-show(1), and git-whatchanged(1) assume --abbrev-commit. You may override this option with --no-abbrev-commit.
    log.date
    Set the default date-time mode for the log command. Setting a value for log.date is similar to using git log's --date option. See git-log(1) for details.
    If the format is set to "auto:foo" and the pager is in use, format "foo" will be used for the date format. Otherwise, "default" will be used.
    log.decorate
    Print out the ref names of any commits that are shown by the log command. If short is specified, the ref name prefixes refs/heads/, refs/tags/ and refs/remotes/ will not be printed. If full is specified, the full ref name (including prefix) will be printed. If auto is specified, then if the output is going to a terminal, the ref names are shown as if short were given, otherwise no ref names are shown. This is the same as the --decorate option of the git log.
    log.initialDecorationSet
    By default, git log only shows decorations for certain known ref namespaces. If all is specified, then show all refs as decorations.
    log.excludeDecoration
    Exclude the specified patterns from the log decorations. This is similar to the --decorate-refs-exclude command-line option, but the config option can be overridden by the --decorate-refs option.
    log.diffMerges
    Set diff format to be used when --diff-merges=on is specified, see --diff-merges in git-log(1) for details. Defaults to separate.
    log.follow
    If true, git log will act as if the --follow option was used when a single <path> is given. This has the same limitations as --follow, i.e. it cannot be used to follow multiple files and does not work well on non-linear history.
    log.graphColors
    A list of colors, separated by commas, that can be used to draw history lines in git log --graph.
    log.showRoot
    If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like git-log(1) or git-whatchanged(1), which normally hide the root commit will now show it. True by default.
    log.showSignature
    If true, makes git-log(1), git-show(1), and git-whatchanged(1) assume --show-signature.
    log.mailmap
    If true, makes git-log(1), git-show(1), and git-whatchanged(1) assume --use-mailmap, otherwise assume --no-use-mailmap. True by default.
    notes.mergeStrategy
    Which merge strategy to choose by default when resolving notes conflicts. Must be one of manual, ours, theirs, union, or cat_sort_uniq. Defaults to manual. See the "NOTES MERGE STRATEGIES" section of git-notes(1) for more information on each strategy.
    This setting can be overridden by passing the --strategy option to git-notes(1).
    notes.<name>.mergeStrategy
    Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in git-notes(1) for more information on the available strategies.
    notes.displayRef
    Which ref (or refs, if a glob or specified more than once), in addition to the default set by core.notesRef or GIT_NOTES_REF, to read notes from when showing commit messages with the git log family of commands.
    This setting can be overridden with the GIT_NOTES_DISPLAY_REF environment variable, which must be a colon separated list of refs or globs.
    A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored.
    This setting can be disabled by the --no-notes option to the git log family of commands, or by the --notes=<ref> option accepted by those commands.
    The effective value of "core.notesRef" (possibly overridden by GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed.
    notes.rewrite.<command>
    When rewriting commits with <command> (currently amend or rebase), if this variable is false, git will not copy notes from the original to the rewritten commit. Defaults to true. See also "notes.rewriteRef" below.
    This setting can be overridden with the GIT_NOTES_REWRITE_REF environment variable, which must be a colon separated list of refs or globs.
    notes.rewriteMode
    When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of overwrite, concatenate, cat_sort_uniq, or ignore. Defaults to concatenate.
    This setting can be overridden with the GIT_NOTES_REWRITE_MODE environment variable.
    notes.rewriteRef
    When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times.
    Does not have a default value; you must configure this variable to enable note rewriting. Set it to refs/notes/commits to enable rewriting for the default commit notes.
    Can be overridden with the GIT_NOTES_REWRITE_REF environment variable. See notes.rewrite.<command> above for a further description of its format.

    免责声明：如果侵犯了您的权益，请联系站长，我们会及时删除侵权内容，谢谢合作！更多信息从访问主页：qidao123.com:ToB企服之家，中国第一个企服评测及商务社交产业平台。



    欢迎光临 IT评测·应用市场-qidao123.com (https://dis.qidao123.com/) Powered by Discuz! X3.4