mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git 1.8.0-rc3

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-10-17 10:39:44 -07:00
parent 3d0a2d654f
commit 22ed067acc
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/RelNotes/1.8.0.txt
View File

@ -73,9 +73,6 @@ UI, Workflows & Features
with the mergetool.$name.cmd configuration variable even for built-in with the mergetool.$name.cmd configuration variable even for built-in
mergetool backends. 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 * "git rebase -i" learned the "--edit-todo" option to open an editor
to edit the instruction sheet. to edit the instruction sheet.
@ -212,7 +209,6 @@ to them for details).
* "git fetch" over the dumb-http revision walker could segfault when * "git fetch" over the dumb-http revision walker could segfault when
curl's multi interface was used. 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 * "git gc --auto" notified the user that auto-packing has triggered
even under the "--quiet" option. even under the "--quiet" option.
@ -226,6 +222,9 @@ to them for details).
--author or --committer, it showed commits that mention either A or --author or --committer, it showed commits that mention either A or
B (or both) instead. 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 * "git p4", when "--use-client-spec" and "--detect-branches" are used
together, misdetected branches. together, misdetected branches.

2
GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.8.0-rc2 DEF_VER=v1.8.0-rc3
LF=' LF='
' '