summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-13 11:38:27 -0700
committerJunio C Hamano <gitster@pobox.com>2012-03-13 12:21:04 -0700
commit6c15a1c63634005a0f8fb15696e154cc54b0a359 (patch)
tree701a17b0d4208616b4fb963916333a158685f50a /Documentation
parentfa678feb7ca12e306e2eaeb0078028505ab3318a (diff)
downloadgit-6c15a1c63634005a0f8fb15696e154cc54b0a359.tar.gz
am: officially deprecate -b/--binary option
We have had these options as harmless no-op for more than 3 years without officially deprecating them. Let's announce the deprecation and start warning against their use, but without failing the command just not yet, so that we can later repurpose the option if we want to in the future. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.10.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 65df74b9c4..6286485bdb 100644
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -26,8 +26,8 @@ Compatibility Notes
Git v1.7.8 or newer.
* The "--binary/-b" options to "git am" have been a no-op for quite a
- while and was deprecated in mid 2008 (v1.6.0). When you give these
- options to "git am", it will now fail with an error.
+ while and were deprecated in mid 2008 (v1.6.0). When you give these
+ options to "git am", it will now warn and ask you not to use them.
Updates since v1.7.9