Merge branch 'js/regexec-buf' into maint
[gitweb.git] / ll-merge.c
2016-05-02 Merge branch 'jc/http-socks5h' into maint
2016-05-02 Merge branch 'ad/commit-have-m-option' into maint
2016-05-02 Merge branch 'sb/submodule-helper-clone-regression...
2016-05-02 Merge branch 'es/format-patch-doc-hide-no-patch' into...
2016-05-02 Merge branch 'ew/send-email-readable-message-id' into...
2016-04-29 Merge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29 Merge branch 'jc/makefile-redirection-stderr' into...
2016-04-29 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29 Merge branch 'sk/send-pack-all-fix' into maint
2016-04-29 Merge branch 'sg/diff-multiple-identical-renames' into...
2016-04-29 Merge branch 'js/replace-edit-use-editor-configuration'
2016-04-29 Merge branch 'sb/mv-submodule-fix'
2016-04-29 Merge branch 'da/user-useconfigonly'
2016-04-25 Merge branch 'jc/rerere-multi'
2016-04-22 Merge branch 'ad/cygwin-wants-rename'
2016-04-22 Merge branch 'jc/http-socks5h'
2016-04-22 Merge branch 'ky/imap-send-openssl-1.1.0'
2016-04-22 Merge branch 'jc/xstrfmt-null-with-prec-0'
2016-04-22 Merge branch 'ad/commit-have-m-option'
2016-04-22 Merge branch 'ew/send-email-drop-data-dumper'
2016-04-22 Merge branch 'ew/send-email-readable-message-id'
2016-04-22 Merge branch 'sb/submodule-helper-clone-regression...
2016-04-15 Merge branch 'ss/commit-squash-msg' into maint
2016-04-15 Merge branch 'da/mergetool-delete-delete-conflict'...
2016-04-15 Merge branch 'jk/getwholeline-getdelim-empty' into...
2016-04-15 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15 Merge branch 'jk/rev-parse-local-env-vars' into maint
2016-04-15 Merge branch 'jk/config-get-urlmatch' into maint
2016-04-15 Merge branch 'pb/t7502-drop-dup' into maint
2016-04-15 Merge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-15 Merge branch 'mp/upload-pack-use-embedded-args' into...
2016-04-15 Merge branch 'oa/doc-diff-check' into maint
2016-04-15 Merge branch 'pb/opt-cmdmode-doc' into maint
2016-04-15 Merge branch 'nd/apply-doc' into maint
2016-04-14 ll-merge: fix typo in comment
2016-04-14 Merge branch 'sb/submodule-path-misc-bugs' into sb...
2016-04-14 Merge branch 'sb/submodule-helper-clone-regression...
2016-04-13 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-13 Merge branch 'mg/complete-cherry-mark-to-log'
2016-04-13 Merge branch 'ep/trace-doc-sample-fix'
2016-04-13 Merge branch 'jc/makefile-redirection-stderr'
2016-04-13 Merge branch 'es/format-patch-doc-hide-no-patch'
2016-04-13 Merge branch 'sk/send-pack-all-fix'
2016-04-13 Merge branch 'sg/diff-multiple-identical-renames'
2016-04-13 Merge branch 'kn/for-each-tag-branch'
2016-04-13 Merge branch 'rt/rebase-i-shorten-stop-report'
2016-04-08 Merge branch 'oa/doc-diff-check'
2016-04-08 Merge branch 'pb/opt-cmdmode-doc'
2016-04-08 Merge branch 'nd/apply-doc'
2016-04-06 Merge branch 'jk/submodule-c-credential'
2016-04-06 Merge branch 'ss/commit-squash-msg'
2016-04-06 Merge branch 'pb/t7502-drop-dup'
2016-04-06 Merge branch 'da/mergetool-delete-delete-conflict'
2016-04-06 Merge branch 'sb/submodule-parallel-update'
2016-04-06 Merge branch 'ss/exc-flag-is-a-collection-of-bits'
2016-04-03 Merge branch 'jk/getwholeline-getdelim-empty'
2016-04-03 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
2016-04-03 Merge branch 'jc/maint-index-pack-keep'
2016-04-03 Merge branch 'jk/rev-parse-local-env-vars'
2016-04-03 Merge branch 'jk/config-get-urlmatch'
2016-04-03 Merge branch 'jk/credential-clear-config'
2016-04-03 Merge branch 'mp/upload-pack-use-embedded-args'
2016-04-03 Merge branch 'mm/diff-renames-default'
2016-04-03 Merge branch 'mm/readme-markdown'
2016-04-03 Merge branch 'mm/readme-markdown' into maint
2016-03-24 Merge branch 'sb/submodule-module-list-pathspec-fix'
2016-03-21 Merge branch 'mm/doc-hooks-linkgit-fix' into maint
2016-03-21 Merge branch 'es/st-add4-gcc-4.2-workaround' into maint
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17 Sync with Git 2.6.6
2016-03-17 Merge branch 'maint-2.4' into maint-2.5
2016-03-16 Merge branch 'jc/sane-grep'
2016-03-16 Merge branch 'cn/deprecate-ssh-git-url'
2016-03-16 Merge branch 'jk/path-name-safety-2.6' into jk/path...
2016-03-16 Merge branch 'jk/path-name-safety-2.4' into jk/path...
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-10 Merge branch 'ma/update-hooks-sample-typofix' into...
2016-03-10 Merge branch 'dt/initial-ref-xn-commit-doc' into maint
2016-03-10 Merge branch 'ps/plug-xdl-merge-leak' into maint
2016-03-10 Merge branch 'ak/git-strip-extension-from-dashed-comman...
2016-03-10 Merge branch 'ak/extract-argv0-last-dir-sep' into maint
2016-03-10 Merge branch 'jk/pack-idx-corruption-safety' into maint
2016-03-10 Merge branch 'js/config-set-in-non-repository' into...
2016-03-10 Merge branch 'sb/submodule-module-list-fix' into maint
2016-03-10 Merge branch 'jk/grep-binary-workaround-in-test' into...
2016-03-10 Merge branch 'mm/push-simple-doc' into maint
2016-03-10 Merge branch 'jk/tighten-alloc' into maint
2016-03-10 Merge branch 'jk/more-comments-on-textconv' into maint
2016-03-10 Merge branch 'jk/no-diff-emit-common' into maint
2016-03-10 Merge branch 'jc/am-i-v-fix' into maint
2016-03-10 Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
2016-03-10 Merge branch 'mg/work-tree-tests' into maint
2016-03-10 Merge branch 'jx/http-no-proxy'
2016-03-10 Merge branch 'jc/exclusion-doc'
2016-03-10 Merge branch 'js/close-packs-before-gc'
2016-03-10 Merge branch 'sb/rebase-summary'
2016-03-04 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04 Merge branch 'js/pthread-exit-emu-windows'
2016-03-04 Merge branch 'sb/submodule-parallel-fetch'
2016-03-04 Merge branch 'jk/pack-idx-corruption-safety'
next