diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-12-16 11:09:31 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-16 12:47:15 -0800 |
commit | a1bb8f45f1590f812badceea0b7c120074ec3e85 (patch) | |
tree | 3ce41a927bcca4baa26680cc33c79aa15fdc4795 /Documentation/git-difftool.txt | |
parent | bash: Support new 'git fetch' options (diff) | |
parent | Git 1.6.5.7 (diff) | |
download | tgif-a1bb8f45f1590f812badceea0b7c120074ec3e85.tar.xz |
Merge branch 'maint' to sync with 1.6.5.7
* maint:
Git 1.6.5.7
worktree: don't segfault with an absolute pathspec without a work tree
ignore unknown color configuration
help.autocorrect: do not run a command if the command given is junk
Illustrate "filter" attribute with an example
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions