Merge branch 'tc/missing-http-proxyauth'
[gitweb.git] / mergetools / bc3
2014-12-22 Merge branch 'rs/maint-config-use-labs' into maint
2014-12-22 Merge branch 'js/windows-open-eisdir-error' into maint
2014-12-22 Merge branch 'jk/colors-fix' into maint
2014-12-22 Merge branch 'jk/checkout-from-tree' into maint
2014-12-17 Sync with v2.1.4
2014-12-12 Merge branch 'jk/pack-bitmap'
2014-12-12 Merge branch 'jk/push-simple'
2014-12-12 Merge branch 'jk/colors-fix'
2014-12-12 Merge branch 'rt/push-recurse-submodule-usage-string'
2014-12-12 Merge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-12 Merge branch 'sv/typofix-apply-error-message'
2014-12-12 Merge branch 'po/everyday-doc'
2014-12-12 Merge branch 'jc/unpack-trees-plug-leak'
2014-12-05 Merge branch 'mh/config-flip-xbit-back-after-checking'
2014-12-05 Merge branch 'jk/gitweb-with-newer-cgi-multi-param'
2014-12-05 Merge branch 'rs/receive-pack-use-labs'
2014-12-05 Merge branch 'rs/maint-config-use-labs'
2014-12-05 Merge branch 'js/windows-open-eisdir-error'
2014-12-05 Merge branch 'sv/get-builtin'
2014-12-05 Merge branch 'jk/checkout-from-tree'
2014-11-19 Merge branch 'sv/submitting-final-patch'
2014-11-19 Merge branch 'sn/tutorial-status-output-example'
2014-11-19 Merge branch 'mh/doc-remote-helper-xref'
2014-11-19 Merge branch 'tb/no-relative-file-url'
2014-11-19 Merge branch 'cc/interpret-trailers'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-18 Merge branch 'da/difftool'
2014-11-12 Sync with 'maint'
2014-11-12 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-11 Sync with maint
2014-11-10 Sync with maint
2014-11-10 Merge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06 Merge branch 'maint'
2014-11-06 Merge branch 'nd/gitignore-trailing-whitespace'
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-11-06 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-06 Merge branch 'rs/use-child-process-init-more'
2014-11-06 Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31 Merge branch 'for-junio' of git://bogomips.org/git-svn
2014-10-31 Merge branch 'jc/push-cert'
2014-10-31 Merge branch 'rs/child-process-init'
2014-10-31 Merge branch 'rs/grep-color-words'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Sync with Git 2.1.3
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29 Merge branch 'da/difftool'
2014-10-29 Merge branch 'rb/pack-window-memory-config-doc'
2014-10-29 Merge branch 'mg/lib-gpg-ro-safety'
2014-10-29 Merge branch 'dm/port2zos'
2014-10-29 Merge branch 'oc/mergetools-beyondcompare'
2014-10-21 mergetool: rename bc3 to bc
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-02-27 Merge branch 'bs/stdio-undef-before-redef'
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-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
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'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-21 Merge branch 'ob/imap-send-ssl-verify'
2013-02-20 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
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
next