Git 1.8.0-rc3

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

diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt
index 9158899d60a394e998c8f011cea137b2fb4dae25..04f6ace82882d2dc0c6ac04ff1313d27e94201ba 100644 (file)
--- a/Documentation/RelNotes/1.8.0.txt
+++ b/Documentation/RelNotes/1.8.0.txt
@@ -73,9 +73,6 @@ UI, Workflows & Features
    with the mergetool.$name.cmd configuration variable even for built-in
    mergetool backends.
 
    with the mergetool.$name.cmd configuration variable even for built-in
    mergetool backends.
 

- * The "-Xours" backend option to "git merge -s recursive" now takes
-   effect even on binary files.
-

  * "git rebase -i" learned the "--edit-todo" option to open an editor
    to edit the instruction sheet.
 
  * "git rebase -i" learned the "--edit-todo" option to open an editor
    to edit the instruction sheet.
 


@@ -212,7 +209,6 @@ to them for details).
 
  * "git fetch" over the dumb-http revision walker could segfault when
    curl's multi interface was used.
 
  * "git fetch" over the dumb-http revision walker could segfault when
    curl's multi interface was used.

-   (merge 188923f jk/maint-http-half-auth-push later to maint).

 
  * "git gc --auto" notified the user that auto-packing has triggered
     even under the "--quiet" option.
 
  * "git gc --auto" notified the user that auto-packing has triggered
     even under the "--quiet" option.


@@ -226,6 +222,9 @@ to them for details).
    --author or --committer, it showed commits that mention either A or
    B (or both) instead.
 
    --author or --committer, it showed commits that mention either A or
    B (or both) instead.
 

+ * The "-Xours" backend option to "git merge -s recursive" was ignored
+   for binary files.
+

  * "git p4", when "--use-client-spec" and "--detect-branches" are used
    together, misdetected branches.
 
  * "git p4", when "--use-client-spec" and "--detect-branches" are used
    together, misdetected branches.
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3c0e89c4cbd5665852ddc93c8a7515822dbaf19e..27b490c69102934f520addd621351a753f4fffe2 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.8.0-rc2
+DEF_VER=v1.8.0-rc3

 
 LF='
 '
 
 LF='
 '