up, you can configure the default text editor that will be used when Git needs you to type in a message. If not configured, Git uses your system’s default editor. If you want to use a different text (this example is a Vim screen): # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date the default commit message contains the latest output of the git status command commented out and one empty line on top. You can remove these comments and type your commit message, or you can leave

up, you can configure the default text editor that will be used when Git needs you to type in a message. If not configured, Git uses your system’s default editor. If you want to use a different text editor (this example is a Vim screen): # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date the default commit message contains the latest output of the git status command commented out and one empty line on top. You can remove these comments and type your commit 36 message, or you can leave

up, you can configure the default text editor that will be used when Git needs you to type in a message. If not configured, Git uses your system’s default editor. If you want to use a different text (this example is a Vim screen): # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date the default commit message contains the latest output of the git status command commented out and one empty line on top. You can remove these comments and type your commit message, or you can leave

编辑器会显示类似下面的文本信息（本例选用 Vim 的屏显方式展示）： 39 # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date 如果你想使用图形化工具来解决冲突，你可以运行 git mergetool，该命令会为你启动一个合适的可视化合并 工具，并带领你一步一步解决这些冲突： $ git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # All conflicts fixed

编辑器会显示类似下面的文本信息（本例选用 Vim 的屏显方式展示）： # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Your branch is up-to-date 如果你想使用图形化工具来解决冲突，你可以运行 git mergetool，该命令会 为你启动一个合适的可视化合并工具，并带领你一步一步解决这些冲突： $ git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # All conflicts fixed

value : 日志记录器的匹配表达式 --prefix value , -p value : 日志记录器的前缀 --color : 在日志中使用颜色 --reconnect-on-message , -R : 对于每个消息重新连接主机 --reconnect , -r : 连接中断时重新连接主机 --protocol value , -P value : 设置要使用的协议：tcp、 rebase , rebase-merge , squash DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT : 50: 在默认合并消息中，对于 squash 提交，最多包括此数量的提交。 设置为 -1 以包括所有提交。 DEFAULT_MERGE_MESSAGE_SIZE : 5120: 在默认的合并消息中，对于 squash 提交，限制提交消息的大小。设置为 MESSAGES 为 true 时使用。 DEFAULT_MERGE_MESSAGE_ALL_AUTHORS : false: 在默认合并消息中，对于 squash 提交，遍历所有提交以包括所 有作者的 Co-authored-by ，否则仅使用限定列表中的作者。 DEFAULT_MERGE_MESSAGE_MAX_APPROVERS : 10:在默认合并消息中，限制列出的审批者数量为