From: Lars Magne Ingebrigtsen <larsi@gnus.org>
To: ding@gnus.org
Subject: Re: git newbie errors
Date: Tue, 09 Nov 2010 20:07:06 +0100 [thread overview]
Message-ID: <m3bp5yxqn9.fsf@quimbies.gnus.org> (raw)
In-Reply-To: <871v6u1g2q.fsf@keller.adm.naquadah.org>
Julien Danjou <julien@danjou.info> writes:
> 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.
Every time I've tried to say "git pull --rebase", it hasn't worked...
or did I say "git rebase"? Uhm. Yes, probably. :-)
I'll try to say "git pull --rebase" in the future, and see what
happens...
--
(domestic pets only, the antidote for overdose, milk.)
larsi@gnus.org * Lars Magne Ingebrigtsen
next prev parent reply other threads:[~2010-11-09 19:07 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
2010-11-09 19:07 ` Lars Magne Ingebrigtsen [this message]
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=m3bp5yxqn9.fsf@quimbies.gnus.org \
--to=larsi@gnus.org \
--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).