From b6fb7fed6afca3376e4cdd70c9fe9737bcd73a6e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 10 Jan 2012 15:57:27 +0100 Subject: Documentation: rerere's rr-cache auto-creation and rerere.enabled The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano --- Documentation/config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index 18ab1ae65..27b57d226 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1703,7 +1703,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 -- cgit v1.2.1 From f14f9803ef13e972371e3f4bce69bca13dd1cd2d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 10 Jan 2012 13:11:03 -0800 Subject: Prepare for 1.7.6.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.6.6.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Documentation/RelNotes/1.7.6.6.txt (limited to 'Documentation') diff --git a/Documentation/RelNotes/1.7.6.6.txt b/Documentation/RelNotes/1.7.6.6.txt new file mode 100644 index 000000000..13ce2dc2d --- /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. -- cgit v1.2.1