What I usually do is first ‘git pull’ and if it performs a merge then I do
‘git rebase origin/master’ to have my local commits stay on top of the
history.
On Tue, 5 Dec 2017 at 7:43 PM Georg Zotti <georg.zo...@univie.ac.at> wrote:
> Am 05.12.2017 12:36, schrieb Fabien Chéreau:
> > No problems ;) It takes time to get used to it.
> >
> > One of the important point is to never do git pull (because its like
> > git fetch, git merge) but rather git pull --rebase (or git fetch, git
> > rebase)
>
> Ah sorry, that was probably me (for some very small commits). I exactly
> wanted to avoid this. Yes, such introductory issues should go to the
> wiki please!
>
> G.
>
> >
> > Fabien
> >
> > On Tue, Dec 5, 2017 at 2:36 AM, Alexander Wolf <alex.v.w...@gmail.com>
> > wrote:
> >
> >> Hi!
> >>
> >> 2017-12-05 1:44 GMT+07:00 Fabien Chéreau
> >> <fabien.cher...@gmail.com>:
> >>
> >>> For me the most important goal is that when looking at the history
> >>> of the master branch, we see only one linear list of commits most
> >>> of the time.
> >>> For example, in the last days there was a few merges of branches
> >>> containing just a few small commit. It's much better for these to
> >>> appear as standard commit on master rather than branch merge. For
> >>> this, a rebase is needed before pushing to master
> >>
> >> Sorry, it was my faults - I'm still not adapted to github workflow
> >> :-/
> >>
> >> --
> >>
> >> With best regards, Alexander
> >>
> >> Phone: +7 903 957 3596 [1]
> >> Skype: alex.v.wolf
> >>
> >
> ------------------------------------------------------------------------------
> >> Check out the vibrant tech community on one of the world's most
> >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> >> _______________________________________________
> >> Stellarium-pubdevel mailing list
> >> Stellarium-pubdevel@lists.sourceforge.net
> >> https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel [2]
> >
> >
> >
> > Links:
> > ------
> > [1] tel:+7%20903%20957-35-96
> > [2] https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
> >
> ------------------------------------------------------------------------------
> > Check out the vibrant tech community on one of the world's most
> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> > _______________________________________________
> > Stellarium-pubdevel mailing list
> > Stellarium-pubdevel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Stellarium-pubdevel mailing list
> Stellarium-pubdevel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Stellarium-pubdevel mailing list
Stellarium-pubdevel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
