From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: Re: [git-101] How to push a branch and avoid merge-message?
Date: Wed, 24 Dec 2014 22:09:06 +0100
Message-ID: <871tno3gct.fsf@nicolasgoaziou.fr>
References: <87h9x5hwso.fsf@gmx.us> <87oarcbppe.fsf@nicolasgoaziou.fr>
	<87fvcozfhf.fsf@gmx.us> <87h9x4bj33.fsf@nicolasgoaziou.fr>
	<87iohks4ne.fsf@gmx.us> <87d27rbvio.fsf@nicolasgoaziou.fr>
	<87bnnbhg2x.fsf@gmx.us> <878uifbjc7.fsf@nicolasgoaziou.fr>
	<87388j9qbv.fsf@gmx.us> <87y4q57t2i.fsf@nicolasgoaziou.fr>
	<87lhm4n9ky.fsf@pank.eu> <87mw6gyctg.fsf@nicolasgoaziou.fr>
	<87lhm01mj7.fsf@gmx.us> <87wq5kvt2g.fsf@nicolasgoaziou.fr>
	<8761d32759.fsf@gmx.us> <87h9wn4d8r.fsf@nicolasgoaziou.fr>
	<87vbl3z65i.fsf@gmx.us> <878uhz47t2.fsf@nicolasgoaziou.fr>
	<87d2799bnp.fsf@gmx.us> <874mskapg1.fsf_-_@gmx.us>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33684)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1Y3tAG-0001du-VS
	for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 16:08:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1Y3tAC-0001qB-08
	for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 16:08:16 -0500
Received: from relay5-d.mail.gandi.net ([2001:4b98:c:538::197]:46191)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1Y3tAB-0001ps-Qr
	for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 16:08:11 -0500
In-Reply-To: <874mskapg1.fsf_-_@gmx.us> (rasmus@gmx.us's message of "Wed, 24
	Dec 2014 19:10:54 +0100")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Rasmus <rasmus@gmx.us>
Cc: emacs-orgmode@gnu.org

Hello,

Rasmus <rasmus@gmx.us> writes:

> Hmm, inspecting cgit I see that one of those persky merge messages got up
> there even though it wasn't in my local git log before pushing.
> Sorry!

No worries, this is not a problem.

> What is my mistake:
>
> - I wrote the patch locally in a branch called include.
> - I did git pull --rebase origin master before pushing.  I then did push
>   origin master from my include branch.  I did not merge it into master
>   exactly to avoid this merge-message...

I usually rebase to master just before pushing (i.e., R "master" from
"include" branch).


Regards,

-- 
Nicolas Goaziou