Merge branch 'nd/doc-index-format'
[gitweb.git] / mergetools / tortoisemerge
2013-03-19 Merge branch 'nd/doc-index-format'
2013-03-19 Merge branch 'wk/doc-pre-rebase'
2013-03-19 Merge branch 'jc/color-diff-doc'
2013-03-17 Merge branch 'maint'
2013-03-17 Merge branch 'maint'
2013-03-11 Merge branch 'maint'
2013-03-11 Merge branch 'mp/complete-paths'
2013-03-11 Merge branch 'maint'
2013-03-09 Merge branch 'maint'
2013-03-07 Merge branch 'mp/complete-paths'
2013-03-07 Merge branch 'maint'
2013-03-01 Sync with 1.8.1.5
2013-02-27 Merge branch 'maint'
2013-02-27 Merge branch 'mh/maint-ceil-absolute'
2013-02-25 Sync with 'maint'
2013-02-25 Merge branch 'wk/user-manual'
2013-02-25 Merge branch 'jn/less-reconfigure'
2013-02-25 Merge branch 'as/check-ignore'
2013-02-25 Merge branch 'ct/autoconf-htmldir'
2013-02-25 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-20 Sync with v1.8.1.4
2013-02-20 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-02-19 Merge branch 'jc/mention-tracking-for-pull-default'
2013-02-19 Merge branch 'mm/config-intro-in-git-doc'
2013-02-18 Merge branch 'maint'
2013-02-17 Merge branch 'jc/hidden-refs'
2013-02-17 Merge branch 'mp/diff-algo-config'
2013-02-17 Merge branch 'jk/rebase-i-comment-char'
2013-02-17 Merge branch 'jk/read-commit-buffer-data-after-free'
2013-02-15 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-15 Merge branch 'ef/non-ascii-parse-options-error-diag'
2013-02-15 Merge branch 'da/p4merge-mktemp-fix'
2013-02-14 Merge branch 'jk/diff-graph-cleanup'
2013-02-14 Merge branch 'nd/status-show-in-progress'
2013-02-14 Merge branch 'bw/get-tz-offset-perl'
2013-02-14 Merge branch 'al/mergetool-printf-fix'
2013-02-14 Merge branch 'jk/error-const-return'
2013-02-14 Merge branch 'jx/utf8-printf-width'
2013-02-14 Merge branch 'mg/bisect-doc'
2013-02-14 Merge branch 'tz/perl-styles'
2013-02-14 Merge branch 'jc/extended-fake-ancestor-for-gitlink'
2013-02-14 Merge branch 'dg/subtree-fixes'
2013-02-12 Merge branch 'maint'
2013-02-11 Merge branch 'maint'
2013-02-11 Merge branch 'sp/smart-http-content-type-check'
2013-02-09 Merge branch 'master' of git://github.com/git-l10n...
2013-02-08 Merge branch 'jc/combine-diff-many-parents'
2013-02-08 Merge branch 'jk/apply-similaritly-parsing'
2013-02-08 Merge branch 'mk/tcsh-complete-only-known-paths'
2013-02-08 Merge branch 'mp/complete-paths'
2013-02-08 Merge branch 'ct/autoconf-htmldir'
2013-02-07 Sync with 1.8.1.3
2013-02-07 Merge branch 'da/mergetool-docs'
2013-02-07 Merge branch 'ss/mergetools-tortoise'
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-02-02 mergetools: teach tortoisemerge to handle filenames...
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-27 mergetools: support TortoiseGitMerge
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14 Merge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12 Merge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-10 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2013-01-08 Merge branch 'jk/maint-fast-import-doc-dedup-done'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-09-18 Merge branch 'er/doc-fast-import-done' into maint
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-09-11 Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-09-11 Merge branch 'nd/index-errno' into maint-1.7.11
2012-09-11 Merge branch 'pg/maint-apply-remove-unused-variable...
2012-08-27 Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-22 Merge branch 'nd/index-errno'
2012-08-22 Merge branch 'pg/maint-apply-remove-unused-variable'
2012-08-06 Merge branch 'jn/block-sha1' into maint
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-08-06 Merge branch 'lm/git-blame-el' into maint
2012-08-06 Merge branch 'rs/git-blame-mapcar-mapc' into maint
2012-08-06 Merge branch 'jk/maint-checkout-orphan-check-fix' into...
2012-07-28 Merge branch 'jk/maint-checkout-orphan-check-fix'
2012-07-24 Merge branch 'jn/block-sha1'
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'jc/refactor-diff-stdin' into maint
2012-07-22 Merge branch 'cw/no-detaching-an-unborn' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-13 Merge branch 'jc/refactor-diff-stdin'
2012-07-11 Merge branch 'jc/maint-blame-unique-abbrev' into maint
next