Skip to content

Commit

Permalink
Indicate options take an argument
Browse files Browse the repository at this point in the history
Co-authored-by: WATANABE Yuki <[email protected]>
  • Loading branch information
unrealapex and magicant authored Nov 3, 2024
1 parent bef323a commit ec3421f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions share/completion/git-restore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function completion/git-restore {
function completion/git::restore:arg {

OPTIONS=( #>#
"s --source=; restore the working tree files with the content from the given tree"
"s: --source:; restore the working tree files with the content from the given tree"
"p --patch; interactively select hunks in the difference between the restore source and the restore location"
"W --worktree; specify the restore location"
"S --staged; specify the restore location"
Expand All @@ -20,7 +20,7 @@ function completion/git::restore:arg {
"--ours; use stage #2 (ours) when restoring files in the working tree from the index"
"--theirs; use stage #3 (theirs) when restoring files in the working tree from the index"
"m --merge; when restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths"
"--conflict=; the same as the --merge option, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable"
"--conflict:; the same as the --merge option, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable"
"--ignore-unmerged; when restoring files on the working tree from the index, do not abort the operation if there are unmerted entries and neither --ours, --theirs, --merge, or --conflict is specified"
"--ignore-skip-worktree-bits; in sparse checkout mode, the default is to only update entries matched by <pathspec> and sparse patterns in \$GIT_DIR/info/sparse-checkout."
"--recurse-submodules; if <pathspec> names an active submodule and the restore location includes the working tree"
Expand Down

0 comments on commit ec3421f

Please sign in to comment.