Git 1.8.0-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 17, 2012 at 10:39 UTC
87a5461fa7b30f7b7baf27204f10219d61500fbf
2 files changed
+4
-5
Documentation/RelNotes/1.8.0.txt
+3
-4
@@ -73,9 +73,6 @@ UI, Workflows & Features
73
with the mergetool.$name.cmd configuration variable even for built-in
74
mergetool backends.
75
76
- * The "-Xours" backend option to "git merge -s recursive" now takes
77
- effect even on binary files.
78
-
76
* "git rebase -i" learned the "--edit-todo" option to open an editor
77
to edit the instruction sheet.
78
@@ -212,7 +209,6 @@ to them for details).
209
210
* "git fetch" over the dumb-http revision walker could segfault when
211
curl's multi interface was used.
215
- (merge 188923f jk/maint-http-half-auth-push later to maint).
212
213
* "git gc --auto" notified the user that auto-packing has triggered
214
even under the "--quiet" option.
@@ -226,6 +222,9 @@ to them for details).
222
--author or --committer, it showed commits that mention either A or
223
B (or both) instead.
224
225
+ * The "-Xours" backend option to "git merge -s recursive" was ignored
226
+ for binary files.
227
+
228
* "git p4", when "--use-client-spec" and "--detect-branches" are used
229
together, misdetected branches.
230
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.8.0-rc2
4
+DEF_VER=v1.8.0-rc3
5
6
LF='
7
'