projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c3f19f 109859e)
Merge branch 'jc/mergetool-tool-help'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 21:05:26 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 21:05:26 +0000 (14:05 -0700)
commitcf7864837c12c396ad5927cb6c0bbaa790cda7ad
tree93c489a5a4bfb1fde21851d3b9154990ec528b9atree | snapshot
parent9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32commit | diff
parent109859e27445a3ad12eb8f8cba43a5aa8f701733commit | diff
Merge branch 'jc/mergetool-tool-help'

"git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.

* jc/mergetool-tool-help:
  mergetool: support --tool-help option like difftool does
Git—the stupid content tracker