diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:15:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:15:00 -0800 |
| commit | b7786bb4b09463641f3e39eca18aefc630ee4f38 (patch) | |
| tree | 63238e141abb3839d670e50a39b8da7ceb1fe2f7 /git.c | |
| parent | 6ad8b8e98faa5a301a98a2997da162dea060672e (diff) | |
| parent | 94d3997ecc09f36d17b9ad4b49c4709885e300f7 (diff) | |
| download | git-b7786bb4b09463641f3e39eca18aefc630ee4f38.tar.gz git-b7786bb4b09463641f3e39eca18aefc630ee4f38.tar.xz | |
Merge branch 'js/difftool-builtin'
Rewrite a scripted porcelain "git difftool" in C.
* js/difftool-builtin:
difftool: hack around -Wzero-length-format warning
difftool: retire the scripted version
difftool: implement the functionality in the builtin
difftool: add a skeleton for the upcoming builtin
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -424,6 +424,7 @@ static struct cmd_struct commands[] = { { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, { "diff-index", cmd_diff_index, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP }, + { "difftool", cmd_difftool, RUN_SETUP | NEED_WORK_TREE }, { "fast-export", cmd_fast_export, RUN_SETUP }, { "fetch", cmd_fetch, RUN_SETUP }, { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, |