Skip to content

Commit dff2d2a

Browse files
committed
docs: mention rebase in the docs
1 parent 3787d54 commit dff2d2a

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This Neovim plugin is designed to make it easy to review Gitlab MRs from within the editor. This means you can do things like:
44

5-
- Create, approve, and merge MRs for the current branch
5+
- Create, approve, rebase, and merge MRs for the current branch
66
- Read and edit an MR description
77
- Add or remove reviewers and assignees
88
- Resolve, reply to, and unresolve discussion threads

doc/gitlab.nvim.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ OVERVIEW *gitlab.nvim.overview*
3333
This Neovim plugin is designed to make it easy to review Gitlab MRs from within
3434
the editor. This means you can do things like:
3535

36-
- Create, approve, and merge MRs for the current branch
36+
- Create, approve, rebase, and merge MRs for the current branch
3737
- Read and edit an MR description
3838
- Add or remove reviewers and assignees
3939
- Resolve, reply to, and unresolve discussion threads
@@ -612,6 +612,19 @@ this command to work.
612612
See |gitlab.nvim.merge| for more help on this function.
613613

614614

615+
REBASING AN MR *gitlab.nvim.rebasing-an-mr*
616+
617+
The `rebase` action will rebase an MR on the server, wait for the rebase to
618+
take effect and then update the local reviewer state. The MR must be in a
619+
"rebasable" state for this command to work, i.e., the worktree must be clean
620+
and there must be no conflicts.
621+
>lua
622+
require("gitlab").rebase()
623+
require("gitlab").rebase({ skip_ci = true, force = true })
624+
<
625+
See |gitlab.nvim.rebase| for more help on this function.
626+
627+
615628
CREATING AN MR *gitlab.nvim.creating-an-mr*
616629

617630
To create an MR for the current branch, make sure you have the branch checked

0 commit comments

Comments
 (0)