diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:42:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:42:12 -0700 |
| commit | bd15ef078afac3f0f147e815d3b85d6d2a48dd1a (patch) | |
| tree | b009b23ff8114f1c50e2dff0d664d8d7926d0472 /.gitignore | |
| parent | 2d430c713372fc21f9acf1d8b745e7f4fbbe336c (diff) | |
| parent | 47d65924a69576bd9f3254f7055de6b37a359596 (diff) | |
| download | git-bd15ef078afac3f0f147e815d3b85d6d2a48dd1a.tar.gz | |
Merge branch 'da/difftool'
* da/difftool:
mergetool--lib: simplify API usage by removing more global variables
Fix misspelled mergetool.keepBackup
difftool/mergetool: refactor commands to use git-mergetool--lib
mergetool: use $( ... ) instead of `backticks`
bash completion: add git-difftool
difftool: add support for a difftool.prompt config variable
difftool: add various git-difftool tests
difftool: move 'git-difftool' out of contrib
difftool/mergetool: add diffuse as merge and diff tool
difftool: add a -y shortcut for --no-prompt
difftool: use perl built-ins when testing for msys
difftool: remove the backup file feature
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
git-mergetool: add new merge tool TortoiseMerge
git-mergetool/difftool: make (g)vimdiff workable under Windows
doc/merge-config: list ecmerge as a built-in merge tool
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 16f7a97d97..41c0b20a76 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,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 @@ -79,6 +81,7 @@ git-merge-recursive git-merge-resolve git-merge-subtree git-mergetool +git-mergetool--lib git-mktag git-mktree git-name-rev |