It’s done, if no .rej files be produced.

If git am failed, it’ll try to apply the other successful part and produce the .rej files to indicate the failed part.

Edit the failed files then, and using git status to make sure how many files infected and using git add files to add them or using git add -u to add all not updated files.

Finally, git am --resolved

Note for the zsh user. (2010/01/12)
I changed my default shell to zsh recently and found the apply patch command is broken. Although zsh claim that it’s compatible with bash, there are still some difference. But the good news is we can overcome this problem by adding one more line in the .zshrc
setopt GLOB_SUBST
More detail, please read this

acelan@acelan-nb:~/workspace/ubuntu-karmic$ git branch -r

origin/HEAD -> origin/master
origin/arm
origin/ec2
origin/fsl-imx51
origin/master
origin/mvl-dove
origin/netbook
origin/patches-that-need-love
origin/pending-upstream-patches
origin/test_branch_1

acelan@acelan-nb:~/workspace/ubuntu-karmic$ git checkout -b test origin/test_branch_1

Checking out files: 100% (9533/9533), done.
Branch test set up to track remote branch test_branch_1 from origin.
Switched to a new branch ‘test’

acelan@acelan-nb:~/workspace/ubuntu-karmic$ git log

commit a2c978c3ffb96982b3876b37c0a21fcc787234bc
Author: AceLan Kao ＜acelan@ooo.xxx.com>
Date: Fri Jun 12 13:42:45 2009 +0800

only for git test

commit fba4b54f8f16a11ff3e57b7ac76d437b5d831695
Author: AceLan ＜acelan@acelan-nb.(none)>
Date: Tue Jun 9 16:17:23 2009 +0800

UBUNTU: [Upstream]

Signed-off-by: AceLan ＜acelan@acelan-nb.(none)>

It was my second day, and I didn’t know too much about git. Of course, the branch was already been deleted, and nobody will know what I had did. :p

Clone Jaunty kernel and add my public repository, so that I can publish my modification to public git tree.
git clone --reference linux-2.6 git://kernel.ubuntu.com/ubuntu/ubuntu-jaunty.git
git remote add zinc git+ssh://zinc.ubuntu.com/srv/kernel.ubuntu.com/git/acelan/acelan-jaunty.git
NOTE. The reference git tree(ex. linux-2.6) shouldn’t be removed under any circumstances, or the reference object will disappear and the git tree will become unusable. The file .git/objects/info/alternates will record the referenced git tree, try to specify an available one, if you removed the original reference tree accidentally.

We usually cherry pick upstream kernel commit, this is the command.
git cherry-pick -s -e -x aa1812b3e

And the request letter format for cherry pick.
git request-pull \
\
git://kernel.ubuntu.com//my-jaunty.git \
> new_branch_1-request-pull.txt