emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Philipp Kroos <Philipp.Kroos@t-online.de>
To: emacs-orgmode@gnu.org
Cc: wxhgmqzgwmuf@spammotel.com
Subject: Re: Sending commits to Org
Date: Thu, 20 Sep 2012 19:07:00 +0200	[thread overview]
Message-ID: <20120920170700.GA14469@Vostro> (raw)
In-Reply-To: <80pq5g7whk.fsf@somewhere.org>

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
> 
> 

next prev parent reply	other threads:[~2012-09-20 17:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-20 11:40 Sending commits to Org Sebastien Vauban
2012-09-20 17:07 ` Philipp Kroos [this message]
2012-09-22 17:58   ` Jarmo Hurri
2012-09-23  7:21     ` Bastien

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

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120920170700.GA14469@Vostro \
    --to=philipp.kroos@t-online.de \
    --cc=emacs-orgmode@gnu.org \
    --cc=wxhgmqzgwmuf@spammotel.com \
    /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

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).