Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious

diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt
index e27dd71d0ccdeac41799a4ddc910863b2466e583..d9da586972620cf10157bc55cc24d6c40434ff6f 100644 (file)
--- a/Documentation/RelNotes/1.7.8.txt
+++ b/Documentation/RelNotes/1.7.8.txt
@@ -29,7 +29,7 @@ Updates since v1.7.7
    files from the index, not from the working tree.
 
  * Variants of "git cherry-pick" and "git revert" that take multiple
-   commits learned to "--continue".
+   commits learned to "--continue" and "--abort".
 
  * "git daemon" gives more human readble error messages to clients
    using ERR packets when appropriate.
@@ -162,7 +162,7 @@ included in this release.
 
 ---
 exec >/var/tmp/1
-O=v1.7.8-rc2-3-g09116a1
+O=v1.7.8-rc3-16-g9e9ab40
 echo O=$(git describe --always master)
 git log --first-parent --oneline --reverse ^$O master
 echo