From e9eec15aecc1b06ce5359015428013d621e3f479 Mon Sep 17 00:00:00 2001 From: Tim Bishop Date: Sun, 4 Aug 2013 14:47:10 +0000 Subject: [PATCH] Add note on merge commits. --- www/git.xhtml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/www/git.xhtml b/www/git.xhtml index 2fc8a8a..448db0f 100644 --- a/www/git.xhtml +++ b/www/git.xhtml @@ -116,6 +116,15 @@ git clone ssh://git@git.i-scream.org/libstatgrab specifically working with a developer on an issue already. +
  • + Gratuitous merge commits should be avoided, particularly + when merging development branches to master. + They don't offer much in the way of useful information + and make operations like bisect harder. In particular, + if you pull changes to your local repository and end up + with a merge commit you should use rebase to get rid of + it before pushing. +
  • -- 2.44.0