Merge branch 'mh/tidy-ref-update-flags'
[gitweb.git] / t / t7610-mergetool.sh
2017-11-15 Merge branch 'ao/merge-verbosity-getenv-just-once'
2017-11-15 Merge branch 'mh/avoid-rewriting-packed-refs'
2017-11-15 Merge branch 'rs/imap-send-next-arg-fix'
2017-11-09 Merge branch 'js/mingw-full-version-in-resources'
2017-11-09 Merge branch 'dk/libsecret-unlock-to-load-fix'
2017-11-09 Merge branch 'js/early-config'
2017-11-09 Merge branch 'sg/travis-fixes'
2017-11-09 Merge branch 'ad/5580-unc-tests-on-cygwin'
2017-11-09 Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-09 Merge branch 'sb/blame-config-doc'
2017-11-06 Merge branch 'gc/gitweb-filetest-acl'
2017-11-06 Merge branch 'hv/fetch-moved-submodules-on-demand'
2017-11-06 Merge branch 'jc/check-ref-format-oor'
2017-11-06 Merge branch 'jk/revision-pruning-optim'
2017-11-06 Merge branch 'ds/find-unique-abbrev-optim'
2017-11-06 Merge branch 'pc/submodule-helper'
2017-11-06 Merge branch 'pb/bisect-helper'
2017-11-06 Merge branch 'dm/run-command-ignored-hook-advise'
2017-11-06 Merge branch 'ex/deprecate-empty-pathspec-as-match...
2017-11-06 Merge branch 'jk/rebase-i-exec-gitdir-fix'
2017-11-06 Merge branch 'cn/diff-indent-no-longer-is-experimental'
2017-11-06 Merge branch 'bw/grep-recurse-submodules'
2017-11-06 Merge branch 'js/submodule-in-excluded'
2017-11-06 Merge branch 'ao/check-resolve-ref-unsafe-result'
2017-11-06 Merge branch 'kd/auto-col-with-pager-fix'
2017-11-06 Merge branch 'jc/no-cmd-as-subroutine'
2017-11-06 Merge branch 'ma/lockfile-fixes'
2017-10-28 Merge branch 'sg/rev-list-doc-reorder-fix'
2017-10-28 Merge branch 'sb/rev-parse-show-superproject-root'
2017-10-28 Merge branch 'ao/path-use-xmalloc'
2017-10-28 Merge branch 'np/config-path-doc'
2017-10-26 Merge branch 'mh/ref-locking-fix'
2017-10-23 Sync with 2.14.3
2017-10-23 Merge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-23 Merge branch 'jt/fast-export-copy-modify-fix' into...
2017-10-19 Merge branch 'jc/branch-force-doc-readability-fix'
2017-10-19 Merge branch 'dg/filter-branch-filter-order-doc'
2017-10-19 Merge branch 'jc/fetch-refspec-doc-update'
2017-10-19 Merge branch 'wk/merge-options-gpg-sign-doc'
2017-10-18 Sync with maint
2017-10-18 Merge branch 'rs/qsort-s' into maint
2017-10-18 Merge branch 'ma/pkt-line-leakfix' into maint
2017-10-18 Merge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18 Merge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18 Merge branch 'jk/describe-omit-some-refs' into maint
2017-10-18 Merge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-18 Merge branch 'jk/ref-filter-colors-fix'
2017-10-18 Merge branch 'js/rebase-i-final'
2017-10-17 Merge branch 'sb/diff-color-move'
2017-10-17 Merge branch 'js/rebase-i-final'
2017-10-17 Merge branch 'jc/doc-checkout'
2017-10-17 Merge branch 'master' of git://github.com/git-l10n...
2017-10-11 Merge branch 'ls/filter-process-delayed'
2017-10-11 Merge branch 'ds/avoid-overflow-in-midpoint-computation'
2017-10-11 Merge branch 'tb/complete-describe'
2017-10-11 Merge branch 'sb/test-cmp-expect-actual'
2017-10-07 Merge branch 'rs/qsort-s'
2017-10-07 tests: fix diff order arguments in test_cmp
2017-09-29 Merge branch 'jt/fast-export-copy-modify-fix'
2017-09-28 Merge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Merge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Merge branch 'jk/describe-omit-some-refs'
2017-09-25 Merge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22 Sync with 2.11.4
2017-09-22 Sync with 2.10.5
2017-09-20 Merge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20 Merge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19 Merge branch 'ma/pkt-line-leakfix'
2017-09-10 Merge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10 Merge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10 Merge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10 Merge branch 'sb/sha1-file-cleanup' into maint
2017-09-10 Merge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10 Merge branch 'ah/doc-empty-string-is-false' into maint
2017-09-10 Merge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10 Merge branch 'rj/add-chmod-error-message' into maint
2017-09-10 Merge branch 'rs/t3700-clean-leftover' into maint
2017-09-10 Merge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10 Merge branch 'rs/t4062-obsd' into maint
2017-08-27 Merge branch 'jt/doc-pack-objects-fix'
2017-08-27 Merge branch 'jn/vcs-svn-cleanup'
2017-08-27 Merge branch 'bc/vcs-svn-cleanup'
2017-08-23 Merge branch 'js/run-process-parallel-api-fix' into...
2017-08-23 Merge branch 'sb/sha1-file-cleanup'
2017-08-23 Merge branch 'rs/t1002-do-not-use-sum'
2017-08-23 Merge branch 'ah/doc-empty-string-is-false'
2017-08-22 Merge branch 'rs/t4062-obsd'
2017-08-22 Merge branch 'rs/find-pack-entry-bisection'
2017-08-22 Merge branch 'rj/add-chmod-error-message'
2017-08-22 Merge branch 'rs/t3700-clean-leftover'
2017-08-22 Merge branch 'jc/perl-git-comment-typofix'
2017-08-11 Merge branch 'js/run-process-parallel-api-fix'
2017-08-04 Merge branch 'ah/patch-id-doc'
2017-07-31 Merge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30 Merge tag 'v2.11.3' into maint-2.12
2017-07-30 Merge tag 'v2.10.4' into maint-2.11
2017-07-30 Merge tag 'v2.8.6' into maint-2.9
2017-07-30 Merge tag 'v2.7.6' into maint-2.8
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-21 Merge branch 'ew/fd-cloexec-fix' into maint
next