summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Samuel Tardieu <sam@rfc1149.net>2008-11-05 00:20:31 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-04 15:46:39 -0800
commit6fa8342b12aeb3e3895d3b3d8d34d45fa872ac45 (patch)
tree687dff37ad49d990c735dbb6e901766fe251e5c6 /Documentation/git-merge.txt
parentAdd reference for status letters in documentation. (diff)
downloadtgif-6fa8342b12aeb3e3895d3b3d8d34d45fa872ac45.tar.xz
tag: Check that options are only allowed in the appropriate mode
If "git tag -d -l -v ..." is called, only "-l" is honored, which is arbitrary and wrong. Also, unrecognized options are accepted in the wrong modes, causing for example "git tag -n 100" to create a tag named "100" while the user may have wanted to type "git tag -n100". This patch checks that "git tag" knows in what mode it operates before performing any operation and accepts only the related options. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions