idea

diff --git a/doc/news/git_push_to_this_wiki/discussion.mdwn b/doc/news/git_push_to_this_wiki/discussion.mdwn
index 4ca18ce8f686d6235643952b188d2f35eaea2c1b..252fe724ac5245788d7dbc71400f432708f1b68f 100644 (file)
--- a/doc/news/git_push_to_this_wiki/discussion.mdwn
+++ b/doc/news/git_push_to_this_wiki/discussion.mdwn
@@ -19,3 +19,8 @@ into this special-purpose branch. I guess it would work nicely if I had only
 one offline box with not-yet-pushed changes at the same time, but would break
 in awful and various ways when it is not the case. Any alternative idea?
 --[[intrigeri]]
 one offline box with not-yet-pushed changes at the same time, but would break
 in awful and various ways when it is not the case. Any alternative idea?
 --[[intrigeri]]

+
+> Not that I'm very careful to avoid pushing merge commits (see git log ;-), 
+> but I sometimes use `git pull --rebase` to pull changes from a repo. That
+> will rebase your local changes on top of the changes pulled, avoiding the
+> merge commits. I'm sure more involved solutions are possible. --[[Joey]]