[haiku-commits] Re: haiku: hrev43379 - build/jam
- From: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 02 Dec 2011 19:04:36 +0100
Hi Scott,
On 2011-12-02 at 18:06:48 [+0100], scott mc <scottmc2@xxxxxxxxx> wrote:
> ############################################################################
>
> Commit: f8631ec46e7852ccf115e77504df8d32f53fd942
> URL: http://cgit.haiku-os.org/haiku/commit/?id=f8631ec
> Author: Scott McCreary <scottmc2@xxxxxxxxx>
> Date: Fri Dec 2 01:08:23 2011 UTC
>
> Merge branch 'master' of ssh://git.haiku-os.org/haiku
>
> ----------------------------------------------------------------------------
>
> ############################################################################
>
> Revision: hrev43379
> Commit: 9bcf0b2e39d94576bd9a760e3606cdf78f6cd8f8
> URL: http://cgit.haiku-os.org/haiku/commit/?id=9bcf0b2
> Author: Scott McCreary <scottmc2@xxxxxxxxx>
> Date: Fri Dec 2 17:00:49 2011 UTC
>
> Merge branch 'master' of ssh://git.haiku-os.org/haiku
>
> ----------------------------------------------------------------------------
you can avoid these kind of merge commits by using 'git pull --rebase'
instead of 'git pull'. Rebasing like that will re-apply your local commits on
top of what has just been pulled from upstream. It is recommended to do so,
since those merge commits basically just add (a bit of) noise.
You can configure git to automatically do a rebase during pull by invoking
this (in the Haiku repo):
git config branch.master.rebase true
cheers,
Oliver
Other related posts:
