summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ba1884d99..891b58185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-02 Frank Terbeck <ft@bewatermyfriend.org>
+
+ * Simon Ruderich: 27813: Completion/Unix/Command/_git: Complete
+ some generic symbolic references as heads.
+
2010-04-28 Clint Adams <clint@zsh.org>
* Bernd Zeimetz: 27931: Completion/Debian/Command/_bts:
@@ -13091,5 +13096,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4970 $
+* $Revision: 1.4971 $
*****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index f30de494a..aef5e7c68 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3126,7 +3126,7 @@ __git_heads () {
branch_names=(${${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname)"' refs/heads refs/remotes 2>/dev/null)"}#refs/(heads|remotes)/})
__git_command_successful || return
- _wanted heads expl branch-name compadd $* - $branch_names HEAD
+ _wanted heads expl branch-name compadd $* - $branch_names HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD
}
(( $+functions[__git_tags] )) ||