Merge branch 'da/subtree-2.9-regression' into maint
[git] / notes-merge.c
2016-08-10  Junio C HamanoMerge branch 'da/subtree-2.9-regression' into maint
2016-08-10  Junio C HamanoMerge branch 'os/no-verify-skips-commit-msg-too' into...
2016-08-10  Junio C HamanoMerge branch 'rs/rm-strbuf-optim' into maint
2016-08-10  Junio C HamanoMerge branch 'jk/parse-options-concat' into maint
2016-08-10  Junio C HamanoMerge branch 'ls/travis-enable-httpd-tests' into maint
2016-08-10  Junio C HamanoMerge branch 'ew/autoconf-pthread' into maint
2016-08-10  Junio C HamanoMerge branch 'rs/help-c-source-with-gitattributes'...
2016-08-10  Junio C HamanoMerge branch 'mm/status-suggest-merge-abort' into maint
2016-08-08  Junio C HamanoMerge branch 'sb/pack-protocol-doc-nak' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/submodule-config-code-cleanup' into...
2016-08-08  Junio C HamanoMerge branch 'sb/submodule-deinit-all' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/worktree-use-strbuf-absolute-path...
2016-08-08  Junio C HamanoMerge branch 'jc/doc-diff-filter-exclude' into maint
2016-08-08  Junio C HamanoMerge branch 'nd/test-helpers' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/use-strbuf-addbuf' into maint
2016-08-08  Junio C HamanoMerge branch 'lf/recv-sideband-cleanup' into maint
2016-08-08  Junio C HamanoMerge branch 'ah/unpack-trees-advice-messages' into...
2016-08-08  Junio C HamanoMerge branch 'lf/sideband-returns-void' into maint
2016-08-08  Junio C HamanoMerge branch 'jk/send-pack-stdio' into maint
2016-08-08  Junio C HamanoMerge branch 'pb/commit-editmsg-path' into maint
2016-08-08  Junio C HamanoMerge branch 'ew/find-perl-on-freebsd-in-local' into...
2016-08-08  Junio C HamanoMerge branch 'ew/daemon-socket-keepalive' into maint
2016-08-08  Junio C HamanoMerge branch 'nd/pack-ofs-4gb-limit' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/notes-merge-no-toctou' into maint
2016-08-08  Junio C HamanoMerge branch 'js/ignore-space-at-eol' into maint
2016-08-08  Junio C HamanoMerge branch 'jk/push-scrub-url' into maint
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'nd/doc-new-command' into maint
2016-07-28  Junio C HamanoMerge branch 'ew/gc-auto-pack-limit-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'js/color-on-windows-comment' into maint
2016-07-28  Junio C HamanoMerge branch 'js/sign-empty-commit-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'ps/rebase-i-auto-unstash-upon-abort'...
2016-07-28  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-07-28  Junio C HamanoMerge branch 'js/find-commit-subject-ignore-leading...
2016-07-11  Junio C HamanoMerge branch 'cb/t7810-test-label-fix' into maint
2016-07-11  Junio C HamanoMerge branch 'ao/p4-has-branch-prefix-fix' into maint
2016-07-11  Junio C HamanoMerge branch 'ak/t7800-wo-readlink' into maint
2016-07-11  Junio C HamanoMerge branch 'lc/shell-default-value-noexpand' into...
2016-07-11  Junio C HamanoMerge branch 'jk/bisect-show-tree' into maint
2016-07-07  RenĂ© Scharfenotes-merge: use O_EXCL to avoid overwriting existing...
2016-07-06  Junio C HamanoMerge branch 'jc/deref-tag' into maint
2016-07-06  Junio C HamanoMerge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/fetch-prune-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06  Junio C HamanoMerge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06  Junio C HamanoMerge branch 'nb/gnome-keyring-build' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06  Junio C HamanoMerge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06  Junio C HamanoMerge branch 'dn/gpg-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'ap/git-svn-propset-doc' into maint
2016-06-27  Junio C HamanoMerge branch 'jk/rev-list-count-with-bitmap' into maint
2016-06-10  Junio C HamanoMerge branch 'jk/diff-compact-heuristic'
2016-06-06  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose' into maint
2016-06-03  Junio C HamanoMerge branch 'rs/apply-name-terminate'
2016-06-03  Junio C HamanoMerge branch 'rs/patch-id-use-skip-prefix'
2016-06-03  Junio C HamanoMerge branch 'pa/cherry-pick-doc-typo'
2016-06-03  Junio C HamanoMerge branch 'js/rebase-i-dedup-call-to-rerere'
2016-05-31  Junio C HamanoMerge branch 'bn/http-cookiefile-config' into maint
2016-05-31  Junio C HamanoMerge branch 'jk/test-send-sh-x-trace-elsewhere' into...
2016-05-31  Junio C HamanoMerge branch 'js/name-rev-use-oldest-ref' into maint
2016-05-31  Junio C HamanoMerge branch 'jk/cat-file-buffered-batch-all'
2016-05-30  Junio C HamanoMerge branch 'rj/log-decorate-auto'
2016-05-26  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism' into maint
2016-05-26  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames' into maint
2016-05-26  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs' into...
2016-05-26  Junio C HamanoMerge branch 'ak/t4151-ls-files-could-be-empty' into...
2016-05-26  Junio C HamanoMerge branch 'jc/test-seq' into maint
2016-05-26  Junio C HamanoMerge branch 'tb/t5601-sed-fix' into maint
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-26  Junio C HamanoMerge branch 'jk/war-on-sprintf' into maint-2.7
2016-05-23  Junio C HamanoMerge branch 'jc/rerere-multi'
2016-05-23  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose'
2016-05-23  Junio C HamanoMerge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
2016-05-18  Junio C HamanoMerge branch 'sb/clean-test-fix' into HEAD
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD
2016-05-18  Junio C HamanoMerge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
2016-05-18  Junio C HamanoMerge branch 'sk/gitweb-highlight-encoding' into HEAD
2016-05-18  Junio C HamanoMerge branch 'ls/travis-submitting-patches' into HEAD
2016-05-18  Junio C HamanoMerge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
2016-05-18  Junio C HamanoMerge branch 'nf/mergetool-prompt' into HEAD
2016-05-18  Junio C HamanoMerge branch 'jd/send-email-to-whom' into HEAD
2016-05-18  Junio C HamanoMerge branch 'sb/mv-submodule-fix' into HEAD
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix'
2016-05-17  Junio C HamanoMerge branch 'jk/test-send-sh-x-trace-elsewhere'
2016-05-17  Junio C HamanoMerge branch 'jc/ll-merge-internal'
2016-05-17  Junio C HamanoMerge branch 'tb/t5601-sed-fix'
2016-05-17  Junio C HamanoMerge branch 'jc/test-seq'
2016-05-17  Junio C HamanoMerge branch 'ak/t4151-ls-files-could-be-empty'
2016-05-17  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs'
2016-05-17  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames'
2016-05-17  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism'
2016-05-17  Junio C HamanoMerge branch 'jc/config-pathname-type'
2016-05-17  Junio C HamanoMerge branch 'bn/http-cookiefile-config'
2016-05-13  Junio C HamanoMerge branch 'jc/commit-tree-ignore-commit-gpgsign'
2016-05-10  Junio C HamanoMerge branch 'sk/gitweb-highlight-encoding'
2016-05-10  Junio C HamanoMerge branch 'sb/clean-test-fix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-05-10  Junio C HamanoMerge branch 'ls/travis-submitting-patches'
2016-05-06  Junio C HamanoMerge branch 'ky/imap-send-openssl-1.1.0' into maint
2016-05-06  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration...
next