diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:16 -0800 |
| commit | 39ca1bd88256ea482305b7e0acc943ef14e4b36d (patch) | |
| tree | 263d715e9f62be9995ecba9979c26ae10523ef41 /pretty.c | |
| parent | eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e (diff) | |
| parent | f35ec546008e8390e0fd8e545680e72fae0efa35 (diff) | |
| download | git-39ca1bd88256ea482305b7e0acc943ef14e4b36d.tar.gz | |
Merge branch 'da/mergetool-docs'
Build on top of the clean-up done by jk/mergetool and automatically
generate the list of mergetool and difftool backends the build
supports to be included in the documentation.
* da/mergetool-docs:
doc: generate a list of valid merge tools
mergetool--lib: list user configured tools in '--tool-help'
mergetool--lib: add functions for finding available tools
mergetool--lib: improve the help text in guess_merge_tool()
mergetool--lib: simplify command expressions
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions