From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/77598 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.gnus.general Subject: Re: Inconsistent doc for message-generate-new-buffers Date: Mon, 07 Mar 2011 19:52:20 +0100 Message-ID: References: <87d3m3jbbr.fsf@gmail.com> <87pqq3getl.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1299523983 20212 80.91.229.12 (7 Mar 2011 18:53:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 7 Mar 2011 18:53:03 +0000 (UTC) Cc: ding@gnus.org To: Antoine Levitt Original-X-From: ding-owner+M25921@lists.math.uh.edu Mon Mar 07 19:52:58 2011 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PwfY9-0007m5-3L for ding-account@gmane.org; Mon, 07 Mar 2011 19:52:57 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1PwfXg-0005ic-Mj; Mon, 07 Mar 2011 12:52:28 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1PwfXf-0005iE-5O for ding@lists.math.uh.edu; Mon, 07 Mar 2011 12:52:27 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PwfXc-0003zz-Sd for ding@lists.math.uh.edu; Mon, 07 Mar 2011 12:52:25 -0600 Original-Received: from mail-out.m-online.net ([212.18.0.10]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1PwfXZ-0003AK-Qb for ding@gnus.org; Mon, 07 Mar 2011 19:52:21 +0100 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 68EE8186DECF; Mon, 7 Mar 2011 19:52:21 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 6734A1C000A6; Mon, 7 Mar 2011 19:52:21 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id k1YOc9svO2Kv; Mon, 7 Mar 2011 19:52:21 +0100 (CET) Original-Received: from igel.home (ppp-93-104-133-131.dynamic.mnet-online.de [93.104.133.131]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 7 Mar 2011 19:52:20 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 5FB88CA2A0; Mon, 7 Mar 2011 19:52:20 +0100 (CET) X-Yow: I just had a MAJOR CONTRACT DISPUTE with SUZANNE SOMERS!! In-Reply-To: <87pqq3getl.fsf@gmail.com> (Antoine Levitt's message of "Mon, 07 Mar 2011 15:55:50 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2.94 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:77598 Archived-At: Antoine Levitt 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."