From mboxrd@z Thu Jan  1 00:00:00 1970
From: Philipp Kroos <Philipp.Kroos@t-online.de>
Subject: Re: Sending commits to Org
Date: Thu, 20 Sep 2012 19:07:00 +0200
Message-ID: <20120920170700.GA14469@Vostro>
References: <80pq5g7whk.fsf@somewhere.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:35036)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Philipp.Kroos@t-online.de>) id 1TEkI4-0007mn-G0
	for emacs-orgmode@gnu.org; Thu, 20 Sep 2012 13:11:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Philipp.Kroos@t-online.de>) id 1TEkHz-0006D7-Oq
	for emacs-orgmode@gnu.org; Thu, 20 Sep 2012 13:11:52 -0400
Received: from mailout09.t-online.de ([194.25.134.84]:59246)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Philipp.Kroos@t-online.de>) id 1TEkHz-0006CB-HZ
	for emacs-orgmode@gnu.org; Thu, 20 Sep 2012 13:11:47 -0400
Content-Disposition: inline
In-Reply-To: <80pq5g7whk.fsf@somewhere.org>
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: emacs-orgmode@gnu.org
Cc: wxhgmqzgwmuf@spammotel.com

Hi,

I think you're still on master when you make your changes.
git maintains your *local copy* of master as 'master', whereas the 
original, unchanged upstream branch master is still available as 
'origin/master'. You create a patch against a different branch, and 
since you are on 'master' which differs from 'origin/master', it works 
like you described.
If you first create a branch on your side and switch to it before making 
changes, you can run format-patch against your local copy of master as 
well.
That is,

#+begin_src sh
  git branch local
  git checkout local
  # make your changes
  git commit -m "Your message"
  git format-patch master
#+end_src          ^^^^^^

This is also the procedure described in 
http://orgmode.org/worg/org-contribute.html#sec-4
under *Sending commits, and it should work fine this way.

philipp


On Thu, Sep 20, 2012 at 01:40:55PM +0200, Sebastien Vauban wrote:
> Hello,
> 
> Just a Git question that puzzles me for long about how to send commits per
> email to Org ML?
> 
> In the documentation (http://orgmode.org/worg/org-contribute.html), it's
> written:
> 
> #+begin_src sh
>   git commit -m "Your message"
>   git format-patch master
> #+end_src          ^^^^^^
> 
> When I follow it, there is no 0001-patch.txt file created...
> 
> I must write:
> 
> #+begin_src sh
>   git format-patch origin/master
> #+end_src          ^^^^^^^^^^^^^
> 
> for such patch files to be created. Is it a documentation bug, or some feature
> of my (Git) installation?
> 
> Best regards,
>   Seb
> 
> 
> -- 
> Sebastien Vauban
> 
>