From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Nov 2012 21:49:33 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.1-rc0~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/226dcb52565b58952b78fb107d8d9def3ca396ab?hp=8f8af9f4d1535d84e75cb3686f4b54725ea1e19f

Merge branch 'maint'
---

diff --git a/Documentation/RelNotes/1.8.0.2.txt b/Documentation/RelNotes/1.8.0.2.txt
new file mode 100644
index 0000000000..5d08021a8d
--- /dev/null
+++ b/Documentation/RelNotes/1.8.0.2.txt
@@ -0,0 +1,15 @@
+Git v1.8.0.2 Release Notes
+==========================
+
+Fixes since v1.8.0.1
+--------------------
+
+ * "git p4" used to try expanding malformed "$keyword$" that spans
+   across multiple lines.
+
+ * "git update-ref -d --deref SYM" to delete a ref through a symbolic
+   ref that points to it did not remove it correctly.
+
+ * Syntax highlighting in "gitweb" was not quite working.
+
+Also contains other minor fixes and documentation updates.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 98f390ae46..af13fcc440 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -958,6 +958,8 @@ _git_clone ()
 			--upload-pack
 			--template=
 			--depth
+			--single-branch
+			--branch
 			"
 		return
 		;;