Merge branch 'jk/push-client-deadlock-fix' into HEAD
[gitweb.git] / xdiff / xprepare.c
2016-05-18 Merge branch 'jk/push-client-deadlock-fix' into HEAD
2016-05-18 Merge branch 'sb/mv-submodule-fix' into HEAD
2016-05-18 Merge branch 'da/user-useconfigonly' into HEAD
2016-05-06 Merge branch 'sb/submodule-path-misc-bugs' into maint
2016-05-06 Merge branch 'ky/imap-send-openssl-1.1.0' into maint
2016-05-06 Merge branch 'js/replace-edit-use-editor-configuration...
2016-05-06 Merge branch 'cc/apply' into maint
2016-05-06 Merge branch 'kn/for-each-tag-branch' into maint
2016-05-02 Merge branch 'jk/use-write-script-more' into maint
2016-05-02 Merge branch 'jc/xstrfmt-null-with-prec-0' into maint
2016-05-02 Merge branch 'ew/send-email-drop-data-dumper' into...
2016-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-05-02 Merge branch 'jk/do-not-printf-NULL' into maint
2016-05-02 Merge branch 'jc/http-socks5h' into maint
2016-05-02 Merge branch 'ky/imap-send' into maint
2016-05-02 Merge branch 'ad/commit-have-m-option' into maint
2016-05-02 Merge branch 'sb/submodule-helper-clone-regression...
2016-05-02 Merge branch 'jk/branch-shortening-funny-symrefs' into...
2016-05-02 Merge branch 'es/format-patch-doc-hide-no-patch' into...
2016-05-02 Merge branch 'ky/branch-m-worktree' into maint
2016-05-02 Merge branch 'ky/branch-d-worktree' into maint
2016-05-02 Merge branch 'jk/check-repository-format' into maint
2016-05-02 Merge branch 'ew/send-email-readable-message-id' into...
2016-04-29 Merge branch 'js/mingw-tests-2.8' into maint
2016-04-29 Merge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29 Merge branch 'jc/makefile-redirection-stderr' into...
2016-04-29 Merge branch 'ak/use-hashmap-iter-first-in-submodule...
2016-04-29 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29 Merge branch 'sk/send-pack-all-fix' into maint
2016-04-29 Merge branch 'sg/diff-multiple-identical-renames' into...
2016-04-29 Merge branch 'ss/msvc' into maint
2016-04-25 Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com...
2016-04-15 Merge branch 'jv/merge-nothing-into-void' into maint
2016-04-15 Merge branch 'ss/commit-squash-msg' into maint
2016-04-15 Merge branch 'jk/send-email-rtrim-mailrc-alias' into...
2016-04-15 Merge branch 'da/mergetool-delete-delete-conflict'...
2016-04-15 Merge branch 'jk/startup-info' into maint
2016-04-15 Merge branch 'jk/getwholeline-getdelim-empty' into...
2016-04-15 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-04 xdiff/xprepare: fix a memory leak
2016-03-04 xdiff/xprepare: use the XDF_DIFF_ALG() macro to access...
2016-02-22 Merge branch 'jk/config-include'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-12-05 Merge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
next