summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-17 12:32:58 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-17 12:33:24 -0700
commit0e5767991b19d8f91b437a679196a1dfd678c5a0 (patch)
treeb19144a15f1fe19dc3b32f939fc9c1418e76fe84
parent4d8002429fb6c5427d7f3e5481e63d645780a5b7 (diff)
downloadgit-0e5767991b19d8f91b437a679196a1dfd678c5a0.tar.gz
Update RelNotes to 2.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.6.0.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 438cb60535..7288aaf716 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation/RelNotes/2.6.0.txt
@@ -339,6 +339,10 @@ notes for details).
scripted version that appear in 2.5.x maintenance track and older.
(merge b9d6689 js/maint-am-skip-performance-regression later to maint).
+ * The branch descriptions that are set with "git branch --edit-description"
+ option were used in many places but they weren't clearly documented.
+ (merge 561d2b7 po/doc-branch-desc later to maint).
+
* Code cleanups and documentation updates.
(merge 1c601af es/doc-clean-outdated-tools later to maint).
(merge 3581304 kn/tag-doc-fix later to maint).
@@ -363,3 +367,4 @@ notes for details).
(merge 1733ed3 ee/clean-test-fixes later to maint).
(merge 5fcadc3 gb/apply-comment-typofix later to maint).
(merge b894d3e mp/t7060-diff-index-test later to maint).
+ (merge d238710 as/config-doc-markup-fix later to maint).