diff options
| author | Dan Winship <danw@gnome.org> | 2011-08-02 10:57:48 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2012-03-01 13:52:04 -0500 |
| commit | f69a952c5d66fcd2da40d125374608c04f39960b (patch) | |
| tree | 6358e0a2f34c3687a1b1385fdd4a2f7c2be986d2 /git-bz.txt | |
| parent | ce11237046a1af9728f7d0544c6aae8eb1d5c7d3 (diff) | |
apply: attempt to handle plain diffs
If a bug has a plain diff (as opposed to git-format-patch output),
prepend some minimal headers to it to get it into a format git-am will
accept, and then make the user write a commit message for it before
proceeding.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
Diffstat (limited to 'git-bz.txt')
| -rw-r--r-- | git-bz.txt | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |