Merge branch 'dk/version-gen-gitdir' into maint
[git] / mergetools / kdiff3
2013-07-22  Junio C HamanoMerge branch 'dk/version-gen-gitdir' into maint
2013-07-22  Junio C HamanoMerge branch 'nk/config-local-doc' into maint
2013-07-22  Junio C HamanoMerge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22  Junio C HamanoMerge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22  Junio C HamanoMerge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19  Junio C HamanoMerge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half...
2013-07-19  Junio C HamanoMerge branch 'jc/t1512-fix' into maint
2013-07-19  Junio C HamanoMerge branch 'mm/push-force-is-dangerous' into maint
2013-07-19  Junio C HamanoMerge branch 'tr/test-commit-only-on-orphan' into maint
2013-07-19  Junio C HamanoMerge branch 'th/bisect-skip-report-range-fix' into...
2013-07-15  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15  Junio C HamanoMerge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-03  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03  Junio C HamanoMerge branch 'jc/core-checkstat' into maint
2013-07-03  Junio C HamanoMerge branch 'vv/help-unknown-ref' into maint
2013-07-03  Junio C HamanoMerge branch 'cb/log-follow-with-combined' into maint
2013-07-03  Junio C HamanoMerge branch 'maint-1.8.1' into maint-1.8.2
2013-06-30  Junio C HamanoMerge branch 'fc/macos-x-clipped-write' into maint
2013-06-27  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-27  Junio C HamanoMerge branch 'jk/subtree-do-not-push-if-split-fails...
2013-06-27  Junio C HamanoMerge branch 'mh/fetch-into-shallow' into maint
2013-06-27  Junio C HamanoMerge branch 'jh/checkout-auto-tracking' into maint
2013-06-10  Junio C HamanoMerge branch 'jn/config-ignore-inaccessible' into maint
2013-06-10  Junio C HamanoMerge branch 'kb/status-ignored-optim-2' into maint
2013-05-17  Junio C HamanoMerge branch 'fc/doc-style'
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-11  Junio C HamanoMerge git://git.bogomips.org/git-svn
2013-05-09  Junio C HamanoSync with v1.8.2.3
2013-05-09  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-09  David Aguilarmergetools/kdiff3: do not use --auto when diffing
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-01  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup'
2013-03-26  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-21  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify'
2013-02-20  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc'
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into...
2013-01-10  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut'
2013-01-08  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-09-18  Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-09-11  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-09-11  Junio C HamanoMerge branch 'nd/index-errno' into maint-1.7.11
2012-09-11  Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable...
2012-08-27  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh'
2012-08-24  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-22  Junio C HamanoMerge branch 'nd/index-errno'
2012-08-22  Junio C HamanoMerge branch 'pg/maint-apply-remove-unused-variable'
2012-08-06  Junio C HamanoMerge branch 'jn/block-sha1' into maint
2012-08-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-08-06  Junio C HamanoMerge branch 'lm/git-blame-el' into maint
2012-08-06  Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc' into maint
2012-08-06  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix' into...
2012-07-28  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix'
2012-07-24  Junio C HamanoMerge branch 'jn/block-sha1'
2012-07-22  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into maint
2012-07-22  Junio C HamanoMerge branch 'jc/refactor-diff-stdin' into maint
2012-07-22  Junio C HamanoMerge branch 'cw/no-detaching-an-unborn' into maint
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo'
2012-07-16  Junio C HamanoMerge branch 'tg/maint-cache-name-compare'
2012-07-16  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-13  Junio C HamanoMerge branch 'jc/refactor-diff-stdin'
2012-07-11  Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev' into maint
2012-07-11  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg...
2012-07-09  Junio C HamanoMerge branch 'cw/no-detaching-an-unborn'
2012-07-09  Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev'
2012-07-05  Junio C HamanoMerge branch 'hv/remote-end-hung-up'
2012-06-25  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch'
2012-06-25  Junio C HamanoMerge branch 'lm/git-blame-el'
2012-06-25  Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc'
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint
2012-06-01  Junio C HamanoMerge branch 'ef/maint-rebase-error-message'
next