diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:46:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 14:46:22 -0800 |
| commit | e04dc492ac1206c7a7e624c09344081263af0e66 (patch) | |
| tree | e8202b9e7c732c992eb34558a922b335a91a5d0c /Documentation | |
| parent | beecc7ab65b31c5471331e64acaa3f722125ea67 (diff) | |
| parent | be4d2920c24ba0be84ceff7e382cce2c5f1ad867 (diff) | |
| download | git-e04dc492ac1206c7a7e624c09344081263af0e66.tar.gz | |
Sync with maint
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.6.6.txt | 11 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.7.6.txt | 11 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.8.4.txt | 14 | ||||
| -rw-r--r-- | Documentation/config.txt | 3 |
4 files changed, 38 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.6.6.txt b/Documentation/RelNotes/1.7.6.6.txt new file mode 100644 index 0000000000..13ce2dc2d7 --- /dev/null +++ b/Documentation/RelNotes/1.7.6.6.txt @@ -0,0 +1,11 @@ +Git v1.7.6.6 Release Notes +========================== + +Fixes since v1.7.6.5 +-------------------- + + * The code to look up attributes for paths reused entries from a wrong + directory when two paths in question are in adjacent directories and + the name of the one directory is a prefix of the other. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.7.6.txt b/Documentation/RelNotes/1.7.7.6.txt new file mode 100644 index 0000000000..065ed2ad6c --- /dev/null +++ b/Documentation/RelNotes/1.7.7.6.txt @@ -0,0 +1,11 @@ +Git v1.7.7.6 Release Notes +========================== + +Fixes since v1.7.7.5 +-------------------- + + * The code to look up attributes for paths reused entries from a wrong + directory when two paths in question are in adjacent directories and + the name of the one directory is a prefix of the other. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.8.4.txt b/Documentation/RelNotes/1.7.8.4.txt new file mode 100644 index 0000000000..3172f1cb31 --- /dev/null +++ b/Documentation/RelNotes/1.7.8.4.txt @@ -0,0 +1,14 @@ +Git v1.7.8.4 Release Notes +========================== + +Fixes since v1.7.8.3 +-------------------- + + * The code to look up attributes for paths reused entries from a wrong + directory when two paths in question are in adjacent directories and + the name of the one directory is a prefix of the other. + + * "git send-email" did not properly treat sendemail.multiedit as a + boolean (e.g. setting it to "false" did not turn it off). + +Also contains minor fixes and documentation updates. diff --git a/Documentation/config.txt b/Documentation/config.txt index 04f5e19dc3..abeb82b2c6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1786,7 +1786,8 @@ rerere.enabled:: conflict hunks can be resolved automatically, should they be encountered again. By default, linkgit:git-rerere[1] is enabled if there is an `rr-cache` directory under the - `$GIT_DIR`. + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. sendemail.identity:: A configuration identity. When given, causes values in the |