<div dir="ltr">A newer git (2.6.0 [1]) is required for the rebase.autostash configuration switch to work. As of Xcode 7.2, git is at 2.5.4.<div><div class="gmail_extra"><br></div><div class="gmail_extra">With these two options set to true, (rebase.autostash and pull.rebase), 'git pull' feels like 'svn update' (at least to me) -- which is very nice for transition documentation to note, with the caveat that you need a new-enough git installed.</div><div class="gmail_extra"><br></div><div class="gmail_extra"> - Eric</div><div class="gmail_extra"><br></div><div class="gmail_extra">[1] <a href="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.6.0.txt">https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.6.0.txt</a></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Nov 1, 2016 at 12:53 PM, Joshua Root <span dir="ltr"><<a href="mailto:jmr@macports.org" target="_blank">jmr@macports.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">While using the git port is a good idea for many reasons, the Xcode-provided git should have autostash since Xcode 5.1 or so.<br>
<br>
- Josh<span class="gmail-"><br>
<br>
On 2016-11-2 03:40 , Eric A. Borisch wrote:<br>
</span><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><span class="gmail-">
As should the fact that, for this to work, you need to be using a<br>
new-enough git (like from ports) and not the system-provided one.<br>
<br>
On Tue, Nov 1, 2016 at 4:01 AM, Marko Käning <<a href="mailto:mk-macports@posteo.net" target="_blank">mk-macports@posteo.net</a><br></span><span class="gmail-">
<mailto:<a href="mailto:mk-macports@posteo.net" target="_blank">mk-macports@posteo.net</a><wbr>>> wrote:<br>
<br>
On 01 Nov 2016, at 01:10 , Brandon Allbery <<a href="mailto:allbery.b@gmail.com" target="_blank">allbery.b@gmail.com</a><br></span><span class="gmail-">
<mailto:<a href="mailto:allbery.b@gmail.com" target="_blank">allbery.b@gmail.com</a>>> wrote:<br>
<br>
> You can even configure so that becomes the default for "git pull" for that repo.<br>
><br>
> git config --local --bool pull.rebase true<br>
> git config --local --bool rebase.autoStash true<br>
<br>
This should go into the wiki page!<br>
</span></blockquote>
<br>
</blockquote></div><br></div></div></div>