Makefile: drop dependency between git-instaweb and gitweb
[git] / git-mergetool--lib.sh
2015-01-12  Junio C HamanoMerge branch 'jk/read-packed-refs-without-path-max...
2015-01-12  Junio C HamanoMerge branch 'mh/find-uniq-abbrev' into maint
2015-01-12  Junio C HamanoMerge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-12  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' into...
2015-01-07  Junio C HamanoMerge branch 'maint-2.1' into maint
2015-01-07  Junio C HamanoMerge branch 'maint-1.8.5' into maint-1.9
2014-12-22  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-22  Junio C HamanoMerge branch 'jk/no-perl-tests' into maint
2014-12-22  Junio C HamanoMerge branch 'po/everyday-doc' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/push-simple' into maint
2014-12-22  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking...
2014-12-22  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param...
2014-12-22  Junio C HamanoMerge branch 'rs/receive-pack-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'rs/maint-config-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'js/windows-open-eisdir-error' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/colors-fix' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint
2014-12-17  Junio C HamanoSync with v2.1.4
2014-12-17  Junio C HamanoSync with v1.8.5.6
2014-11-19  Junio C HamanoMerge branch 'sv/submitting-final-patch'
2014-11-19  Junio C HamanoMerge branch 'sn/tutorial-status-output-example'
2014-11-19  Junio C HamanoMerge branch 'mh/doc-remote-helper-xref'
2014-11-19  Junio C HamanoMerge branch 'tb/no-relative-file-url'
2014-11-19  Junio C HamanoMerge branch 'cc/interpret-trailers'
2014-11-18  Junio C HamanoMerge git://github.com/git-l10n/git-po
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-11-18  Junio C HamanoMerge branch 'ta/tutorial-modernize'
2014-11-18  Junio C HamanoMerge branch 'da/difftool'
2014-11-14  David Aguilardifftool: honor --trust-exit-code for builtin tools
2014-11-12  Junio C HamanoSync with 'maint'
2014-11-12  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace' into...
2014-11-12  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-11  Junio C HamanoSync with maint
2014-11-11  Junio C HamanoMerge branch 'rs/clean-menu-item-defn' into maint
2014-11-10  Junio C HamanoSync with maint
2014-11-10  Junio C HamanoMerge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06  Junio C HamanoMerge branch 'maint'
2014-11-06  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace'
2014-11-06  Junio C HamanoMerge branch 'tm/line-log-first-parent'
2014-11-06  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-06  Junio C HamanoMerge branch 'rs/use-child-process-init-more'
2014-11-06  Junio C HamanoMerge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31  Junio C HamanoMerge branch 'for-junio' of git://bogomips.org/git-svn
2014-10-31  Junio C HamanoMerge branch 'jc/push-cert'
2014-10-31  Junio C HamanoMerge branch 'rs/child-process-init'
2014-10-31  Junio C HamanoMerge branch 'rs/grep-color-words'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoSync with Git 2.1.3
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29  Junio C HamanoMerge branch 'rs/daemon-fixes' into maint
2014-10-29  Junio C HamanoMerge branch 'da/difftool'
2014-10-29  Junio C HamanoMerge branch 'rb/pack-window-memory-config-doc'
2014-10-29  Junio C HamanoMerge branch 'mg/lib-gpg-ro-safety'
2014-10-29  Junio C HamanoMerge branch 'dm/port2zos'
2014-10-29  Junio C HamanoMerge branch 'oc/mergetools-beyondcompare'
2014-10-21  Junio C Hamanomergetool: rename bc3 to bc
2014-10-16  Junio C HamanoMerge branch 'jc/completion-no-chdir'
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-10-14  Junio C HamanoMerge branch 'rs/mailsplit'
2014-10-14  Junio C HamanoMerge branch 'rs/daemon-fixes'
2014-10-07  Junio C HamanoMerge branch 'maint-1.8.5' into maint-1.9
2014-09-30  Junio C HamanoMerge branch 'jc/test-lazy-prereq'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-30  Junio C HamanoMerge branch 'jk/index-pack-threading-races' into maint
2014-09-29  Junio C HamanoMerge branch 'sb/t6031-typofix'
2014-09-29  Junio C HamanoMerge branch 'sb/t9300-typofix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-09-19  Junio C HamanoMerge branch 'jn/unpack-trees-checkout-m-carry-deletion...
2014-09-19  Junio C HamanoMerge branch 'lf/bundle-exclusion' into maint
2014-09-19  Junio C HamanoMerge branch 'jk/command-line-config-empty-string'...
2014-09-19  Junio C HamanoMerge branch 'rs/export-strbuf-addchars'
2014-09-19  Junio C HamanoMerge branch 'jk/index-pack-threading-races'
2014-09-11  Junio C HamanoMerge branch 'jn/unpack-trees-checkout-m-carry-deletion'
2014-09-09  Junio C HamanoMerge branch 'rs/clean-menu-item-defn'
2014-09-09  Junio C HamanoMerge branch 'sb/mailsplit-dead-code-removal'
2014-09-09  Junio C HamanoMerge branch 'sb/blame-msg-i18n'
2014-09-09  Junio C HamanoMerge branch 'lf/bundle-exclusion'
2014-09-09  Junio C HamanoMerge branch 'jk/command-line-config-empty-string'
2014-09-09  Junio C HamanoMerge branch 'bc/imap-send-doc'
2014-09-02  Junio C HamanoMerge branch 'bc/archive-pax-header-mode'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04  Junio C HamanoMerge branch 'tf/maint-doc-push'
2014-07-23  Junio C HamanoMerge branch 'rs/fix-unlink-unix-socket'
2014-07-22  Junio C HamanoMerge branch 'ah/fix-http-push' into maint
2014-07-22  Junio C HamanoMerge branch 'zk/log-graph-showsig' into maint
2014-07-22  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color' into maint
2014-07-22  Junio C HamanoMerge branch 'ep/shell-assign-and-export-vars' into...
2014-07-22  Junio C HamanoMerge branch 'maint-1.8.5' into maint-1.9
2014-07-21  Junio C HamanoMerge branch 'ek/alt-odb-entry-fix'
2014-07-16  Junio C HamanoMerge branch 'ah/fix-http-push'
2014-07-16  Junio C HamanoMerge branch 'zk/log-graph-showsig'
2014-07-16  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color'
2014-07-16  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison' into...
2014-07-16  Junio C HamanoMerge branch 'maint-1.8.5' into maint-1.9
2014-07-10  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison'
2014-07-10  Junio C HamanoMerge branch 'jk/repack-pack-keep-objects' into maint
2014-07-10  Junio C HamanoMerge branch 'mc/doc-submodule-sync-recurse' into maint
2014-07-02  Junio C HamanoMerge branch 'maint-1.8.5' into maint
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
next