summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-18 01:52:40 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-18 01:52:40 +0000
commitcbca622b5785ac2c284d823f6782125679c61313 (patch)
tree3bfec48617190c1ca0bb82055f40be52377a3650
parent45195791a81784ce6def23f24a2af420f246328e (diff)
downloadzsh-cbca622b5785ac2c284d823f6782125679c61313.tar.gz
zsh-cbca622b5785ac2c284d823f6782125679c61313.tar.xz
zsh-cbca622b5785ac2c284d823f6782125679c61313.zip
unposted: additional git branch options.
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git5
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 150659968..f1d1e0c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-18  Clint Adams  <clint@zsh.org>
 
+	* unposted: Completion/Unix/Command/_git: additional git branch
+	options.
+
 	* 25475: Completion/Unix/Command/_git: determine heads, tags,
 	and branches through git for-each-ref instead of git tag and
 	git branch.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9045479f1..a1d0e1ca3 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1506,6 +1506,11 @@ _git-branch () {
     - create \
       '-l[create the branch'\''s reflog]' \
       '-f[force the creation of a new branch]' \
+      '--track[set up configuration so pull merges from the start point]' \
+      '--no-track[override the branch.autosetupmerge configuration variable]' \
+      '--contains=[only list branches which contain the specified commit]:commit:__git_committishs' \
+      '--merged[only list branches which are fully contained by HEAD]' \
+      '--no-merged[do not list branches which are fully contained by HEAD]' \
       ':branch-name:__git_branch_names' \
       '::start-point:__git_revisions' \
     - modify \