diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:14 (GMT) |
| commit | b72e90712eb0e802b232ad4c88460d04279c7111 (patch) | |
| tree | fa942ba292b5e3dd1091c526700a7d801ef40358 /git.c | |
| parent | d2dba18ced8e4939a3cd135998c54874ce73adc1 (diff) | |
| parent | 20de316e33446f37200e51aa333ba7d824dfd478 (diff) | |
| download | git-b72e90712eb0e802b232ad4c88460d04279c7111.zip git-b72e90712eb0e802b232ad4c88460d04279c7111.tar.gz git-b72e90712eb0e802b232ad4c88460d04279c7111.tar.bz2 | |
Merge branch 'js/difftool-no-index'
"git difftool" can now run outside a repository.
* js/difftool-no-index:
difftool: allow running outside Git worktrees with --no-index
parse-options: make OPT_ARGUMENT() more useful
difftool: remove obsolete (and misleading) comment
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -498,7 +498,7 @@ static struct cmd_struct commands[] = { { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, { "diff-index", cmd_diff_index, RUN_SETUP | NO_PARSEOPT }, { "diff-tree", cmd_diff_tree, RUN_SETUP | NO_PARSEOPT }, - { "difftool", cmd_difftool, RUN_SETUP | NEED_WORK_TREE }, + { "difftool", cmd_difftool, RUN_SETUP_GENTLY }, { "fast-export", cmd_fast_export, RUN_SETUP }, { "fetch", cmd_fetch, RUN_SETUP }, { "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT }, |