Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git: support merge --no-ff #2176

Merged
merged 2 commits into from
Jan 15, 2024
Merged

git: support merge --no-ff #2176

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6795d55
git: support merge --no-ff
fehnomenal Jan 15, 2024
dc84d4a
Update merge.go
fehnomenal Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions completers/git_completer/cmd/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func init() {
mergeCmd.Flags().Bool("continue", false, "continue the current in-progress merge")
mergeCmd.Flags().BoolP("edit", "e", false, "edit message before committing")
mergeCmd.Flags().Bool("ff", false, "allow fast-forward (default)")
mergeCmd.Flags().Bool("no-ff", false, "force merge commit")
mergeCmd.Flags().Bool("ff-only", false, "abort if fast-forward is not possible")
mergeCmd.Flags().StringP("file", "F", "", "read message from file")
mergeCmd.Flags().StringP("gpg-sign", "S", "", "GPG sign commit")
Expand Down
Loading