Re: A simple git workflow for the rest of us

[Eli Zaretskii]

> From: Lars Magne Ingebrigtsen <address@hidden>
> 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 "address@hidden"
> 
> 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?