summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-28 13:49:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-28 13:49:33 -0800
commit226dcb52565b58952b78fb107d8d9def3ca396ab (patch)
treed4ad481c558d504edab562ac3240e946eb3c84e4
parentUpdate draft release notes to 1.8.1 (diff)
parentStart preparing for 1.8.0.2 (diff)
downloadtgif-226dcb52565b58952b78fb107d8d9def3ca396ab.tar.xz
Merge branch 'maint'
-rw-r--r--Documentation/RelNotes/1.8.0.2.txt15
-rw-r--r--contrib/completion/git-completion.bash2
2 files changed, 17 insertions, 0 deletions
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
;;