summaryrefslogtreecommitdiff
path: root/Documentation/config/mergetool.txt
diff options
context:
space:
mode:
authorLibravatar John Cai <johncai86@gmail.com>2022-02-15 20:52:07 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-15 17:37:43 -0800
commitd271892fbc099d5afd98f48845e258ded28e7c89 (patch)
tree3f22c6bce0ba63036f7c4d4e281fb6d6bd6d6be7 /Documentation/config/mergetool.txt
parentname-rev.c: use strbuf_getline instead of limited size buffer (diff)
downloadtgif-d271892fbc099d5afd98f48845e258ded28e7c89.tar.xz
name-rev: replace --stdin with --annotate-stdin in synopsis
34ae3b70 (name-rev: deprecate --stdin in favor of --annotate-stdin, 2022-01-05) added --annotate-stdin to replace --stdin as a clearer flag name. Since --stdin is to be deprecated, we should replace --stdin in the output from "git name-rev -h". 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