blocks|key|2684463|text|GitHub桌面中的按钮下面的git命令没有很好的文档记录，所以我研究了一段时间。我的结论是“更新自...”按钮已调度|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2684464|git+merge+--no-ff+-m+"Merge+<auto_text>+<branch_name>"+<branch_name>|code-block|syntax|javascript|2684465|或者与GitHub桌面图形用户界面中设置为<branch_name>的“比较”分支几乎相同的内容。|offset|length|style|CODE|2684466|我通过以下方式得出结论：|2684467|首先，我将我控制的存储库派生到我的GitHub帐户。然后，我将存储库从我的GitHub帐户克隆到我的本地计算机。接下来，我向(原始)主远程存储库提交了一个小更改。最后，我使用git+fetch+<remote_name_assigned_to_main_repo>+(以下称为<remote_name>)将单次提交带到我的本地机器。在此fetch之后，"Update+from...“按钮亮起。|2684468|这设置了一个场景，在这个场景中，分支签出，我的本地存储库中的master比主远程存储库中的master晚一个提交。默认情况下，git+merge+<remote_name>会生成一个快进合并(没有合并提交)。|2684469|使用“更新自...”然而，按钮产生了以下reflog条目：|2684470|HEAD@{0}:+merge+<remote_name>/master:+Merge+made+by+the+'recursive'+strategy.|2684471|和log中的合并提交|2684472|Merge+remote-tracking+branch+'<remote_name>/master'|2684473|(“递归”策略“当拉取或合并一个分支时，...is默认的合并策略。”根据手册。)|2684474|我还设置了一个场景，其中git+rebase可能是一个选项，但看到了相同的合并行为。|2684475|entityMap^0|0|0|L|D|0|0|2F|19|3U|D|4O|5|0|U|6|19|6|1R|N|0|K|6|0|0|1|3|0|0|0|C|A|0^^$0|@$1|2|3|4|5|6|7|16|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|17|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|18|8|@$I|19|J|1A|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|1B|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|1C|8|@$I|1D|J|1E|K|L]|$I|1F|J|1G|K|L]|$I|1H|J|1I|K|L]]|9|@]|A|$]]|$1|Q|3|R|5|6|7|1J|8|@$I|1K|J|1L|K|L]|$I|1M|J|1N|K|L]|$I|1O|J|1P|K|L]]|9|@]|A|$]]|$1|S|3|T|5|6|7|1Q|8|@$I|1R|J|1S|K|L]]|9|@]|A|$]]|$1|U|3|V|5|D|7|1T|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1U|8|@$I|1V|J|1W|K|L]]|9|@]|A|$]]|$1|Y|3|Z|5|D|7|1X|8|@]|9|@]|A|$E|F]]|$1|10|3|11|5|6|7|1Y|8|@]|9|@]|A|$]]|$1|12|3|13|5|6|7|1Z|8|@$I|20|J|21|K|L]]|9|@]|A|$]]|$1|14|3|-4|5|6|7|22|8|@]|9|@]|A|$]]]|15|$]]

The git commands underlying the buttons in GitHub Desktop are not well-documented, so I investigated a while back. I concluded that the "Update from..." button dispatched

<pre><code>git merge --no-ff -m "Merge &lt;auto_text&gt; &lt;branch_name&gt;" &lt;branch_name&gt;
</code></pre>

or something nearly identical with the "Compare" branch set to <code>&lt;branch_name&gt;</code> in the GitHub Desktop GUI.

I reached the conclusion in the following way:

First, I forked a repository that I control to my GitHub account. Then, I cloned the repository from my GitHub account to my local machine. Next, I committed a small change to the (original) main remote repository. Finally, I used <code>git fetch &lt;remote_name_assigned_to_main_repo&gt;</code> (<code>&lt;remote_name&gt;</code>, hereafter) to bring the single commit to my local machine. After this <code>fetch</code>, the "Update from..." button lit up.

This set up a scenario in which the branch checked out, <code>master</code> in my local repository, was one commit behind <code>master</code> in the main remote repository. By default, <code>git merge &lt;remote_name&gt;</code> would have produced a fast-forward merge (without a merge commit). 

Using the "Update from..." button, however, resulted in the following <code>reflog</code> entry:

<pre><code>HEAD@{0}: merge &lt;remote_name&gt;/master: Merge made by the 'recursive' strategy.
</code></pre>

And a merge commit in the <code>log</code>:

<pre><code>Merge remote-tracking branch '&lt;remote_name&gt;/master'
</code></pre>

(The 'recursive' strategy "...is the default merge strategy when pulling or merging one branch." per the manual.)

I also set up a scenario in which <code>git rebase</code> might have been an option, but saw the same merge behavior.

blocks|key|124917|text|当我将鼠标悬停在按钮上时，它会显式地显示"Merge+XX+commits+from“|type|unstyled|depth|inlineStyleRanges|entityRanges|data|124918|​|124919|📷|atomic|offset|length|124920|124921|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/90cb03d08f1abbd8c75a048e3d3e8a05.png|imageAlt^0|0|0|0|1|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@$G|V|H|W|1|X]]|A|$]]|$1|I|3|C|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|K|$L|$5|M|N|O|A|$P|Q|R|-4]]]]

When I hover over the button, it explicitly says "Merge XX commits from "

<a href="https://i.stack.imgur.com/uG4JU.png" rel="noreferrer"><img src="https://i.stack.imgur.com/uG4JU.png" alt="enter image description here"></a>

blocks|key|127901|text|只需进入“分支”菜单，然后“合并到当前分支...”并选择您想要从其获取“更新”的分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|127902|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Just go into "Branch" menu, then "Merge into current branch..." and choose the branch you want to get your "update" from.

blocks|key|124943|text|GitHub自己说这只是git+merge+<defaultBranch>。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|124944|完整的解释和代码示例in+the+GitHub+Desktop+repo|124945|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/desktop/desktop/issues/4717^0|C|P|0|A|Q|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@$9|Q|A|R|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|S|8|@]|D|@$9|T|A|U|1|V]]|E|$]]|$1|H|3|-4|5|6|7|W|8|@]|D|@]|E|$]]]|I|$J|$5|K|L|M|E|$N|O]]]]

GitHub themselves say it's just <code>git merge &lt;defaultBranch&gt;</code>.
Full explanation and code samples <a href="https://github.com/desktop/desktop/issues/4717" rel="nofollow noreferrer">in the GitHub Desktop repo</a>

In this picture below from the Github(c) Desktop App there ist this button "Update from master" (in this case). I was wondering if anyone had the insight what exact git function it triggers. Primarily I'm interested if merge or rebase is used. (I could not find any sort of log console).

<a href="https://i.stack.imgur.com/1Ew7p.png"><img src="https://i.stack.imgur.com/1Ew7p.png" alt="enter image description here"></a>

Github Desktop: "Update from <branch>" button

GitHub

在下面这张来自Github(c)桌面应用程序的图片中，有这个按钮"Update from master“(在这种情况下)。我想知道是否有人了解它触发的确切git函数。首先，我感兴趣的是是否使用了merge或rebase。(我找不到任何类型的日志控制台)。​​

问Github桌面：“从<branch>更新”按钮
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Github桌面：“从<branch>更新”按钮EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Github桌面：“从<branch>更新”按钮
EN