All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shawn Pearce <spearce@spearce.org>
To: cworth@cworth.org
Cc: git@vger.kernel.org
Subject: Avoiding uninteresting merges in Cairo
Date: Thu, 14 Dec 2006 21:06:29 -0500	[thread overview]
Message-ID: <20061215020629.GK26202@spearce.org> (raw)

I was just talking with jwatt today in #git and he pointed me at
the following email from

 http://lists.freedesktop.org/archives/cairo/2006-April/006648.html

after he had a merge gone wrong in his working directory and was
asking for help.

Cario has seriously been using `reset --hard HEAD^` as part of its
workflow since April?  Why haven't you pushed for a rebase merge
strategy to be tried before a trivial index merge as an option in
git-merge (e.g. pull.twohead=rebase recursive)?

-- 

             reply	other threads:[~2006-12-15  2:06 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-15  2:06 Shawn Pearce [this message]
2006-12-15  3:17 ` Avoiding uninteresting merges in Cairo Carl Worth
2006-12-15  3:25   ` Shawn Pearce
2006-12-15  4:01     ` Carl Worth
2006-12-15  7:53       ` Shawn Pearce
2006-12-15 14:21       ` Jakub Narebski
2006-12-15 15:01         ` Shawn Pearce
2006-12-15 15:57           ` Jakub Narebski
2006-12-15 16:03             ` Shawn Pearce
2006-12-15 16:53               ` [PATCH] gitweb: Do not show difftree for merges in "commit" view Jakub Narebski
2006-12-15 21:03   ` Avoiding uninteresting merges in Cairo Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061215020629.GK26202@spearce.org \
    --to=spearce@spearce.org \
    --cc=cworth@cworth.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.