[haiku-commits] Re: haiku: hrev43883 - build/jam src/kits/interface
- From: François Revol <revol@xxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 24 Mar 2012 02:20:32 +0100
On 23/03/2012 21:09, Rene Gollent wrote:
> On Fri, Mar 23, 2012 at 4:07 PM, <stefano.ceccherini@xxxxxxxxx> wrote:
>> 5468786: Merge branch 'master' of ssh://git.haiku-os.org/haiku
>>
>> 131811f: Merge branch 'master' of ssh://git.haiku-os.org/haiku
>>
>> aae7ed3: Merge branch 'master' of ssh://git.haiku-os.org/haiku
>>
>> f367fc9: Merge branch 'master' of ssh://git.haiku-os.org/haiku
>
> FYI, using git pull --rebase (or configuring git to do so by default)
> would avoid these appearing in your pushes.
>
For Haiku's specific .profile here (using export DEVUPCMD, cf. latest
dev-perso script), I'm pushing this as last history command :
git stash && git pull --rebase && git stash apply && git stash drop
Best case it behaves like svn up did, merging uncommitted local changes
to your rebased history.
If pull fails, git stash apply && git stash drop to reapply local stuff.
If merging fails, just fix, git add the files, and git stash drop.
François.
Other related posts:
