summaryrefslogtreecommitdiff
path: root/git-bz.txt
diff options
context:
space:
mode:
Diffstat (limited to 'git-bz.txt')
-rw-r--r--git-bz.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-bz.txt b/git-bz.txt
index 2fa298f..9817120 100644
--- a/git-bz.txt
+++ b/git-bz.txt
@@ -143,7 +143,9 @@ apply them. In addition to simply accepting or rejecting the list of
patches, you can also type "i" to interactively choose which patches
to apply, and in what order, as with 'git rebase -i'. If any patches
are selected, it runs 'git am' on each one to apply it to the current
-branch.
+branch. (If the bug contains patches in the form of plain diffs, 'git
+bz apply' will create a commit based on the other patch metadata, and
+prompt you for a commit message.)
If a 'git am' operation fails, 'git bz apply' will save its state and
then exit, at which point you can attempt to apply the patch by hand