summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-11 00:36:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-11 00:36:53 (GMT)
commit271c2aa6eed21d4ef9d8d6c2298121545e6ce123 (patch)
tree89c30e452fa1cba36d37f49f6f254072202ac01f
parentb361888dd5a26c4f1eb6268392e89e2d546accf6 (diff)
parentc6d059bbccb8460959b9aedfeefbb4d6aac6e842 (diff)
downloadgit-271c2aa6eed21d4ef9d8d6c2298121545e6ce123.zip
git-271c2aa6eed21d4ef9d8d6c2298121545e6ce123.tar.gz
git-271c2aa6eed21d4ef9d8d6c2298121545e6ce123.tar.bz2
Merge branch 'maint'
-rw-r--r--Documentation/RelNotes/1.7.3.4.txt32
-rw-r--r--Documentation/git-send-email.txt3
2 files changed, 35 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.3.4.txt b/Documentation/RelNotes/1.7.3.4.txt
new file mode 100644
index 0000000..925178f
--- /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/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index ebc024a..7ec9dab 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -322,6 +322,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
-------------