From: Olivier Galibert <galibert@pobox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: git@vger.kernel.org
Subject: Re: Please undo "Use git-merge instead of git-resolve in git-pull"
Date: Thu, 22 Sep 2005 02:54:55 +0200 [thread overview]
Message-ID: <20050922005455.GA93041@dspnet.fr.eu.org> (raw)
In-Reply-To: <20050921.172849.103555057.davem@davemloft.net>
On Wed, Sep 21, 2005 at 05:28:49PM -0700, David S. Miller wrote:
> You know, I personally was unaware that this was supported until now.
> I have been always reverting local debugging changes in order to merge
> other people's work in, then reapply the debugging changes afterwards.
Why don't you commit the debugging changes, go back one step in the
tree (reverting them through git in practice), merge other's people
work then merge the debugging changes back in ? You never know when
the debug changes will be useful again, so it's nice to have them in
your private tree, and this method makes it reasonably automatic.
OG.
next prev parent reply other threads:[~2005-09-22 0:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-21 20:15 Please undo "Use git-merge instead of git-resolve in git-pull" Linus Torvalds
2005-09-21 20:20 ` Linus Torvalds
2005-09-21 21:48 ` Junio C Hamano
2005-09-21 22:03 ` Linus Torvalds
2005-09-22 0:28 ` David S. Miller
2005-09-22 0:39 ` Linus Torvalds
2005-09-22 0:54 ` Olivier Galibert [this message]
2005-09-22 1:46 ` Martin Langhoff
2005-09-22 2:10 ` Linus Torvalds
2005-09-23 0:28 ` Petr Baudis
-- strict thread matches above, loose matches on Subject: below --
2005-09-22 16:31 Jon Loeliger
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=20050922005455.GA93041@dspnet.fr.eu.org \
--to=galibert@pobox.com \
--cc=davem@davemloft.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).