Merge branch 'jk/push-client-deadlock-fix'
[gitweb.git] / contrib / examples / git-merge.sh
2016-04-29 Merge branch 'jk/push-client-deadlock-fix'
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-18 Merge branch 'jk/branch-shortening-funny-symrefs'
2016-04-15 Merge branch 'jv/merge-nothing-into-void' into maint
2016-04-15 Merge branch 'ss/commit-squash-msg' into maint
2016-04-15 Merge branch 'jk/send-email-rtrim-mailrc-alias' into...
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 'jk/test-httpd-config-nosystem' into maint
2016-04-15 Merge branch 'sb/clone-t57-t56' into maint
2016-04-15 Merge branch 'jk/credential-cache-comment-exit' into...
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-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 'lt/pretty-expand-tabs'
2016-04-13 Merge branch 'es/format-patch-doc-hide-no-patch'
2016-04-13 Merge branch 'sb/misc-cleanups'
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 'ky/branch-d-worktree'
2016-04-13 Merge branch 'rt/rebase-i-shorten-stop-report'
2016-04-13 Merge branch 'rt/completion-help'
2016-04-13 Merge branch 'ak/use-hashmap-iter-first-in-submodule...
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-08 Merge branch 'jc/merge-refuse-new-root'
2016-04-06 Merge branch 'jv/merge-nothing-into-void'
2016-04-06 Merge branch 'ss/commit-squash-msg'
2016-04-06 Merge branch 'jk/test-httpd-config-nosystem'
2016-04-06 Merge branch 'jk/send-email-rtrim-mailrc-alias'
2016-04-06 Merge branch 'jk/credential-cache-comment-exit'
2016-04-06 Merge branch 'sb/clone-t57-t56'
2016-04-06 Merge branch 'ls/p4-map-user'
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 'mp/upload-pack-use-embedded-args'
2016-03-24 Merge branch 'ls/p4-doc-markup'
2016-03-24 Merge branch 'sb/submodule-module-list-pathspec-fix'
2016-03-21 Sync with maint
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17 Sync with Git 2.7.4
2016-03-16 Sync with maint
2016-03-16 Merge branch 'jc/sane-grep'
2016-03-16 Merge branch 'cn/deprecate-ssh-git-url'
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-10 Sync with 2.7.3
2016-03-10 Merge branch 'jx/http-no-proxy'
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/tighten-alloc'
2016-03-04 Merge branch 'jk/pack-idx-corruption-safety'
2016-03-04 Merge branch 'js/mingw-tests'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-26 Merge branch 'ma/update-hooks-sample-typofix'
2016-02-26 Merge branch 'dt/initial-ref-xn-commit-doc'
2016-02-26 Merge branch 'js/config-set-in-non-repository'
2016-02-26 Merge branch 'jk/epipe-in-async'
2016-02-26 Merge branch 'fa/merge-recursive-no-rename'
2016-02-26 Merge branch 'sb/submodule-fetch-nontip'
2016-02-26 Merge branch 'sb/submodule-module-list-fix'
2016-02-26 Merge branch 'jk/grep-binary-workaround-in-test'
2016-02-26 Merge branch 'ps/plug-xdl-merge-leak'
2016-02-26 Merge branch 'mm/push-simple-doc'
2016-02-26 Merge branch 'jg/credential-cache-chdir-to-sockdir'
2016-02-26 Merge branch 'ps/config-error'
2016-02-26 Merge branch 'mg/work-tree-tests'
2016-02-26 Merge branch 'ls/config-origin'
next