Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Git 1.8.0-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 87a5461fa7b30f7b7baf27204f10219d61500fbf 1 parent 3d0a2d6
@gitster gitster authored
Showing with 4 additions and 5 deletions.
  1. +3 −4 Documentation/RelNotes/1.8.0.txt
  2. +1 −1  GIT-VERSION-GEN
View
7 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.
- * 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.
@@ -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.
- (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.
@@ -226,6 +222,9 @@ to them for details).
--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.
View
2  GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.0-rc2
+DEF_VER=v1.8.0-rc3
LF='
'
Please sign in to comment.
Something went wrong with that request. Please try again.