summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 94df516ba..83a27f454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2017-02-07 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * 40493/0002: Completion/Unix/Command/_git: _git-checkout:
+ Reorder default completions.
+
+2017-02-07 Daniel Shahaf <d.s@daniel.shahaf.name>
+
* 40493/0001: Completion/Unix/Command/_git: _git-checkout:
No functional change.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 8b78b5785..b16d2bc4c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -486,9 +486,10 @@ _git-checkout () {
_alternative $tree_ish_arg $file_arg && ret=0
else
_alternative \
- $remote_branch_noprefix_arg \
+ $file_arg \
$tree_ish_arg \
- $file_arg && ret=0
+ $remote_branch_noprefix_arg \
+ && ret=0
fi
elif [[ -n ${opt_args[(I)-b|-B|-t|--track|--orphan|--detach]} ]]; then