From aaec9bcf6d85a084725e8386bf314a6ef6842468 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Sat, 13 Feb 2010 22:28:34 +0100 Subject: builtin-notes: Deprecate the -m/-F options for "git notes edit" The semantics for "git notes edit -m/-F" overlap with those for "git notes add -f", and the behaviour (i.e. overwriting existing notes with the given message/file) is more intuitively captured by (and better documented with) "git notes add -f". Suggested-by: Junio C Hamano Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- t/t3304-notes-mixed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t3304-notes-mixed.sh') diff --git a/t/t3304-notes-mixed.sh b/t/t3304-notes-mixed.sh index c975a6d3f7..1709e8c00b 100755 --- a/t/t3304-notes-mixed.sh +++ b/t/t3304-notes-mixed.sh @@ -188,7 +188,7 @@ test_expect_success "verify contents of non-notes" ' test_expect_success "git-notes preserves non-notes" ' test_tick && - git notes edit -m "foo bar" + git notes add -f -m "foo bar" ' test_expect_success "verify contents of non-notes after git-notes" ' -- cgit v1.2.1