aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorThomas Rast <tr@thomasrast.ch>2013-11-16 18:37:57 +0100
committerJunio C Hamano <gitster@pobox.com>2014-01-21 13:41:30 -0800
commit0c1cddd01543feb101c0d95180e27ab840b280b9 (patch)
tree0534da3ef78cde271152aee4868999e1b8d27c29 /Documentation/git-mergetool.txt
parentd9bb4be53bc5185244b4be9860562a012803bacb (diff)
downloadgit-0c1cddd01543feb101c0d95180e27ab840b280b9.tar.gz
git-0c1cddd01543feb101c0d95180e27ab840b280b9.tar.xz
Documentation/gitk: document -L option
The -L option is the same as for git-log, so the entire block is just copied from git-log.txt. However, until the parser is fixed we add a caveat that gitk only understands the stuck form. Signed-off-by: Thomas Rast <tr@thomasrast.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions