tests: squelch noise from GPG machinery set-up
[gitweb.git] / git-mergetool--lib.sh
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 git://github.com/git-l10n/git-po
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-18 Merge branch 'ta/tutorial-modernize'
2014-11-18 Merge branch 'da/difftool'
2014-11-14 difftool: honor --trust-exit-code for builtin tools
2014-11-12 Sync with 'maint'
2014-11-12 Merge branch 'nd/gitignore-trailing-whitespace' into...
2014-11-12 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-11 Sync with maint
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into 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 'rs/daemon-fixes' into maint
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-16 Merge branch 'jc/completion-no-chdir'
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-10-14 Merge branch 'rs/mailsplit'
2014-10-14 Merge branch 'rs/daemon-fixes'
2014-10-07 Merge branch 'maint-1.8.5' into maint-1.9
2014-09-30 Merge branch 'jc/test-lazy-prereq'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-30 Merge branch 'jk/index-pack-threading-races' into maint
2014-09-29 Merge branch 'sb/t6031-typofix'
2014-09-29 Merge branch 'sb/t9300-typofix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-09-19 Merge branch 'jn/unpack-trees-checkout-m-carry-deletion...
2014-09-19 Merge branch 'lf/bundle-exclusion' into maint
2014-09-19 Merge branch 'jk/command-line-config-empty-string'...
2014-09-19 Merge branch 'rs/export-strbuf-addchars'
2014-09-19 Merge branch 'jk/index-pack-threading-races'
2014-09-11 Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
2014-09-09 Merge branch 'rs/clean-menu-item-defn'
2014-09-09 Merge branch 'sb/mailsplit-dead-code-removal'
2014-09-09 Merge branch 'sb/blame-msg-i18n'
2014-09-09 Merge branch 'lf/bundle-exclusion'
2014-09-09 Merge branch 'jk/command-line-config-empty-string'
2014-09-09 Merge branch 'bc/imap-send-doc'
2014-09-02 Merge branch 'bc/archive-pax-header-mode'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04 Merge branch 'tf/maint-doc-push'
2014-07-23 Merge branch 'rs/fix-unlink-unix-socket'
2014-07-22 Merge branch 'ah/fix-http-push' into maint
2014-07-22 Merge branch 'zk/log-graph-showsig' into maint
2014-07-22 Merge branch 'mg/fix-log-mergetag-color' into maint
2014-07-22 Merge branch 'ep/shell-assign-and-export-vars' into...
2014-07-22 Merge branch 'maint-1.8.5' into maint-1.9
2014-07-21 Merge branch 'ek/alt-odb-entry-fix'
2014-07-16 Merge branch 'ah/fix-http-push'
2014-07-16 Merge branch 'zk/log-graph-showsig'
2014-07-16 Merge branch 'mg/fix-log-mergetag-color'
2014-07-16 Merge branch 'rs/fix-alt-odb-path-comparison' into...
2014-07-16 Merge branch 'maint-1.8.5' into maint-1.9
2014-07-10 Merge branch 'rs/fix-alt-odb-path-comparison'
2014-07-10 Merge branch 'jk/repack-pack-keep-objects' into maint
2014-07-10 Merge branch 'mc/doc-submodule-sync-recurse' into maint
2014-07-02 Merge branch 'maint-1.8.5' into maint
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-06-25 Merge branch 'mc/doc-submodule-sync-recurse'
2014-06-25 Merge branch 'jk/repack-pack-writebitmaps-config'
2014-06-25 Merge branch 'jk/repack-pack-keep-objects'
2014-06-25 Merge branch 'ym/fix-opportunistic-index-update-race...
2014-06-25 Merge branch 'mk/show-s-no-extra-blank-line-for-merges...
2014-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-25 Merge branch 'jc/shortlog-ref-exclude' into maint
2014-06-25 Merge branch 'fc/rerere-conflict-style' into maint
2014-06-25 Merge branch 'rs/mailinfo-header-cmp' into maint
2014-06-25 Merge branch 'sk/spawn-less-case-insensitively-from...
2014-06-25 Merge branch 'jk/diff-follow-must-take-one-pathspec...
2014-06-25 Merge branch 'jk/diff-files-assume-unchanged' into...
2014-06-25 Merge branch 'jk/commit-C-pick-empty' into maint
2014-06-25 Merge branch 'jc/apply-ignore-whitespace' into maint
2014-06-25 Merge branch 'jc/revision-dash-count-parsing' into...
2014-06-25 Merge branch 'jk/report-fail-to-read-objects-better...
2014-06-20 Merge branch 'jc/test-lazy-prereq' (early part)
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
next