示意图

官方介绍

known changes - This allows remote repository to accept a safer non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This can prevent from losing unknown changes from other people on the remote. It checks if the server branch points to the same commit as the remote-tracking branch (known changes). If yes, a force push will be performed. Otherwise it will be rejected. Since git does not have remote-tracking tags, tags cannot be overwritten using this option. This passes –force-with-lease option of git push command.

unknown changes - This allows remote repository to accept an unsafe non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This does not check any server commits, so it is possible to lose unknown changes on the remote. Use this option with Include Tags to overwrite tags. This passes the traditional –force option of git push command.

简单理解

unknown changes 等价于--force，强行提交时，可能覆盖团队成员在此期间推送的所有更改。

known changes 等价于--force-with-lease，使用此参数推送，如果远端有其他人推送了新的提交，那么推送将被拒绝。该命令解决的是本地仓库不够新时，依然覆盖了远端新仓库的问题，如果执意想要覆盖远端提交，只需要先 fetch 再push，它也不会拒绝的。

TortoiseGit -> Combine to one commit

1 右键打开Tortoise Git

2 勾选

3右键文件选择红框的

1 cherry-pick说明

cherry-pick指的是某分支提交的commit应用到其他分支。

2 场景说明

同时拥有master分支和dev分支，通过cherry-pick将dev分支的commit合并到master。

3 操作手顺

3.1 前期状态

dev分支（较新）

master分支（较旧）

3.2 执行操作

切换到master分支（被追加commit的分支）

查看log

切换到dev分支的log（已经commit的分支）

选中要cherry-pick的对象，执行cherry-pick

查看master的log

push到remote即可。

TortoiseGit无法使用git生成的ssh-key，需要转化为ppk 公钥。所以每次提交代码钱要打开 Pageant ，然后去加载公钥，非常麻烦。