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 documentatio
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
On Tue, Nov 1, 2016 at 12:40 PM, 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.
I would recommend that anyway, considering that the system one may be
missing things like a moderately
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 wrote:
> On 01 Nov 2016, at 01:10 , Brandon Allbery wrote:
>
> > You can even configure so that becomes the default fo
On 01 Nov 2016, at 01:10 , Brandon Allbery 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!
__
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
On Mon, Oct 31, 2016 at 7:08 PM, Eric A. Borisch
wrote:
> I hoped someone would point me to a command like this. Thanks!
>
I hoped someone would point me to a command like this. Thanks!
- Eric
On Monday, October 31, 2016, Joshua Root wrote:
>
> I'm using 'git pull --rebase --autostash' which does the stash-before and
> pop-after automatically.
>
> - Josh
>
___
macports-d
On 2016-11-1 09:21 , Lawrence Velázquez wrote:
The only downside of running "portindex" manually
is that you have to pass the location of the ports tree as an argument.
Or cd there first. If you're working on a ports tree you'll often be in
the right place already.
- Josh
___
> On Oct 31, 2016, at 5:55 PM, Lawrence Velázquez wrote:
>
>> On Oct 31, 2016, at 5:50 PM, Sean Farley wrote:
>>
>> I'm not sure I agree with attempting to modify the git repo at all. For
>> example, what if I'm in the middle of bisecting and need to add/remove a
>> port? Why does 'port sync' c
Lawrence Velázquez writes:
>> On Oct 31, 2016, at 5:50 PM, Sean Farley wrote:
>>
>> I'm not sure I agree with attempting to modify the git repo at all. For
>> example, what if I'm in the middle of bisecting and need to add/remove a
>> port? Why does 'port sync' call at all what the state is?
>
On 2016-11-1 08:46 , Lawrence Velázquez wrote:
On Oct 31, 2016, at 5:01 PM, Eric A. Borisch wrote:
5) 'push' changes (to macports-ports)
Oh, and and to capture upstream changes, somewhere after 1 and before
5 (4? 3?),
a) git fetch
b) git rebase origin/master
It looks like git pull --rebase do
> On Oct 31, 2016, at 5:50 PM, Sean Farley wrote:
>
> I'm not sure I agree with attempting to modify the git repo at all. For
> example, what if I'm in the middle of bisecting and need to add/remove a
> port? Why does 'port sync' call at all what the state is?
Updating the repository is the whol
"Eric A. Borisch" writes:
> Thanks for all the hard work with this transition! I'm sure once we're all
> "over the hump" we'll look back and wonder why we waited so long.
>
> Just so I'm clear on this, is the desired approach for each committer to:
>
> == setup ==
> 1) clone macports/macports-por
> On Oct 31, 2016, at 5:46 PM, Lawrence Velázquez wrote:
>
> Ultimately, anything you do before pushing is up to you, as long as
> you don't push any merge commits. We've disabled force-pushing on all
> master branches, so you don't have to worry too much doing that
> accidentally.
That is to sa
> On Oct 31, 2016, at 5:01 PM, Eric A. Borisch wrote:
>
> Just so I'm clear on this, is the desired approach for each committer
> to:
>
> == setup ==
> 1) clone macports/macports-ports to the local filesystem
After cloning, you should be sure that you are using your MacPorts email
address for c
You can `pull -r` immediately before pushing. Conveniently, you can
configure pull to autorebase. Either way, the simplest modification to
your last step is this:
git pull -r && git push
On 10/31/2016 05:01 PM, Eric A. Borisch wrote:
> Thanks for all the hard work with this transition! I'm sure
Thanks for all the hard work with this transition! I'm sure once we're all
"over the hump" we'll look back and wonder why we waited so long.
Just so I'm clear on this, is the desired approach for each committer to:
== setup ==
1) clone macports/macports-ports to the local filesystem
== every chan
17 matches
Mail list logo
