From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: [git-101] How to push a branch and avoid merge-message? (was: [bug, patch, ox] INCLUDE and footnotes) Date: Wed, 24 Dec 2014 19:10:54 +0100 Message-ID: <874mskapg1.fsf_-_@gmx.us> 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> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3qOv-0005R5-BN for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 13:11:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3qOs-00066T-4i for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 13:11:13 -0500 Received: from plane.gmane.org ([80.91.229.3]:56091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3qOr-00066N-Tu for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 13:11:10 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y3qOo-0002nA-4s for emacs-orgmode@gnu.org; Wed, 24 Dec 2014 19:11:06 +0100 Received: from 89.186.183.135 ([89.186.183.135]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 24 Dec 2014 19:11:06 +0100 Received: from rasmus by 89.186.183.135 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 24 Dec 2014 19:11:06 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: emacs-orgmode@gnu.org Hi, Rasmus writes: > Please let me know if I did any git mistakes. Somehow the time got skewed > up and it's behind some of your commits in cgit. . . 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! 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 know I can get a "clean" log by doing git format-patch and then git am'ing them into my master. But this is tedious. How can I develop on branch, retain history and not get the merge message? Thanks, Rasmus PS: I did some searching on the webs beforehand, but apparently not well enough. -- A clever person solves a problem. A wise person avoids it