mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Git 1.8.0-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3d0a2d654f
commit
87a5461fa7
|
@ -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.
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
GVF=GIT-VERSION-FILE
|
||||
DEF_VER=v1.8.0-rc2
|
||||
DEF_VER=v1.8.0-rc3
|
||||
|
||||
LF='
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue