Fix neglect of diff_setup()/diff_setup_done() symmetry.
[gitweb.git] / Documentation / git-mergetool.txt
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28 Merge branch 'maint'
2009-02-28 Merge branch 'maint-1.6.0' into maint
2009-02-28 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-20 Merge branch 'maint'
2009-02-18 Merge branch 'maint'
2009-02-12 Merge branch 'maint'
2009-02-12 Merge branch 'maint-1.6.0' into maint
2009-02-11 Merge branch 'maint'
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
2009-02-11 Merge branch 'maint-1.5.4' into maint-1.5.5
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-11 Merge branch 'maint'
2009-02-10 Merge branch 'maint-1.6.0' into maint
2009-02-09 Merge branch 'maint'
2009-02-07 Merge branch 'js/filter-branch-submodule'
2009-02-07 Merge branch 'maint'
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'js/notes'
2009-02-06 Merge branch 'gt/utf8-width'
2009-02-06 Merge branch 'jk/head-symref'
2009-02-06 Merge branch 'maint'
2009-02-06 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint
2009-02-06 Merge branch 'kc/maint-diff-bwi-fix' into maint
2009-02-04 Merge branch 'maint'
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-04 Merge branch 'maint'
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-03 Merge branch 'maint'
2009-02-03 Merge branch 'maint-1.6.0' into maint
2009-02-03 Merge branch 'jc/maint-add-u-remove-conflicted'
2009-02-03 Merge branch 'jk/maint-cleanup-after-exec-failure'
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
2009-02-01 Merge branch 'jc/maint-apply-fix'
2009-02-01 Merge branch 'am/maint-push-doc'
2009-02-01 Merge branch 'jc/maint-allow-uninteresting-missing'
2009-02-01 Merge branch 'js/maint-rebase-i-submodule'
2009-02-01 Merge branch 'jc/maint-split-diff-metainfo'
2009-02-01 Merge branch 'jk/signal-cleanup'
2009-02-01 Merge branch 'maint'
2009-02-01 Merge branch 'maint-1.6.0' into maint
2009-01-29 Sync with 1.6.1.2
2009-01-29 Merge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29 Merge branch 'bs/maint-rename-populate-filespec' into...
2009-01-29 Merge branch 'maint-1.6.0' into maint
2009-01-28 Merge branch 'tr/previous-branch'
2009-01-28 Merge branch 'maint'
2009-01-27 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-01-26 Merge branch 'kb/lstat-cache'
2009-01-26 Merge branch 'js/diff-color-words'
2009-01-26 Merge branch 'cb/add-pathspec'
2009-01-26 Merge branch 'js/maint-all-implies-HEAD'
2009-01-26 Sync with 1.6.1.1
2009-01-24 Merge branch 'js/patience-diff'
2009-01-24 Merge branch 'maint'
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint
2009-01-24 Merge branch 'jc/maint-format-patch' into maint
2009-01-24 Merge branch 'maint-1.6.0' into maint
2009-01-22 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-22 Merge branch 'lt/maint-wrap-zlib'
2009-01-22 Merge branch 'am/maint-push-doc'
2009-01-22 Merge branch 'sg/maint-gitdir-in-subdir'
2009-01-22 Merge branch 'jf/am-failure-report'
2009-01-22 Merge branch 'rs/ctype'
2009-01-22 Merge branch 'sb/hook-cleanup'
2009-01-22 Merge branch 'jk/color-parse'
2009-01-22 Merge branch 'jc/maint-format-patch-o-relative'
2009-01-22 Merge branch 'kb/am-directory'
2009-01-21 Merge branch 'maint'
2009-01-21 Merge branch 'bs/maint-rename-populate-filespec'
2009-01-20 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-20 Merge branch 'maint'
2009-01-18 Merge branch 'ds/uintmax-config'
2009-01-18 Merge branch 'gb/gitweb-opml'
2009-01-18 Merge branch 'mv/apply-parse-opt'
2009-01-18 Merge branch 'tr/rebase-root'
2009-01-18 Merge branch 'gb/gitweb-patch'
2009-01-18 Merge branch 'ap/clone-into-empty'
2009-01-18 Merge branch 'jc/maint-format-patch'
2009-01-18 Merge branch 'tr/maint-no-index-fixes'
2009-01-18 Merge branch 'as/autocorrect-alias'
2009-01-18 Merge branch 'rs/fgrep'
2009-01-18 Merge branch 'rs/maint-shortlog-foldline'
2009-01-18 Merge branch 'mh/maint-commit-color-status'
2009-01-18 Merge branch 'maint'
2009-01-18 Merge branch 'maint-1.6.0' into maint
2009-01-18 Documentation: let asciidoc align related options
2009-01-16 Merge branch 'maint'
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint'
2009-01-15 Merge branch 'maint-1.6.0' into maint
next