From: Eli Zaretskii <eliz@gnu.org>
To: Lars Magne Ingebrigtsen <larsi@gnus.org>
Cc: emacs-devel@gnu.org
Subject: Re: A simple git workflow for the rest of us
Date: Sat, 15 Nov 2014 18:38:39 +0200 [thread overview]
Message-ID: <8361egfmgg.fsf@gnu.org> (raw)
In-Reply-To: <m38ujcmomg.fsf@stories.gnus.org>
> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
> Date: Sat, 15 Nov 2014 17:09:59 +0100
>
> Setting up and using git for normal, simple bugfixing
> =====================================================
>
> If you haven't configured git before you should first do:
>
> git config --global user.name "Frank Chu"
> git config --global user.email "fchu@example.com"
>
> Initial setup
> =============
>
> Then we want to clone the repository. We normally want to have both
> the current trunk and the emacs-24 branch.
>
> mkdir ~/emacs
> cd ~/emacs
> git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git
> mv emacs trunk
> ./trunk/admin/git-new-workdir trunk emacs-24
> cd emacs-24
> git checkout emacs-24
I don't think these 2 sections should be in the document. If you
like, we can add a reference to the Wiki here, which explains this in
more detail.
> cd ~/emacs/emacs-24
> git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b
I think we should decide whether we want to use -x here.
> git commit --amend
>
> and add "Backport:" to the commit string.
Why not use "cherry-pick -e" instead?
next prev parent reply other threads:[~2014-11-15 16:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-15 16:09 A simple git workflow for the rest of us Lars Magne Ingebrigtsen
2014-11-15 16:38 ` Eli Zaretskii [this message]
2014-11-15 17:08 ` Lars Magne Ingebrigtsen
2014-11-16 2:57 ` Ted Zlatanov
2014-11-15 17:43 ` Achim Gratz
2014-11-15 18:04 ` Eli Zaretskii
2014-11-15 17:39 ` Achim Gratz
2014-11-15 17:47 ` Lars Magne Ingebrigtsen
2014-11-15 19:47 ` Karl Fogel
2014-11-16 19:05 ` Bill Wohler
2014-11-22 9:23 ` Steinar Bang
2014-11-22 13:35 ` Lars Magne Ingebrigtsen
2014-11-22 15:00 ` Steinar Bang
2014-11-22 15:26 ` Lars Magne Ingebrigtsen
2014-11-15 18:17 ` Andreas Schwab
2014-11-15 20:20 ` Kelvin White
2014-11-15 20:54 ` Kelvin White
2014-11-16 19:33 ` Bill Wohler
2014-11-16 19:43 ` Lars Magne Ingebrigtsen
2014-11-16 20:12 ` Ted Zlatanov
2014-11-16 20:19 ` Eli Zaretskii
2014-11-22 9:29 ` Steinar Bang
2014-11-23 18:28 ` Bill Wohler
2014-11-24 15:25 ` Sergey Organov
2014-11-15 19:08 ` Lars Magne Ingebrigtsen
2014-11-15 19:46 ` Andreas Schwab
2014-11-16 14:13 ` Lars Magne Ingebrigtsen
2014-11-16 14:34 ` David Engster
2014-11-16 14:42 ` Lars Magne Ingebrigtsen
2014-11-16 14:50 ` David Engster
2014-11-16 14:54 ` Lars Magne Ingebrigtsen
2014-11-16 15:19 ` David Kastrup
2014-11-16 14:36 ` Achim Gratz
2014-11-16 2:15 ` Glenn Morris
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8361egfmgg.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.