Update draft release notes to 1.6.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.6.0.txt b/Documentation/RelNotes-1.6.0.txt
index 9125ee01a6c4d4cb6d9104b2ac008b05b92e3a3a..89ea1e9385bdea0ec42891c1f5ac7763cdbf8a73 100644 (file)
--- a/Documentation/RelNotes-1.6.0.txt
+++ b/Documentation/RelNotes-1.6.0.txt
@@ -110,6 +110,9 @@ Updates since v1.5.6
 * "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
   manually.
 
 * "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
   manually.
 

+* git-am records the original tip of the branch in ORIG_HEAD before it
+  starts applying patches.
+

 * git-apply can handle a patch that touches the same path more than once
   much better than before.
 
 * git-apply can handle a patch that touches the same path more than once
   much better than before.
 


@@ -126,6 +129,14 @@ Updates since v1.5.6
   similar to the way git-checkout reports by how many commits your branch
   is ahead/behind.
 
   similar to the way git-checkout reports by how many commits your branch
   is ahead/behind.
 

+* git-branch's --contains option used to always require a commit parameter
+  to limit the branches with; it now defaults to list branches that
+  contains HEAD if this parameter is omitted.
+
+* git-branch's --merged and --no-merged option used to always limit the
+  branches relative to the HEAD, but they can now take an optional commit
+  argument that is used in place of HEAD.
+

 * git-bundle can read the revision arguments from the standard input.
 
 * git-cherry-pick can replay a root commit now.
 * git-bundle can read the revision arguments from the standard input.
 
 * git-cherry-pick can replay a root commit now.


@@ -144,6 +155,9 @@ Updates since v1.5.6
 * fast-export learned to export and import marks file; this can be used to
   interface with fast-import incrementally.
 
 * fast-export learned to export and import marks file; this can be used to
   interface with fast-import incrementally.
 

+* git-rebase records the original tip of branch in ORIG_HEAD before it is
+  rewound.
+

 * "git rerere" can be told to update the index with auto-reused resolution
   with rerere.autoupdate configuration variable.
 
 * "git rerere" can be told to update the index with auto-reused resolution
   with rerere.autoupdate configuration variable.
 


@@ -152,6 +166,8 @@ Updates since v1.5.6
 
 * git-send-mail can talk not just over SSL but over TLS now.
 
 
 * git-send-mail can talk not just over SSL but over TLS now.
 

+* git-shortlog honors custom output format specified with "--pretty=format:".
+

 * "git-stash save" learned --keep-index option.  This lets you stash away the
   local changes and bring the changes staged in the index to your working
   tree for examination and testing.
 * "git-stash save" learned --keep-index option.  This lets you stash away the
   local changes and bring the changes staged in the index to your working
   tree for examination and testing.


@@ -185,6 +201,6 @@ this release, unless otherwise noted.
 
 ---
 exec >/var/tmp/1
 
 ---
 exec >/var/tmp/1

-O=v1.5.6.3-315-g10ce020
+O=v1.5.6.3-350-g499027b

 echo O=$(git describe refs/heads/master)
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
 echo O=$(git describe refs/heads/master)
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint