Merge branch 'sb/submodule-helper-clone-regression-fix'
[git] / builtin / merge.c
2016-04-22  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression...
2016-04-18  Junio C HamanoMerge branch 'jk/branch-shortening-funny-symrefs'
2016-04-18  Junio C HamanoMerge branch 'ky/branch-m-worktree'
2016-04-15  Junio C HamanoMerge branch 'maint'
2016-04-15  Junio C HamanoMerge branch 'jv/merge-nothing-into-void' into maint
2016-04-15  Junio C HamanoMerge branch 'ss/commit-squash-msg' into maint
2016-04-15  Junio C HamanoMerge branch 'da/mergetool-delete-delete-conflict'...
2016-04-15  Junio C HamanoMerge branch 'jk/getwholeline-getdelim-empty' into...
2016-04-15  Junio C HamanoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15  Junio C HamanoMerge branch 'jk/rev-parse-local-env-vars' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/config-get-urlmatch' into maint
2016-04-15  Junio C HamanoMerge branch 'pb/t7502-drop-dup' into maint
2016-04-15  Junio C HamanoMerge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-15  Junio C HamanoMerge branch 'mp/upload-pack-use-embedded-args' into...
2016-04-15  Junio C HamanoMerge branch 'oa/doc-diff-check' into maint
2016-04-15  Junio C HamanoMerge branch 'pb/opt-cmdmode-doc' into maint
2016-04-15  Junio C HamanoMerge branch 'nd/apply-doc' into maint
2016-04-13  Junio C HamanoMerge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-13  Junio C HamanoMerge branch 'mg/complete-cherry-mark-to-log'
2016-04-13  Junio C HamanoMerge branch 'ep/trace-doc-sample-fix'
2016-04-13  Junio C HamanoMerge branch 'jc/makefile-redirection-stderr'
2016-04-13  Junio C HamanoMerge branch 'lt/pretty-expand-tabs'
2016-04-13  Junio C HamanoMerge branch 'mj/pull-rebase-autostash'
2016-04-13  Junio C HamanoMerge branch 'jn/mergetools-examdiff'
2016-04-13  Junio C HamanoMerge branch 'es/format-patch-doc-hide-no-patch'
2016-04-13  Junio C HamanoMerge branch 'js/mingw-tests-2.8'
2016-04-13  Junio C HamanoMerge branch 'cc/apply'
2016-04-13  Junio C HamanoMerge branch 'sb/misc-cleanups'
2016-04-13  Junio C HamanoMerge branch 'sk/send-pack-all-fix'
2016-04-13  Junio C HamanoMerge branch 'sg/diff-multiple-identical-renames'
2016-04-13  Junio C HamanoMerge branch 'kn/for-each-tag-branch'
2016-04-13  Junio C HamanoMerge branch 'ky/branch-d-worktree'
2016-04-13  Junio C HamanoMerge branch 'rz/worktree-no-checkout'
2016-04-13  Junio C HamanoMerge branch 'rt/rebase-i-shorten-stop-report'
2016-04-13  Junio C HamanoMerge branch 'rt/completion-help'
2016-04-13  Junio C HamanoMerge branch 'ak/use-hashmap-iter-first-in-submodule...
2016-04-13  Junio C HamanoMerge branch 'jk/check-repository-format'
2016-04-08  Junio C HamanoMerge branch 'ss/msvc'
2016-04-08  Junio C HamanoMerge branch 'oa/doc-diff-check'
2016-04-08  Junio C HamanoMerge branch 'pb/opt-cmdmode-doc'
2016-04-08  Junio C HamanoMerge branch 'nd/apply-report-skip'
2016-04-08  Junio C HamanoMerge branch 'nd/apply-doc'
2016-04-08  Junio C HamanoMerge branch 'jc/merge-refuse-new-root'
2016-04-06  Junio C HamanoMerge branch 'la/tag-force-signing-annotated-tags'
2016-04-06  Junio C HamanoMerge branch 'jk/submodule-c-credential'
2016-04-06  Junio C HamanoMerge branch 'jv/merge-nothing-into-void'
2016-04-06  Junio C HamanoMerge branch 'ss/commit-squash-msg'
2016-04-06  Junio C HamanoMerge branch 'sb/rebase-x'
2016-04-06  Junio C HamanoMerge branch 'jk/test-httpd-config-nosystem'
2016-04-06  Junio C HamanoMerge branch 'jk/send-email-rtrim-mailrc-alias'
2016-04-06  Junio C HamanoMerge branch 'jk/credential-cache-comment-exit'
2016-04-06  Junio C HamanoMerge branch 'sb/clone-t57-t56'
2016-04-06  Junio C HamanoMerge branch 'ls/p4-map-user'
2016-04-06  Junio C HamanoMerge branch 'cc/doc-recommend-performance-trace-to...
2016-04-06  Junio C HamanoMerge branch 'pb/t7502-drop-dup'
2016-04-06  Junio C HamanoMerge branch 'da/mergetool-delete-delete-conflict'
2016-04-06  Junio C HamanoMerge branch 'sb/submodule-parallel-update'
2016-04-06  Junio C HamanoMerge branch 'ss/receive-pack-parse-options'
2016-04-06  Junio C HamanoMerge branch 'ss/exc-flag-is-a-collection-of-bits'
2016-04-03  Junio C HamanoSync with Git 2.8.1
2016-04-03  Junio C HamanoMerge branch 'jk/startup-info'
2016-04-03  Junio C HamanoMerge branch 'es/test-gpg-tags'
2016-04-03  Junio C HamanoMerge branch 'jk/getwholeline-getdelim-empty'
2016-04-03  Junio C HamanoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
2016-04-03  Junio C HamanoMerge branch 'jc/index-pack'
2016-04-03  Junio C HamanoMerge branch 'gf/fetch-pack-direct-object-fetch'
2016-04-03  Junio C HamanoMerge branch 'jc/maint-index-pack-keep'
2016-04-03  Junio C HamanoMerge branch 'mm/lockfile-error-message'
2016-04-03  Junio C HamanoMerge branch 'jk/rev-parse-local-env-vars'
2016-04-03  Junio C HamanoMerge branch 'jk/config-get-urlmatch'
2016-04-03  Junio C HamanoMerge branch 'jk/add-i-highlight'
2016-04-03  Junio C HamanoMerge branch 'jk/credential-clear-config'
2016-04-03  Junio C HamanoMerge branch 'mp/upload-pack-use-embedded-args'
2016-04-03  Junio C HamanoMerge branch 'mm/diff-renames-default'
2016-04-03  Junio C HamanoMerge branch 'mm/readme-markdown'
2016-04-03  Junio C HamanoMerge branch 'mm/readme-markdown' into maint
2016-03-24  Junio C HamanoMerge branch 'sb/submodule-module-list-pathspec-fix'
2016-03-23  Junio C Hamanomerge: refuse to create too cool a merge by default
2016-03-23  Junio C Hamanomerge: fix NULL pointer dereference when merging nothin...
2016-03-21  Junio C HamanoMerge branch 'mm/doc-hooks-linkgit-fix' into maint
2016-03-21  Junio C HamanoMerge branch 'es/st-add4-gcc-4.2-workaround' into maint
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17  Junio C HamanoSync with Git 2.6.6
2016-03-17  Junio C HamanoMerge branch 'maint-2.5' into maint-2.6
2016-03-17  Junio C HamanoMerge branch 'maint-2.4' into maint-2.5
2016-03-16  Junio C HamanoMerge branch 'jc/sane-grep'
2016-03-16  Junio C HamanoMerge branch 'cn/deprecate-ssh-git-url'
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.6' into jk/path...
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.5' into jk/path...
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.4' into jk/path...
2016-03-14  Junio C HamanoMerge branch 'mg/wt-status-mismarked-i18n'
2016-03-10  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' into...
2016-03-10  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc' into maint
2016-03-10  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak' into maint
2016-03-10  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-comman...
2016-03-10  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2016-03-10  Junio C HamanoMerge branch 'js/config-set-in-non-repository' into...
2016-03-10  Junio C HamanoMerge branch 'sb/submodule-module-list-fix' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' into...
next