format-patch: fix two-argument special case, and make it easier to pick single commits

diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 1c9a36888260fe7fd6a2becdcbf24e851b0ef7c0..5a7e0cfe05f10f1dd27d39af9c8c690b50972878 100644 (file)
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -153,7 +153,8 @@ Everything is in the good order.  I do not need the temporary branch
 nor tag anymore, so remove them:
 
 ------------------------------------------------
-$ rm -f .git/refs/tags/pu-anchor .git/refs/heads/revert-c99
+$ rm -f .git/refs/tags/pu-anchor 
+$ git branch -d revert-c99
 ------------------------------------------------
 
 It was an emergency fix, so we might as well merge it into the
@@ -182,10 +183,10 @@ And the final repository status looks like this:
 ------------------------------------------------
 $ git show-branch --more=1 master pu rc
 ! [master] Revert "Replace zero-length array decls with []."
- ! [pu] git-repack-script: Add option to repack all objects.
+ ! [pu] git-repack: Add option to repack all objects.
   * [rc] Merge refs/heads/master from .
 ---
- +  [pu] git-repack-script: Add option to repack all objects.
+ +  [pu] git-repack: Add option to repack all objects.
  +  [pu~1] More documentation updates.
  +  [pu~2] Show commits in topo order and name all commits.
  +  [pu~3] mailinfo and applymbox updates