diff options
| author |  David Aguilar <davvid@gmail.com> | 2009-04-07 01:21:20 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:56 -0700 |
| commit | afcbc8e7ecb18a3ee542e808f02f5df7d56d5bdc (patch) | |
| tree | 6a057ce275aa7d4998846e21452c84616357f6b0 /.gitignore | |
| parent | difftool/mergetool: add diffuse as merge and diff tool (diff) | |
| download | tgif-afcbc8e7ecb18a3ee542e808f02f5df7d56d5bdc.tar.xz | |
difftool: move 'git-difftool' out of contrib
This prepares 'git-difftool' and its documentation for
mainstream use.
'git-difftool-helper' became 'git-difftool--helper'
since users should not use it directly.
'git-difftool' was added to the list of commands as
an ancillaryinterrogator.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1c57d4c958..a36da9d981 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,8 @@ git-diff git-diff-files git-diff-index git-diff-tree +git-difftool +git-difftool--helper git-describe git-fast-export git-fast-import |