yade-dev team mailing list archive

[Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>]

Thanks Alex and Anton,

The problem was in .git/config file. The last line must be set to  
rebase = true.
I updated the wiki page too.

christian


Zitat von "Eulitz, Alexander" <Alexander.Eulitz@xxxxxxxxxxxxxxxx>:

> I added Antons hint to Wiki [1]
> [1]  
> https://yade-dem.org/wiki/Yade_on_github#Working_directly_on_git.2Ftrunk_.28recommended_for_frequent_commits.29
>
>
> -----Ursprüngliche Nachricht-----
> Von: Yade-dev  
> [mailto:yade-dev-bounces+alexander.eulitz=iwf.tu-berlin.de@xxxxxxxxxxxxxxxxxxx] Im Auftrag von Anton  
> Gladky
> Gesendet: Freitag, 25. Juli 2014 08:50
> An: Christian Jakob
> Cc: yade-dev
> Betreff: Re: [Yade-dev] [Branch ~yade-pkg/yade/git-trunk] Rev 4116:  
> Merge branch 'master' of github.com:yade/trunk
>
> Hi Christian,
>
> you should have following lines in ~/.gitconfig:
> [branch]
>         autosetuprebase = always
>
> Cheers
>
> Anton
>
>
> 2014-07-25 8:19 GMT+02:00 Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>:
> > hi,
> >
> > i set up git once several months ago.
> >
> > git config --global branch.autosetuprebase always
> >
> > is this command right (i do not get any response after setting) ?
> > do i have to use this command always after/before each commit or push ?
> >
> > i am very sorry for inconveniences.
> >
> > regards,
> >
> > christian
> >
> >
> >
> >
> > Zitat von Anton Gladky <gladky.anton@xxxxxxxxx>:
> >
> > > Christian, please do not forget to set automatic rebase!
> > > Thanks
> > >
> > > Anton
> > >
> > >
> > > 2014-07-24 19:34 GMT+02:00  <noreply@xxxxxxxxxxxxx>:
> > > > Merge authors:
> > > >   Alexander Eulitz [Eugen] (kubeu)
> > > >   Jérôme Duriez (jduriez)
> > > > ------------------------------------------------------------
> > > > revno: 4116 [merge]
> > > > committer: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
> > > > timestamp: Thu 2014-07-24 16:01:09 +0200
> > > > message:
> > > >   Merge branch 'master' of github.com:yade/trunk
> > > > modified:
> > > >   doc/sphinx/installation.rst
> > > >   pkg/dem/JointedCohesiveFrictionalPM.hpp
> > >
> > >
> > > _______________________________________________
> > > Mailing list: https://launchpad.net/~yade-dev
> > > Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> > > Unsubscribe : https://launchpad.net/~yade-dev
> > > More help   : https://help.launchpad.net/ListHelp
> >
> >
> >
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~yade-dev
> > Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~yade-dev
> > More help   : https://help.launchpad.net/ListHelp
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp