diff --git a/git-review.1 b/git-review.1 index d8479153..a657c863 100644 --- a/git-review.1 +++ b/git-review.1 @@ -159,11 +159,15 @@ Sets the target topic for this change on the Gerrit server. If not specified, a bug number from the commit summary will be used. Alternatively, the local branch name will be used if different from remote branch. .It Fl T , Fl \-no\-topic Submit review without topic. +.It Fl \-hashtags= Ns Ar taglist +Comma-separated list of hashtag strings for this change, no spaces allowed. +.It Fl \-message= Ns Ar message +Optional quoted message to include with the patch set. .It Fl p , Fl \-private Send patch as a private patch ready for review. Gerrit versions >= 2.15 .It Fl P , Fl \-remove\-private Send patch which already in private state to normal patch. Gerrit versions >= 2.15 -.It Fl w , Fl \-work\-in\-progress +.It Fl w , Fl \-wip , Fl \-work\-in\-progress Send patch as work in progress for Gerrit versions >= 2.15 .It Fl W , Fl \-ready Send patch that is already work in progress as ready for review. Gerrit versions >= 2.15 diff --git a/releasenotes/notes/abort-rebase-8bd29d8328818660.yaml b/releasenotes/notes/abort-rebase-8bd29d8328818660.yaml index d08e4c81..12eb1001 100644 --- a/releasenotes/notes/abort-rebase-8bd29d8328818660.yaml +++ b/releasenotes/notes/abort-rebase-8bd29d8328818660.yaml @@ -1,7 +1,7 @@ --- features: - | - By default, `git rebase --abort` is run automatically following a failed + By default, ``git rebase --abort`` is run automatically following a failed test rebase, letting the user rebase again on their own if that's the state - they want to be in. A -K/--keep-rebase option is added to get the old - behavior. + they want to be in. A ``-K``/``--keep-rebase`` option is added to get the + old behavior. diff --git a/releasenotes/notes/alias-wip-0502235d55e5a4cb.yaml b/releasenotes/notes/alias-wip-0502235d55e5a4cb.yaml new file mode 100644 index 00000000..4a5382ce --- /dev/null +++ b/releasenotes/notes/alias-wip-0502235d55e5a4cb.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + For convenience, ``--wip`` is now synonymous with the longer + ``--work-in-progress`` option. diff --git a/releasenotes/notes/allow-dupe-head-702a1dcfb2406efb.yaml b/releasenotes/notes/allow-dupe-head-702a1dcfb2406efb.yaml new file mode 100644 index 00000000..6eebb586 --- /dev/null +++ b/releasenotes/notes/allow-dupe-head-702a1dcfb2406efb.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + If ``HEAD`` already exists on a remote branch, ``git review`` will now only + warn and prompt for confirmation when pushing, in order to let the Gerrit + server decide whether to accept or reject it. diff --git a/releasenotes/notes/emmbed-commit-msg-hook-87509c496b561f97.yaml b/releasenotes/notes/emmbed-commit-msg-hook-87509c496b561f97.yaml index 88d473a7..86e4e5fb 100644 --- a/releasenotes/notes/emmbed-commit-msg-hook-87509c496b561f97.yaml +++ b/releasenotes/notes/emmbed-commit-msg-hook-87509c496b561f97.yaml @@ -6,5 +6,5 @@ features: This approach is safer and more robust, but may break workflows for sites which rely on users retrieving a customized commit-msg hook. For this reason, a command-line override is provided so that users can, for example, - execute `git review -s --remote-hook` to get the old behavior when setting - up a new clone. + execute ``git review -s --remote-hook`` to get the old behavior when + setting up a new clone. diff --git a/releasenotes/notes/git-ssh-envvar-21d9ceb5a556009b.yaml b/releasenotes/notes/git-ssh-envvar-21d9ceb5a556009b.yaml new file mode 100644 index 00000000..2ee965cf --- /dev/null +++ b/releasenotes/notes/git-ssh-envvar-21d9ceb5a556009b.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The ``GIT_SSH`` environment variable will now be consulted, if set, in + order to determine which ``ssh`` executable to call outside of ``git`` + invocations, for consistency. diff --git a/releasenotes/notes/hashtags-option-ce909662d7ebd4d7.yaml b/releasenotes/notes/hashtags-option-ce909662d7ebd4d7.yaml new file mode 100644 index 00000000..76966767 --- /dev/null +++ b/releasenotes/notes/hashtags-option-ce909662d7ebd4d7.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + A new ``--hashtags`` option allows specifying a list of one or more Gerrit + hashtag strings, separated by commas. Note that spaces are not allowed + either within a hashtag or between separators. diff --git a/releasenotes/notes/message-option-52752c85d3ea1356.yaml b/releasenotes/notes/message-option-52752c85d3ea1356.yaml new file mode 100644 index 00000000..1112a207 --- /dev/null +++ b/releasenotes/notes/message-option-52752c85d3ea1356.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + New ``--message`` option can be used to include a custom patchset message + when pushing.