summaryrefslogtreecommitdiffstats
path: root/git-bz.txt
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2009-09-05 13:19:11 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2009-09-05 13:19:11 -0400
commitef827f1b1aa0c0779a6238452e105040858d11c3 (patch)
tree189ee7e3d6aa5f6e930f1ce5c8a654432d0f232d /git-bz.txt
parent71dc277bfcd7b98b1f71d46da59f5cd2da3e3974 (diff)
downloadgit-bz-ef827f1b1aa0c0779a6238452e105040858d11c3.tar.gz
Add 'git bz push -fix' and 'git bz edit --fix'
Add one-stop-shopping --fix=<bug reference> options to 'git bz push' and 'git bz edit'. These combine attaching the patches and resolving the bug for cases where review and testing aren't necessary.
Diffstat (limited to 'git-bz.txt')
-rw-r--r--git-bz.txt20
1 files changed, 15 insertions, 5 deletions
diff --git a/git-bz.txt b/git-bz.txt
index 3db24e8..7385419 100644
--- a/git-bz.txt
+++ b/git-bz.txt
@@ -12,9 +12,9 @@ SYNOPSIS
'git bz apply' [-n | --no-add-url] <bug reference>
'git bz attach' [-n | --no-add-url] [-e |--edit] [<bug reference>] (<commit> | <revision range>)
'git bz edit' (<bug reference> | <commit> | <revision range>)
-'git bz edit' --pushed (<commit> | <revision range>)
+'git bz edit' (--pushed | --fix <bug reference) (<commit> | <revision range>)
'git bz file' [-n | --no-add-url] [[<product>]/<component>] (<commit> | <revision range>)
-'git bz push' [<repository> <refspec>...]
+'git bz push' [--fix <bug reference>] [<repository> <refspec>...]
DESCRIPTION
------------
@@ -192,7 +192,11 @@ the status of patches.
If the argument identifies a commit or commits rather than a bug
then each bug referred to in the commits is edited in turn.
--p;;
+--fix=<bug reference>;;
+ Treat the specified commits as a fix for the bug. Similar
+ to attaching the commits with 'git bz attach' then using
+ 'git bz edit --pushed'.
+
--pushed;;
Attempt to automatically determine the correct comments, attachment
changes, and resolution for the bug from applying the specified commits
@@ -228,16 +232,22 @@ git bz -b bugs.freedesktop.org file my-product/some-component b50ea9bd^..
push
~~~~
-'git bz push' [<repository> <refspec>...]
+'git bz push' [--fix] [<repository> <refspec>...]
Exactly like 'git push', but 'git bz edit --pushed' is done for each
bug referenced in the newly pushed commits.
Note that ``newly pushed commit'' are commits that were added to any
existing branch by the push. Commits don't have to be pushed to master
-to be considered newly pushed. However, commits pushed to on newly
+to be considered newly pushed. However, commits pushed to newly
created branches will be ignored.
+--fix=<bug reference>;;
+ Treat the specified commits as a fix for the bug. Similar
+ to attaching the commits with 'git bz attach' before running
+ 'git bz push'. This is in an-all-one-solution to use when you
+ have a fix that doesn't need any review or testing.
+
AUTHENTICATION
--------------
In order to use git-bz you need to already be logged into the bug tracker