Skip to content

Commit

Permalink
Git completion fixes (#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
magicant authored Nov 12, 2024
2 parents eb1bae5 + 67e4b77 commit 31a0127
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion share/completion/git-merge
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function completion/git::merge:arg {
function completion/git::merge:getopt {
OPTIONS=("$OPTIONS" #>#
"--commit; commit the merge result automatically"
"--continue; continue the current merge"
"--ff; fast-forward if possible"
"--ff-only; allow fast-forward only"
"--log::; specify the number of commits in the merged branch of which the messages are reused"
Expand All @@ -51,7 +52,7 @@ function completion/git::merge:getopt {
"--stat --summary; print a diffstat"
"s: --strategy:; specify the merge strategy"
"X: --strategy-option:; specify a strategy-specific option"
"v --verbose" # TODO description
"v --verbose; output additional information"
) #<#
}

Expand Down
2 changes: 1 addition & 1 deletion share/completion/git-push
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function completion/git::push:arg {
"u --set-upstream; make pushed branches remote-tracking"
"--tags; push all local tags"
"--thin; send a thin pack to reduce traffic"
"v --verbose" # TODO description
"v --verbose; output additional information"
"--verify; enable the pre-push hook"
) #<#

Expand Down
2 changes: 1 addition & 1 deletion share/completion/git-rebase
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function completion/git::rebase:getopt {
"s: --strategy:; specify the merge strategy"
"x: --exec:; insert an \"exec\" line with the specified command after each commit (with -i)"
"X: --strategy-option:; specify a strategy-specific option"
"v --verbose" # TODO description
"v --verbose; output additional information"
"--verify; run the pre-rebase hook"
) #<#
if command -vf completion/git::apply:getopt >/dev/null 2>&1 ||
Expand Down

0 comments on commit 31a0127

Please sign in to comment.