From 1a3e302a251ed9fb46be9552e1a2a45c73112bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= Date: Fri, 10 Dec 2010 13:44:15 -0500 Subject: [PATCH 1/2] Add --force to git-send-email documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro R. Sedeño Signed-off-by: Junio C Hamano --- Documentation/git-send-email.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index c283084272..adbca12b1e 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -292,6 +292,9 @@ have been specified, in which case default to 'compose'. Default is the value of 'sendemail.validate'; if this is not set, default to '--validate'. +--force:: + Send emails even if safety checks would prevent it. + CONFIGURATION ------------- From c6d059bbccb8460959b9aedfeefbb4d6aac6e842 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 10 Dec 2010 16:35:00 -0800 Subject: [PATCH 2/2] Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.3.4.txt | 32 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.3.4.txt diff --git a/Documentation/RelNotes/1.7.3.4.txt b/Documentation/RelNotes/1.7.3.4.txt new file mode 100644 index 0000000000..925178f608 --- /dev/null +++ b/Documentation/RelNotes/1.7.3.4.txt @@ -0,0 +1,32 @@ +Git v1.7.3.4 Release Notes +========================== + +Fixes since v1.7.3.3 +-------------------- + + * Smart HTTP transport used to incorrectly retry redirected POST + request with GET request. + + * "git apply" did not correctly handle patches that only change modes + if told to apply while stripping leading paths with -p option. + + * "git apply" can deal with patches with timezone formatted with a + colon between the hours and minutes part (e.g. "-08:00" instead of + "-0800"). + + * "git cherry-pick" or "git revert" refused to work when a path that + would be modified by the operation was stat-dirty without a real + difference in the contents of the file. + + * "git diff --check" reported an incorrect line number for added + blank lines at the end of file. + + * Setting log.decorate configuration variable to "0" or "1" to mean + "false" or "true" did not work. + + * "git tag -v" did not work with GPG signatures in rfc1991 mode. + + * The post-receive-email sample hook was accidentally broken in 1.7.3.3 + update. + +Other minor fixes and documentation updates are also included. diff --git a/RelNotes b/RelNotes index 9653ffeb82..a6103a01d8 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.3.3.txt \ No newline at end of file +Documentation/RelNotes/1.7.3.4.txt \ No newline at end of file