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 /Documentation/git-status.txt | |
| parent | Merge branch 'maint' (diff) | |
| parent | mergetool--lib: simplify API usage by removing more global variables (diff) | |
| download | tgif-bd15ef078afac3f0f147e815d3b85d6d2a48dd1a.tar.xz | |
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 'Documentation/git-status.txt')
0 files changed, 0 insertions, 0 deletions