diff options
| -rw-r--r-- | Documentation/RelNotes/1.8.0.txt | 7 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt index 9158899d60..04f6ace828 100644 --- 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. - * 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. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 3c0e89c4cb..27b490c691 100755 --- a/GIT-VERSION-GEN +++ b/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=' ' |