blocks|key|199959|text|现在有3个不同级别的默认拉入行为的配置。从最一般的到最细粒度的，它们是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|199960|1.+pull.rebase|offset|length|style|CODE|199961|将其设置为true意味着git+pull始终等同于git+pull+--rebase+(除非branch.<branchname>.rebase显式设置为false)。这也可以按存储库或全局设置。|199962|2.+branch.autosetuprebase|199963|将其设置为always意味着，无论何时创建跟踪分支，都会为其创建一个配置条目，如下所示。对于更细粒度的控制，还可以将其设置为never、local或remote，并且可以按存储库或全局设置。有关更多详细信息，请参阅git+config+--help。|199964|3.+branch.<branchname>.rebase|199965|将其设置为true意味着，除非显式使用git+pull+--no-rebase，否则该特定分支将始终通过rebasing从其上游拉出。|199966|结论|199967|因此，虽然您不能更改存储库所有未来克隆的默认行为，但您可以通过git+config+--global+pull.rebase+true更改所有当前用户(现有的和未来的)存储库的默认行为。|199968|entityMap^0|0|3|B|0|5|4|C|8|P|H|1A|Q|25|5|0|3|M|0|5|6|1Q|5|1W|5|22|6|2Z|H|0|3|Q|0|5|4|J|K|0|0|V|10|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Y|8|@$D|Z|E|10|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|11|8|@$D|12|E|13|F|G]|$D|14|E|15|F|G]|$D|16|E|17|F|G]|$D|18|E|19|F|G]|$D|1A|E|1B|F|G]]|9|@]|A|$]]|$1|J|3|K|5|6|7|1C|8|@$D|1D|E|1E|F|G]]|9|@]|A|$]]|$1|L|3|M|5|6|7|1F|8|@$D|1G|E|1H|F|G]|$D|1I|E|1J|F|G]|$D|1K|E|1L|F|G]|$D|1M|E|1N|F|G]|$D|1O|E|1P|F|G]]|9|@]|A|$]]|$1|N|3|O|5|6|7|1Q|8|@$D|1R|E|1S|F|G]]|9|@]|A|$]]|$1|P|3|Q|5|6|7|1T|8|@$D|1U|E|1V|F|G]|$D|1W|E|1X|F|G]]|9|@]|A|$]]|$1|R|3|S|5|6|7|1Y|8|@]|9|@]|A|$]]|$1|T|3|U|5|6|7|1Z|8|@$D|20|E|21|F|G]]|9|@]|A|$]]|$1|V|3|-4|5|6|7|22|8|@]|9|@]|A|$]]]|W|$]]

<p>There are now 3 different levels of configuration for default pull behaviour. From most general to most fine grained they are:</p>

<h3>1. <code>pull.rebase</code></h3>

<p>Setting this to <code>true</code> means that <code>git pull</code> is always equivalent to <code>git pull --rebase</code> (unless <code>branch.&lt;branchname&gt;.rebase</code> is explicitly set to <code>false</code>). This can also be set per repository or globally.</p>

<h3>2. <code>branch.autosetuprebase</code></h3>

<p>Setting this to <code>always</code> means that whenever a tracking branch is created, a configuration entry like the one below will be created for it. For finer grained control, this can also be set to <code>never</code>, <code>local</code> or <code>remote</code> and can be set per repository or globally. See <code>git config --help</code> for further details.</p>

<h3>3. <code>branch.&lt;branchname&gt;.rebase</code></h3>

<p>Setting this to <code>true</code> means that that particular branch will always pull from its upstream via rebasing, unless <code>git pull --no-rebase</code> is used explicitly.</p>

<h1>Conclusion</h1>

<p>So while you can't change the default behaviour for all future clones of a repository, you can change the default for all of the current user's (existing and future) repositories via <code>git config --global pull.rebase true</code>. </p>


blocks|key|418238|text|怎么样|type|unstyled|depth|inlineStyleRanges|entityRanges|data|418239|git+config+--global+pull.rebase+true|code-block|syntax|javascript|418240|这将告诉git始终使用rebase进行拉动。|418241|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

<p>How about </p>

<pre><code>git config --global pull.rebase true
</code></pre>

<p>This will tell git to always pull with rebase. </p>


blocks|key|418315|text|答案是否定的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|418316|没有一种方法可以设置一个远程存储库，这样每个克隆它的人都会更改git+pull的默认行为。|offset|length|style|CODE|418317|但是，您可以设置一个服务器端钩子来检查是否没有人推送合并提交(也许是something+like+this)。|418318|还有一些您可能感兴趣的配置选项。所有从远程存储库克隆的开发人员都必须手动设置它。|418319|1.选项branch.<name>.rebase|418320|您可以将本地分支配置为始终使用--rebase，如下所示，将<name>替换为分支名称：|418321|git+config+branch.<name>.rebase+true|code-block|syntax|javascript|418322|在master上运行后，.git/config中的master部分如下所示：|418323|[branch+"master"]
++++remote+=+origin
++++merge+=+refs/heads/master
++++rebase+=+true|418324|2.选项branch.autosetuprebase|418325|为每个Git分支运行前面的config命令可能很麻烦，因此您可以配置Git为每个新分支自动设置它：|418326|git+config+branch.autosetuprebase+always|418327|(您还可以指定never、remote和local，有关详细信息，请参阅man+git-config。)|418328|如果不使用--global选项，则会将配置保存到.git/config，并且只会影响当前存储库。使用--global，配置将保存到~/.gitconfig，并且每个未配置的存储库都会受到影响。|418329|此选项不会影响已存在的分支。|418330|3.选项pull.rebase|418331|git+config+pull.rebase+true|418332|(您还可以为其提供--global选项。)|418333|如果此选项为true，则运行git+pull等同于git+pull+--rebase，除非已将branch.<name>.rebase设置为false。|418334|entityMap|0|LINK|mutability|MUTABLE|url|http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git-log^0|0|V|8|0|Y|J|0|0|0|4|K|0|F|8|U|6|0|0|1|6|C|B|P|6|0|0|4|M|0|0|0|7|5|D|6|K|5|10|E|0|5|8|O|B|1E|8|1T|C|0|0|4|B|0|0|9|8|0|E|8|P|H|1B|K|1Y|5|0^^$0|@$1|2|3|4|5|6|7|1Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1R|8|@$D|1S|E|1T|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|1U|8|@]|9|@$D|1V|E|1W|1|1X]]|A|$]]|$1|J|3|K|5|6|7|1Y|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|1Z|8|@$D|20|E|21|F|G]]|9|@]|A|$]]|$1|N|3|O|5|6|7|22|8|@$D|23|E|24|F|G]|$D|25|E|26|F|G]]|9|@]|A|$]]|$1|P|3|Q|5|R|7|27|8|@]|9|@]|A|$S|T]]|$1|U|3|V|5|6|7|28|8|@$D|29|E|2A|F|G]|$D|2B|E|2C|F|G]|$D|2D|E|2E|F|G]]|9|@]|A|$]]|$1|W|3|X|5|R|7|2F|8|@]|9|@]|A|$S|T]]|$1|Y|3|Z|5|6|7|2G|8|@$D|2H|E|2I|F|G]]|9|@]|A|$]]|$1|10|3|11|5|6|7|2J|8|@]|9|@]|A|$]]|$1|12|3|13|5|R|7|2K|8|@]|9|@]|A|$S|T]]|$1|14|3|15|5|6|7|2L|8|@$D|2M|E|2N|F|G]|$D|2O|E|2P|F|G]|$D|2Q|E|2R|F|G]|$D|2S|E|2T|F|G]]|9|@]|A|$]]|$1|16|3|17|5|6|7|2U|8|@$D|2V|E|2W|F|G]|$D|2X|E|2Y|F|G]|$D|2Z|E|30|F|G]|$D|31|E|32|F|G]]|9|@]|A|$]]|$1|18|3|19|5|6|7|33|8|@]|9|@]|A|$]]|$1|1A|3|1B|5|6|7|34|8|@$D|35|E|36|F|G]]|9|@]|A|$]]|$1|1C|3|1D|5|R|7|37|8|@]|9|@]|A|$S|T]]|$1|1E|3|1F|5|6|7|38|8|@$D|39|E|3A|F|G]]|9|@]|A|$]]|$1|1G|3|1H|5|6|7|3B|8|@$D|3C|E|3D|F|G]|$D|3E|E|3F|F|G]|$D|3G|E|3H|F|G]|$D|3I|E|3J|F|G]]|9|@]|A|$]]|$1|1I|3|-4|5|6|7|3K|8|@]|9|@]|A|$]]]|1J|$1K|$5|1L|1M|1N|A|$1O|1P]]]]

<h1>The answer is no.</h1>
<p>There isn't a way to set up a remote repository so that everyone who clones it has the default behaviour of <code>git pull</code> changed.</p>
<p>You can, however, set up a server-side hook that checks that no one pushes merge commits (<a href="http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git-log" rel="noreferrer">something like this</a>, perhaps).</p>
<p>There are also some configuration options that you may be interested in. All the developers who clone from the remote repository will have to set it themselves manually.</p>
<h2>1. Option <code>branch.&lt;name&gt;.rebase</code></h2>
<p>You can configure a local branch to always use <code>--rebase</code>, like this, replacing <code>&lt;name&gt;</code> with a branch name:</p>
<pre><code>git config branch.&lt;name&gt;.rebase true
</code></pre>
<p>After running this on <code>master</code>, the <code>master</code> section in <code>.git/config</code> looked like this:</p>
<pre><code>[branch &quot;master&quot;]
    remote = origin
    merge = refs/heads/master
    rebase = true
</code></pre>
<h2>2. Option <code>branch.autosetuprebase</code></h2>
<p>Running that previous config command for every Git branch can be a hassle, so you can configure Git to automatically set it up for every new branch:</p>
<pre><code>git config branch.autosetuprebase always
</code></pre>
<p>(You can also specify <code>never</code>, <code>remote</code>, and <code>local</code>, see <code>man git-config</code> for details.)</p>
<p>Without the <code>--global</code> option, the configuration is saved to <code>.git/config</code>, and only the current repository is affected. With <code>--global</code>, the configuration is saved to <code>~/.gitconfig</code>, and every unconfigured repository is affected.</p>
<p>This option does not affect already existing branches.</p>
<h2>3. Option <code>pull.rebase</code></h2>
<pre><code>git config pull.rebase true
</code></pre>
<p>(You can also give it the <code>--global</code> option.)</p>
<p>If this option is true, running <code>git pull</code> is equivalent to <code>git pull --rebase</code>, unless <code>branch.&lt;name&gt;.rebase</code> has been set to <code>false</code>.</p>


blocks|key|418375|text|这使得在给定分支上发出git+pull时，--rebase选项成为默认选项。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|418376|@Flimm，我需要添加true才能让你的第一个选项工作。|418377|所以正确的语法是：|418378|git+config+branch.<branch>.rebase+true|code-block|syntax|javascript|418379|要在develop分支上运行此命令：|418380|git+config+branch.develop.rebase+true|418381|现在，.git/config中的develop部分如下所示：|418382|[branch+"develop"]
++++++++remote+=+origin
++++++++merge+=+refs/heads/develop
++++++++rebase+=+true|418383|entityMap^0|B|8|L|8|0|C|4|0|0|0|2|7|0|0|3|B|G|7|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@$9|Z|A|10|B|C]|$9|11|A|12|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|13|8|@$9|14|A|15|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|16|8|@]|D|@]|E|$]]|$1|J|3|K|5|L|7|17|8|@]|D|@]|E|$M|N]]|$1|O|3|P|5|6|7|18|8|@$9|19|A|1A|B|C]]|D|@]|E|$]]|$1|Q|3|R|5|L|7|1B|8|@]|D|@]|E|$M|N]]|$1|S|3|T|5|6|7|1C|8|@$9|1D|A|1E|B|C]|$9|1F|A|1G|B|C]]|D|@]|E|$]]|$1|U|3|V|5|L|7|1H|8|@]|D|@]|E|$M|N]]|$1|W|3|-4|5|6|7|1I|8|@]|D|@]|E|$]]]|X|$]]

<p>This makes the <code>--rebase</code> option the default when issuing a <code>git pull</code>  on a given branch.</p>

<p>@Flimm, I needed to add <code>true</code> to make your first option work.</p>

<p>So the correct syntax is:</p>

<pre><code>git config branch.&lt;branch&gt;.rebase true
</code></pre>

<p>To run this command on the <code>develop</code> branch:</p>

<pre><code>git config branch.develop.rebase true
</code></pre>

<p>And now the <code>develop</code> section in <code>.git/config</code> looks like this:</p>

<pre><code>[branch "develop"]
        remote = origin
        merge = refs/heads/develop
        rebase = true
</code></pre>


<p>Is there a way to setup the host Git repository such that any <code>git pull</code> done from its (local) clones uses <code>--rebase</code> by default? By searching on Stack&nbsp;Overflow, I learned about <code>branch.autosetuprebase</code>, but it needs to be configured per clone individually. </p>

<p>My project flow is set up such that we <code>pull</code> the <code>develop</code> branch before <code>merge</code>ing a feature branch to it. This <code>pull</code> nearly always uses <code>--rebase</code>, so I am trying to figure out if this can be the default. </p>


How to make Git pull use rebase by default for all my repositories?

服务器

有没有一种方法可以设置主机Git存储库，使其(本地)克隆的任何git pull默认使用--rebase？通过搜索Stack Overflow，我了解到了branch.autosetuprebase，但它需要针对每个克隆进行单独配置。我的项目流程是这样设置的:在对develop分支执行merge操作之前，先对其执行pul...

问如何让Git在默认情况下对我的所有存储库使用rebase？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何让Git在默认情况下对我的所有存储库使用rebase？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何让Git在默认情况下对我的所有存储库使用rebase？
EN