From bc63bc9eea8274cdb7bdd289a1253bf418dcbfdd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Oct 2008 17:47:55 -0400 Subject: [PATCH] idea --- doc/news/git_push_to_this_wiki/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/news/git_push_to_this_wiki/discussion.mdwn b/doc/news/git_push_to_this_wiki/discussion.mdwn index 4ca18ce8f..252fe724a 100644 --- 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]] + +> 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]] -- 2.45.0