Skip to content

Keep local branch list order in completions for certain commands like move, merge and tag #60

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

Merged
joseluisq merged 1 commit into from
Jul 15, 2025
Merged

Keep local branch list order in completions for certain commands like move, merge and tag #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion completions/merge.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

__gitnow_load_git_functions

complete -f -x -c merge -a '(__fish_git_branches)'
complete -f -k -x -c merge -a '(__fish_git_branches)'

complete -f -x -c merge \
-s h -l help \
Expand Down
10 changes: 5 additions & 5 deletions completions/move.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@

__gitnow_load_git_functions

complete -f -x -c move -a '(__fish_git_branches)'
complete -f -k -x -c move -a '(__fish_git_branches)'

complete -f -x -c move \
complete -f -k -x -c move \
-s h -l help \
-d "Show information about the options for this command"

complete -f -x -c move \
-s p -l prev \
-d "Switch to a previous branch using the `--no-apply-stash` option (equivalent to \"move -\")"

complete -f -x -c move \
complete -f -k -x -c move \
-s n -l no-apply-stash \
-a '(__fish_git_branches)' \
-d "Switch to a local branch but without applying current stash"

complete -f -x -c move \
complete -f -k -x -c move \
-s u -l upstream \
-a '(__fish_git_branches)' \
-d "Fetch a remote branch and switch to it applying current stash"

complete -f -x -c move \
complete -f -k -x -c move \
-s r -l remote-branch \
-n 'contains -- -u (commandline -opc); or contains -- --upstream (commandline -opc)' \
-a '(__fish_git_branches)' \
Expand Down
4 changes: 2 additions & 2 deletions completions/tag.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

__gitnow_load_git_functions

complete -f -x -c tag \
complete -f -k -x -c tag \
-d "List all tags in a lexicographic order and treating tag names as versions"

complete -f -x -c tag -a '(__fish_git_tags)'
complete -f -k -x -c tag -a '(__fish_git_tags)'

complete -f -x -c tag \
-s h -l help \
Expand Down