Merge branch 'mj/log-show-signature-conf'
[gitweb.git] / t / t7605-merge-resolve.sh
2016-07-11 Merge branch 'js/find-commit-subject-ignore-leading...
2016-07-11 Merge branch 'jn/preformatted-doc-url'
2016-07-11 Merge branch 'jk/ansi-color'
2016-07-11 Merge branch 'jc/send-email-skip-backup'
2016-07-06 Merge branch 'jc/t2300-setup'
2016-07-06 Merge branch 'ao/p4-has-branch-prefix-fix'
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-07-06 Merge branch 'sb/t5614-modernize'
2016-07-06 Merge branch 'ak/t7800-wo-readlink'
2016-07-06 Merge branch 'jk/tzoffset-fix'
2016-07-06 Merge branch 'js/mingw-parameter-less-c-functions'
2016-07-06 Merge branch 'lc/shell-default-value-noexpand'
2016-07-06 Merge branch 'sb/clone-shallow-passthru'
2016-07-06 Merge branch 'nd/worktree-cleanup-post-head-protection'
2016-07-06 Merge branch 'jk/bisect-show-tree'
2016-07-06 Merge branch 'km/fetch-do-not-free-remote-name'
2016-07-06 Merge branch 'jk/send-pack-stdio'
2016-07-06 Merge branch 'ep/http-curl-trace'
2016-07-06 Merge branch 'jc/deref-tag' into maint
2016-07-06 Merge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06 Merge branch 'jk/fetch-prune-doc' into maint
2016-07-06 Merge branch 'pc/occurred' into maint
2016-07-06 Merge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06 Merge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06 Merge branch 'nb/gnome-keyring-build' into maint
2016-07-06 Merge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06 Merge branch 'rj/compat-regex-size-max-fix' into maint
2016-07-06 Merge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06 Merge branch 'dn/gpg-doc' into maint
2016-07-06 Merge branch 'ap/git-svn-propset-doc' into maint
2016-07-06 Merge branch 'tr/doc-tt' into maint
2016-06-27 Merge branch 'tb/complete-status'
2016-06-27 Merge branch 'mg/cherry-pick-multi-on-unborn'
2016-06-27 Merge branch 'lf/receive-pack-auto-gc-to-client'
2016-06-27 Merge branch 'em/newer-freebsd-shells-are-fine-with...
2016-06-27 Merge branch 'nb/gnome-keyring-build'
2016-06-27 Merge branch 'jc/deref-tag'
2016-06-27 Merge branch 'jk/avoid-unbounded-alloca'
2016-06-27 Merge branch 'rj/compat-regex-size-max-fix'
2016-06-27 Merge branch 'vs/prompt-avoid-unset-variable'
2016-06-27 Merge branch 'pb/strbuf-read-file-doc'
2016-06-27 Merge branch 'dn/gpg-doc'
2016-06-27 Merge branch 'jk/fetch-prune-doc'
2016-06-27 Merge branch 'ap/git-svn-propset-doc'
2016-06-27 Merge branch 'tr/doc-tt'
2016-06-27 Merge branch 'pc/occurred'
2016-06-27 Merge branch 'rs/xdiff-hunk-with-func-line' into maint
2016-06-27 Merge branch 'jk/rev-list-count-with-bitmap' into maint
2016-06-27 Merge branch 'et/pretty-format-c-auto' into maint
2016-06-27 Merge branch 'ew/daemon-socket-keepalive' into maint
2016-06-20 Merge branch 'rs/xdiff-hunk-with-func-line'
2016-06-20 Merge branch 'jk/rev-list-count-with-bitmap'
2016-06-20 Merge branch 'wd/userdiff-css'
2016-06-20 Merge branch 'et/pretty-format-c-auto'
2016-06-20 Merge branch 'ew/daemon-socket-keepalive'
2016-06-20 Merge branch 'ew/fast-import-unpack-limit'
2016-06-13 Merge branch 'jk/parseopt-string-list' into jk/string...
2016-06-10 Merge branch 'jk/diff-compact-heuristic'
2016-06-10 Merge branch 'jk/shell-portability'
2016-06-10 Merge branch 'jc/t2300-setup'
2016-06-06 Sync with 2.8.4
2016-06-03 Merge branch 'rs/apply-name-terminate'
2016-06-03 Merge branch 'rs/patch-id-use-skip-prefix'
2016-06-03 Merge branch 'mm/makefile-developer-can-be-in-config...
2016-06-03 Merge branch 'pa/cherry-pick-doc-typo'
2016-06-03 Merge branch 'js/rebase-i-dedup-call-to-rerere'
2016-05-31 Merge branch 'maint'
2016-05-31 Merge branch 'es/t1500-modernize'
2016-05-31 Merge branch 'jk/cat-file-buffered-batch-all'
2016-05-31 Merge branch 'fc/fast-import-broken-marks-file'
2016-05-30 Merge branch 'ak/t0008-ksh88-workaround'
2016-05-30 Merge branch 'js/t6044-use-test-seq'
2016-05-30 Merge branch 'rj/log-decorate-auto'
2016-05-30 Merge branch 'kb/msys2-tty'
2016-05-26 Sync with maint
2016-05-26 Merge branch 'fix_fr' of git://github.com/jnavila/git
2016-05-23 Merge branch 'jc/rerere-multi'
2016-05-23 Merge branch 'da/difftool'
2016-05-23 Merge branch 'ar/diff-args-osx-precompose'
2016-05-23 Merge branch 'jc/doc-lint'
2016-05-23 Merge branch 'jc/test-parse-options-expect'
2016-05-23 Merge branch 'pb/commit-verbose-config'
2016-05-23 Merge branch 'xy/format-patch-base'
2016-05-23 Merge branch 'tb/core-eol-fix'
2016-05-23 Merge branch 'nd/worktree-various-heads'
2016-05-23 Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
2016-05-18 Sync with 2.8.3
2016-05-18 Merge branch 'jk/push-client-deadlock-fix'
2016-05-17 Merge branch 'kf/gpg-sig-verification-doc'
2016-05-17 Merge branch 'js/windows-dotgit'
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-17 Merge branch 'jk/test-send-sh-x-trace-elsewhere'
2016-05-17 Merge branch 'js/http-custom-headers'
2016-05-17 Merge branch 'jk/rebase-interative-eval-fix'
2016-05-17 Merge branch 'jc/fsck-nul-in-commit'
2016-05-17 Merge branch 'nd/test-helpers'
2016-05-17 Merge branch 'ls/travis-build-doc'
2016-05-17 Merge branch 'jc/ll-merge-internal'
2016-05-17 Merge branch 'jc/linkgit-fix'
2016-05-17 Merge branch 'va/i18n-remote-comment-to-align'
next