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.
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. - Eric [1] https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.6.0.txt On Tue, Nov 1, 2016 at 12:53 PM, Joshua Root <j...@macports.org> wrote: > 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. > > - Josh > > On 2016-11-2 03:40 , Eric A. Borisch wrote: > >> As should the fact that, for this to work, you need to be using a >> new-enough git (like from ports) and not the system-provided one. >> >> On Tue, Nov 1, 2016 at 4:01 AM, Marko Käning <mk-macpo...@posteo.net >> <mailto:mk-macpo...@posteo.net>> wrote: >> >> On 01 Nov 2016, at 01:10 , Brandon Allbery <allber...@gmail.com >> <mailto:allber...@gmail.com>> wrote: >> >> > You can even configure so that becomes the default for "git pull" >> for that repo. >> > >> > git config --local --bool pull.rebase true >> > git config --local --bool rebase.autoStash true >> >> This should go into the wiki page! >> > >
_______________________________________________ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
