diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-18 19:26:44 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-18 19:26:44 +0400 |
| commit | 58e0fa5416c0a91761d904fd097c2ba9e45e3654 (patch) | |
| tree | 595dd91831f6bd88448b62eea08a208346cd0814 /Documentation | |
| parent | f4a75a416f62c0494e06cb42a11c7cc70ec9303e (diff) | |
| parent | f430c8e44d0548e844d817fc32be7c38b2b6856c (diff) | |
Merge branch 'maint'
* maint:
Hopefully the final draft release notes update before 1.6.0.3
diff(1): clarify what "T"ypechange status means
contrib: update packinfo.pl to not use dashed commands
force_object_loose: Fix memory leak
tests: shell negation portability fix
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.6.0.3.txt | 10 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.6.0.3.txt b/Documentation/RelNotes-1.6.0.3.txt index 214a400aa2..c0f037d6db 100644 --- a/Documentation/RelNotes-1.6.0.3.txt +++ b/Documentation/RelNotes-1.6.0.3.txt @@ -24,6 +24,12 @@ Fixes since v1.6.0.2 * "git diff --no-index" on binary files no longer outputs a bogus "diff --git" header line. +* "git diff" hunk header patterns with multiple elements separated by LF + were not used correctly. + +* "git gc" when ejecting otherwise unreachable objects from packfiles into + loose form leaked memory. + * Hunk headers in "git diff" default to using extended regular expressions, fixing some of the internal patterns on non-GNU platforms. @@ -47,6 +53,8 @@ Fixes since v1.6.0.2 * "git remote show -v" now displays all URLs of a remote. +* "git checkout -b branch" was confused when branch already existed. + * "git checkout -q" once again suppresses the locally modified file list. * "git clone -q", "git fetch -q" asks remote side to not send @@ -107,6 +115,6 @@ Many other documentation updates. -- exec >/var/tmp/1 -O=v1.6.0.2-95-g72d404d +O=v1.6.0.2-110-gf07c3c5 echo O=$(git describe maint) git shortlog --no-merges $O..maint diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7788d4fa4a..c62b45cdba 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -137,7 +137,8 @@ endif::git-format-patch[] --diff-filter=[ACDMRTUXB*]:: Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their - type (mode) changed (`T`), are Unmerged (`U`), are + type (i.e. regular file, symlink, submodule, ...) changed (`T`), + are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters may be used. When `*` (All-or-none) is added to the combination, all |