diff options
| author | Dan Winship <danw@gnome.org> | 2011-07-09 14:10:50 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2012-03-01 13:24:46 -0500 |
| commit | e422eea9999a02262d3bad996879378ce1824541 (patch) | |
| tree | fb48f52ef6cd7f2cc442ced66eece979789eee6f /git-bz.txt | |
| parent | 483d5e258f14176ed3cacd1138fae723a6a5fce3 (diff) | |
| download | git-bz-e422eea9999a02262d3bad996879378ce1824541.tar.gz | |
apply: add interactive option
Rather than asking whether or not to apply each patch individually,
list all of the patches at once and allow the user to either apply all
of them, apply none of them, or interactively choose which ones to
apply (a la interactive rebasing).
In addition to choosing which patches to apply, the interactive option
also allows reordering the patches before applying, and choosing to
apply committed or rejected patches.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
Diffstat (limited to 'git-bz.txt')
| -rw-r--r-- | git-bz.txt | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -134,10 +134,13 @@ apply 'git bz apply' [-n | --no-add-url] <bug reference> -For each patch attachment (except for obsolete patches) of the specified -bug, prompts whether to apply. If prompt is agreed to runs 'git am' on -the patch to apply it to the current branch. Aborts if 'git am' fails to -allow cleaning up conflicts. +Lists all "pending" patches on the specified bug (ie, the patches that +are not obsolete, committed, or rejected), and then prompts whether to +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. Aborts if 'git am' fails, to allow cleaning up conflicts. Examples: |