ꦫꦣꦺꦤ꧀ꦄꦤ꧀ꦠꦱꦺꦤ

PATH: usr / share / doc / git-1.8.3.1 / RelNotes

Git v1.7.5.2 Release Notes
==========================

The release notes to 1.7.5.1 forgot to mention:

* "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
   mean the same thing.

* "git upload-pack" (hence "git push" over git native protocol) had a
   subtle race condition that could lead to a deadlock.

Fixes since v1.7.5.1
--------------------

* "git add -p" did not work correctly when a hunk is split and then
   one of them was given to the editor.

* "git add -u" did not resolve a conflict where our history deleted and
   their history modified the same file, and the working tree resolved to
   keep a file.

* "git cvsimport" did not know that CVSNT stores its password file in a
   location different from the traditional CVS.

* "git diff-files" did not show the mode information from the working
   tree side of an unmerged path correctly.

* "git diff -M --cached" used to use unmerged path as a possible rename
   source candidate, which made no sense.

* The option name parser in "git fast-import" used prefix matches for
   some options where it shouldn't, and accepted non-existent options,
   e.g. "--relative-marksmith" or "--forceps".

* "git format-patch" did not quote RFC822 special characters in the
   email address (e.g From: Junio C. Hamano <jch@example.com>, not
   From: "Junio C. Hamano" <jch@example.com>).

* "git format-patch" when run with "--quiet" option used to produce a
   nonsense result that consists of alternating empty output.

* In "git merge", per-branch branch.<name>.mergeoptions configuration
   variables did not override the fallback default merge.<option>
   configuration variables such as merge.ff, merge.log, etc.

* "git merge-one-file" did not honor GIT_WORK_TREE settings when
   handling a "both sides added, differently" conflict.

* "git mergetool" did not handle conflicted submoudules gracefully.

* "git-p4" (in contrib) used a wrong base image while merge a file that
   was added on both branches differently.

* "git rebase -i -p" failed to preserve the history when there is a
   redundant merge created with the --no-ff option.

And other minor fixes and documentation updates.

[-] 1.7.2.4.txt [edit]
[-] 1.7.6.5.txt [edit]
[-] 1.7.12.txt [edit]
[-] 1.7.1.4.txt [edit]
[-] 1.7.12.4.txt [edit]
[-] 1.7.8.txt [edit]
[-] 1.6.1.2.txt [edit]
[-] 1.8.2.3.txt [edit]
[-] 1.7.10.5.txt [edit]
[-] 1.6.0.3.txt [edit]
[-] 1.7.3.4.txt [edit]
[-] 1.7.5.txt [edit]
[-] 1.7.3.5.txt [edit]
[-] 1.7.9.3.txt [edit]
[-] 1.6.5.1.txt [edit]
[-] 1.8.1.6.txt [edit]
[-] 1.7.7.1.txt [edit]
[-] 1.5.0.5.txt [edit]
[-] 1.7.2.2.txt [edit]
[-] 1.7.0.5.txt [edit]
[-] 1.6.0.2.txt [edit]
[-] 1.6.4.2.txt [edit]
[-] 1.5.6.2.txt [edit]
[-] 1.5.4.3.txt [edit]
[-] 1.7.2.3.txt [edit]
[-] 1.5.0.6.txt [edit]
[-] 1.5.3.2.txt [edit]
[-] 1.5.5.6.txt [edit]
[-] 1.7.6.6.txt [edit]
[-] 1.6.3.1.txt [edit]
[-] 1.6.6.1.txt [edit]
[-] 1.6.6.txt [edit]
[-] 1.7.8.2.txt [edit]
[-] 1.5.6.1.txt [edit]
[-] 1.8.1.3.txt [edit]
[-] 1.5.1.txt [edit]
[-] 1.7.9.6.txt [edit]
[-] 1.5.3.4.txt [edit]
[-] 1.5.2.1.txt [edit]
[-] 1.7.7.2.txt [edit]
[-] 1.5.3.8.txt [edit]
[-] 1.8.0.3.txt [edit]
[+] ..
[-] 1.6.3.txt [edit]
[-] 1.6.4.5.txt [edit]
[-] 1.5.6.3.txt [edit]
[-] 1.6.5.9.txt [edit]
[-] 1.7.8.3.txt [edit]
[-] 1.7.11.txt [edit]
[-] 1.5.2.2.txt [edit]
[-] 1.7.0.2.txt [edit]
[-] 1.7.10.4.txt [edit]
[-] 1.7.11.1.txt [edit]
[-] 1.6.2.2.txt [edit]
[-] 1.8.3.txt [edit]
[-] 1.7.8.4.txt [edit]
[-] 1.5.0.1.txt [edit]
[-] 1.7.11.4.txt [edit]
[-] 1.8.1.2.txt [edit]
[-] 1.7.6.3.txt [edit]
[-] 1.6.0.5.txt [edit]
[-] 1.5.5.4.txt [edit]
[-] 1.7.3.txt [edit]
[-] 1.7.12.2.txt [edit]
[-] 1.7.12.1.txt [edit]
[-] 1.8.2.2.txt [edit]
[-] 1.7.6.4.txt [edit]
[-] 1.8.1.txt [edit]
[-] 1.7.9.4.txt [edit]
[-] 1.5.4.1.txt [edit]
[-] 1.7.5.2.txt [edit]
[-] 1.7.2.1.txt [edit]
[-] 1.6.0.6.txt [edit]
[-] 1.7.9.2.txt [edit]
[-] 1.7.4.2.txt [edit]
[-] 1.7.4.txt [edit]
[-] 1.5.6.4.txt [edit]
[-] 1.5.4.2.txt [edit]
[-] 1.7.3.1.txt [edit]
[-] 1.6.3.3.txt [edit]
[-] 1.5.4.4.txt [edit]
[-] 1.7.7.7.txt [edit]
[-] 1.5.2.4.txt [edit]
[-] 1.8.1.1.txt [edit]
[-] 1.7.2.txt [edit]
[-] 1.6.5.3.txt [edit]
[-] 1.8.0.txt [edit]
[-] 1.8.2.1.txt [edit]
[-] 1.6.5.5.txt [edit]
[-] 1.7.5.4.txt [edit]
[-] 1.5.0.txt [edit]
[-] 1.6.1.1.txt [edit]
[-] 1.7.10.1.txt [edit]
[-] 1.8.1.5.txt [edit]
[-] 1.7.9.7.txt [edit]
[-] 1.5.1.4.txt [edit]
[-] 1.5.5.txt [edit]
[-] 1.6.5.6.txt [edit]
[-] 1.5.1.5.txt [edit]
[-] 1.6.4.4.txt [edit]
[-] 1.7.7.txt [edit]
[-] 1.5.6.txt [edit]
[-] 1.7.4.3.txt [edit]
[-] 1.6.3.4.txt [edit]
[-] 1.7.9.5.txt [edit]
[-] 1.7.9.1.txt [edit]
[-] 1.6.6.3.txt [edit]
[-] 1.7.0.3.txt [edit]
[-] 1.5.5.2.txt [edit]
[-] 1.7.0.txt [edit]
[-] 1.7.8.5.txt [edit]
[-] 1.8.2.txt [edit]
[-] 1.5.6.5.txt [edit]
[-] 1.7.9.txt [edit]
[-] 1.6.3.2.txt [edit]
[-] 1.7.11.2.txt [edit]
[-] 1.6.2.4.txt [edit]
[-] 1.7.6.2.txt [edit]
[-] 1.7.0.7.txt [edit]
[-] 1.6.5.4.txt [edit]
[-] 1.7.5.3.txt [edit]
[-] 1.5.4.5.txt [edit]
[-] 1.7.5.1.txt [edit]
[-] 1.7.3.3.txt [edit]
[-] 1.5.1.6.txt [edit]
[-] 1.7.7.5.txt [edit]
[-] 1.6.6.2.txt [edit]
[-] 1.7.0.6.txt [edit]
[-] 1.5.3.7.txt [edit]
[-] 1.7.11.6.txt [edit]
[-] 1.6.1.txt [edit]
[-] 1.6.0.4.txt [edit]
[-] 1.8.0.2.txt [edit]
[-] 1.8.1.4.txt [edit]
[-] 1.6.4.txt [edit]
[-] 1.5.5.5.txt [edit]
[-] 1.8.0.1.txt [edit]
[-] 1.6.2.3.txt [edit]
[-] 1.7.10.3.txt [edit]
[-] 1.6.5.2.txt [edit]
[-] 1.5.4.6.txt [edit]
[-] 1.5.3.1.txt [edit]
[-] 1.6.5.txt [edit]
[-] 1.6.0.txt [edit]
[-] 1.6.1.4.txt [edit]
[-] 1.7.0.9.txt [edit]
[-] 1.7.4.4.txt [edit]
[-] 1.5.1.1.txt [edit]
[-] 1.5.0.3.txt [edit]
[-] 1.5.3.3.txt [edit]
[-] 1.7.6.1.txt [edit]
[-] 1.5.3.5.txt [edit]
[-] 1.5.0.7.txt [edit]
[-] 1.7.12.3.txt [edit]
[-] 1.7.11.5.txt [edit]
[-] 1.7.7.4.txt [edit]
[-] 1.7.0.4.txt [edit]
[-] 1.5.2.3.txt [edit]
[-] 1.5.1.2.txt [edit]
[-] 1.5.2.5.txt [edit]
[-] 1.7.8.1.txt [edit]
[-] 1.7.7.6.txt [edit]
[-] 1.5.4.txt [edit]
[-] 1.5.3.txt [edit]
[-] 1.5.1.3.txt [edit]
[-] 1.7.4.1.txt [edit]
[-] 1.6.2.5.txt [edit]
[-] 1.5.0.2.txt [edit]
[-] 1.7.0.1.txt [edit]
[-] 1.7.1.2.txt [edit]
[-] 1.5.0.4.txt [edit]
[-] 1.7.6.txt [edit]
[-] 1.5.5.3.txt [edit]
[-] 1.7.1.3.txt [edit]
[-] 1.6.2.txt [edit]
[-] 1.7.4.5.txt [edit]
[-] 1.7.0.8.txt [edit]
[-] 1.7.8.6.txt [edit]
[-] 1.7.1.txt [edit]
[-] 1.6.2.1.txt [edit]
[-] 1.8.3.1.txt [edit]
[-] 1.5.2.txt [edit]
[-] 1.7.11.3.txt [edit]
[-] 1.7.2.5.txt [edit]
[-] 1.6.5.8.txt [edit]
[-] 1.6.5.7.txt [edit]
[-] 1.5.4.7.txt [edit]
[-] 1.6.4.1.txt [edit]
[-] 1.6.4.3.txt [edit]
[-] 1.5.5.1.txt [edit]
[-] 1.5.3.6.txt [edit]
[-] 1.7.7.3.txt [edit]
[-] 1.5.6.6.txt [edit]
[-] 1.7.10.txt [edit]
[-] 1.6.1.3.txt [edit]
[-] 1.7.10.2.txt [edit]
[-] 1.7.3.2.txt [edit]
[-] 1.7.1.1.txt [edit]
[-] 1.7.11.7.txt [edit]
[-] 1.6.0.1.txt [edit]