1. Stefan Saasen
  2. git


Junio C Hamano  committed 87a5461

Git 1.8.0-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

  • Participants
  • Parent commits 3d0a2d6
  • Branches master
  • Tags v1.8.0-rc3

Comments (0)

Files changed (2)

File Documentation/RelNotes/1.8.0.txt

View file
  • Ignore whitespace
    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.
  * "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.
    --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 file
  • Ignore whitespace