Merge branch 'ab/pcre-v2'
[gitweb.git] / t / t3308-notes-merge.sh
2017-11-15 Merge branch 'ab/pcre-v2'
2017-11-15 Merge branch 'ad/rebase-i-serie-typofix'
2017-11-15 Merge branch 'js/for-each-ref-remote-name-and-ref'
2017-11-15 Merge branch 'bw/rebase-i-ignored-submodule-fix'
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-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
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-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 '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-11 Merge branch 'jk/refs-df-conflict'
2017-10-07 t3308: create a real ref directory/file conflict
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-06-24 Merge branch 'jc/diff-tree-stale-comment' into maint
2017-06-24 Merge branch 'jk/pack-idx-corruption-safety' into maint
2017-06-13 Merge branch 'jk/pack-idx-corruption-safety'
2017-06-13 Merge branch 'jc/diff-tree-stale-comment'
2017-06-05 Merge branch 'sg/core-filemode-doc-typofix' into maint
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix'
2017-05-05 Merge branch 'maint-2.7' into maint-2.8
2017-05-01 Merge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-04-17 Merge branch 'jc/unused-symbols'
2017-04-11 Merge branch 'cc/untracked'
2017-03-30 Merge branch 'bc/push-cert-receive-fix'
2017-03-30 Merge branch 'jc/merge-drop-old-syntax'
2017-03-28 Merge branch 'rs/path-name-safety-cleanup' into maint
2017-03-24 Merge branch 'rs/path-name-safety-cleanup'
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-02-16 Merge branch 'ls/p4-path-encoding'
2017-02-10 Merge branch 'ps/worktree-prune-help-fix'
2017-01-31 Merge branch 'ad/bisect-terms' into maint
2017-01-23 Merge branch 'ad/bisect-terms'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'jc/pull-rebase-ff' into maint
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2016-12-19 Merge branch 'sb/t3600-cleanup'
2016-12-19 Merge branch 'jc/pull-rebase-ff'
2016-12-19 Merge branch 'bb/unicode-9.0'
2016-11-29 Merge branch 'mm/send-email-cc-cruft-after-address...
2016-10-28 Merge branch 'jk/tighten-alloc' into maint
2016-10-26 Merge branch 'mm/send-email-cc-cruft-after-address'
2016-10-26 Merge branch 'jk/tighten-alloc'
2016-10-26 Merge branch 'jc/ws-error-highlight'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-10-11 Merge branch 'jc/verify-loose-object-header' into maint
2016-10-03 Merge branch 'jc/verify-loose-object-header'
2016-09-29 Merge branch 'ls/travis-homebrew-path-fix' into maint
2016-09-29 Merge branch 'ep/doc-check-ref-format-example' into...
2016-09-29 Merge branch 'jk/reduce-gc-aggressive-depth' into maint
2016-09-29 Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
next