git.net

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [all] - git: prevent unnecessary merge commits?


+1 linear commits and branch.autosetuprebase always

Gruss
Bernd
--
http://bernd.eckenfels.net
________________________________
From: Emmanuel Bourg <ebourg@xxxxxxxxxx>
Sent: Saturday, June 9, 2018 11:54:01 PM
To: Commons Developers List
Subject: Re: [all] - git: prevent unnecessary merge commits?

+1, I prefer linear commit histories too.

Emmanuel Bourg

Le 09/06/2018 à 10:53, Pascal Schumacher a écrit :
> Hello everybody,
>
> in my opinion it is a good practice to always use the "--rebase" option
> when using "git pull". This keeps the history free of unnecessary merge
> commits like "Merge branch 'master' of
> https://git-wip-us.apache.org/repo...";.
>
> You can also tell git to automatically rebase when pulling:
>
> git config --global pull.rebase true
>
> What do you think?
>
> Cheers,
>
> Pascal
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@xxxxxxxxxxxxxxxxxx
> For additional commands, e-mail: dev-help@xxxxxxxxxxxxxxxxxx
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@xxxxxxxxxxxxxxxxxx
For additional commands, e-mail: dev-help@xxxxxxxxxxxxxxxxxx



( ! ) Warning: include(msgfooter.php): failed to open stream: No such file or directory in /var/www/git/apache-commons-developers/msg06496.html on line 113
Call Stack
#TimeMemoryFunctionLocation
10.0008358472{main}( ).../msg06496.html:0

( ! ) Warning: include(): Failed opening 'msgfooter.php' for inclusion (include_path='.:/var/www/git') in /var/www/git/apache-commons-developers/msg06496.html on line 113
Call Stack
#TimeMemoryFunctionLocation
10.0008358472{main}( ).../msg06496.html:0