On dimanche 28 mars 2021 14:34:07 CEST Ted Felix wrote: > Rules of thumb > - Avoid "git pull" even if git tells you to use it.
Nah, just put the following in your ~/.gitconfig: [pull] # auto-rebase, except merges. Needs git > 1.8.5 for "preserve", then deprecated in favour of "merges" since 2.18 rebase = merges Or add an alias so you can type "git up" instead of "svn up": [alias] up = pull --rebase --autostash -- David Faure, fa...@kde.org, http://www.davidfaure.fr Working on KDE Frameworks 5 _______________________________________________ Rosegarden-devel mailing list Rosegarden-devel@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
