From: Julien Danjou <julien@danjou.info>
To: ding@gnus.org
Subject: Re: git newbie errors
Date: Tue, 09 Nov 2010 19:56:29 +0100 [thread overview]
Message-ID: <871v6u1g2q.fsf@keller.adm.naquadah.org> (raw)
In-Reply-To: <87fwvaba7v.fsf@dod.no> (Steinar Bang's message of "Tue, 09 Nov 2010 19:52:52 +0100")
On Tue, Nov 09 2010, Steinar Bang wrote:
> When we then did "git pull" we got some odd merges done into our local
> branches. It was hard to see what had happened and hard to undo.
What I do on my side is:
git pull --rebase
So I never merge, I just fix conflict of my local patches one by one if
needed (which is rare, except for changelog).
The history is then linear and not diamond-like, which is simpler when
you only work on small patches.
--
Julien Danjou
// ᐰ <julien@danjou.info> http://julien.danjou.info
next prev parent reply other threads:[~2010-11-09 18:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 18:09 Lars Magne Ingebrigtsen
2010-11-09 18:52 ` Steinar Bang
2010-11-09 18:56 ` Julien Danjou [this message]
2010-11-09 19:07 ` Lars Magne Ingebrigtsen
2010-11-09 21:12 ` Andreas Schwab
2010-11-09 20:19 ` Francis Moreau
2010-11-09 20:36 ` Steinar Bang
2010-11-10 13:50 ` Francis Moreau
2010-11-10 14:02 ` Steinar Bang
2010-11-12 0:01 ` Greg Troxel
2010-11-10 2:15 ` Katsumi Yamaoka
2010-11-10 17:38 ` Andreas Schwab
2010-11-10 17:56 ` Lars Magne Ingebrigtsen
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=871v6u1g2q.fsf@keller.adm.naquadah.org \
--to=julien@danjou.info \
--cc=ding@gnus.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).