summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2015-09-19 09:47:49 +0200
committerJunio C Hamano <gitster@pobox.com>2015-09-21 10:48:21 -0700
commit318ca61531d3189aef7b32a924518db1dd9f3374 (patch)
tree07445f3276b13f2595a3b08b76ba14c7a0e33093 /Documentation/git-merge.txt
parent340f2c5e631c788c0e4a508c21349e04ceed7966 (diff)
downloadgit-318ca61531d3189aef7b32a924518db1dd9f3374.tar.gz
Documentation/grep: fix documentation of -O
Since the argument of -O, --open-file-in-pager is optional, it must be stuck to the command. Reflect this in the documentation. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions