From: Andreas Schwab <schwab@linux-m68k.org>
To: Antoine Levitt <antoine.levitt@gmail.com>
Cc: ding@gnus.org
Subject: Re: Inconsistent doc for message-generate-new-buffers
Date: Mon, 07 Mar 2011 19:52:20 +0100 [thread overview]
Message-ID: <m2zkp6bw63.fsf@igel.home> (raw)
In-Reply-To: <87pqq3getl.fsf@gmail.com> (Antoine Levitt's message of "Mon, 07 Mar 2011 15:55:50 +0100")
Antoine Levitt <antoine.levitt@gmail.com> writes:
> It just seems too much trouble to maintain a separate branch, especially
> since I tend to get extremely confused by git error messages and end up
> doing a lot of git reset --hard :) So I just maintain a set a patches
> without ever committing and I just do git stash && git pull && git stash
> apply.
Try git pull --rebase instead.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
prev parent reply other threads:[~2011-03-07 18:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-07 13:43 Antoine Levitt
2011-03-07 14:42 ` Julien Danjou
2011-03-07 14:55 ` Antoine Levitt
2011-03-07 15:09 ` Julien Danjou
2011-03-07 18:52 ` Andreas Schwab [this message]
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=m2zkp6bw63.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=antoine.levitt@gmail.com \
--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).