summaryrefslogtreecommitdiff
path: root/Documentation/config/mergetool.txt
diff options
context:
space:
mode:
authorLibravatar John Cai <johncai86@gmail.com>2022-01-05 23:29:31 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-10 09:39:26 -0800
commit34ae3b707146c05d27cf744e58f95a25a31b3499 (patch)
tree052f2771d7931a341a477899c0d0cf9522bfac05 /Documentation/config/mergetool.txt
parentThe fifth batch (diff)
downloadtgif-34ae3b707146c05d27cf744e58f95a25a31b3499.tar.xz
name-rev: deprecate --stdin in favor of --annotate-stdin
Introduce a --annotate-stdin that is functionally equivalent of --stdin. --stdin does not behave as --stdin in other subcommands, such as pack-objects whereby it takes one argument per line. Since --stdin can be a confusing and misleading name, rename it to --annotate-stdin. This change adds a warning to --stdin warning that it will be removed in the future. Signed-off-by: "John Cai" <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/mergetool.txt')
0 files changed, 0 insertions, 0 deletions