[tor-commits] [torbrowser/maint-2.2] Update HACKING doc to describe a pure git way of producing patches.

[erinn at torproject.org]

commit 7b39117cccd52280fb200086297ff3d2177cf331
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Mon Jun 20 17:21:29 2011 -0700

    Update HACKING doc to describe a pure git way of producing patches.
---
 docs/HACKING |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/docs/HACKING b/docs/HACKING
index ce020ac..a25e5b8 100644
--- a/docs/HACKING
+++ b/docs/HACKING
@@ -179,7 +179,7 @@ Patch format
 The patches for TBB components live in torbrowser.git/src/current-patches and
 are in the following format:
 
-001-component-patch-summary.patch
+0001-component-patch-summary.patch
 
 Please see TBB's git for a list of current patches:
 https://gitweb.torproject.org/torbrowser.git/tree/refs/heads/maint-2.2:/src/current-patches
@@ -203,6 +203,14 @@ people will be looking in the patch to see why it's being used.
 You may have to change the filename of the patch to fit appropriately in the
 patch series if there are pre-existing patches.
 
+Alternatively, you can apply all the current patches in order to your git
+checkout, and you should be able to kick the N most recent back out again
+with:
+
+$ git format-patch -N
+
+This way, you can ensure there are no conflicts.
+
 Submitting patches
 ----------------------