Andrew's git - gitweb.git/history

[gitweb.git] / notes-merge.h

2016-05-17	Merge branch 'jk/test-send-sh-x-trace-elsewhere'	blob \| diff \| raw
2016-05-17	Merge branch 'jc/ll-merge-internal'	blob \| diff \| raw
2016-05-17	Merge branch 'tb/t5601-sed-fix'	blob \| diff \| raw
2016-05-17	Merge branch 'jc/test-seq'	blob \| diff \| raw
2016-05-17	Merge branch 'ak/t4151-ls-files-could-be-empty'	blob \| diff \| raw
2016-05-17	Merge branch 'sb/z-is-gnutar-ism'	blob \| diff \| raw
2016-05-13	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	blob \| diff \| raw
2016-05-10	Merge branch 'sk/gitweb-highlight-encoding'	blob \| diff \| raw
2016-05-10	Merge branch 'rn/glossary-typofix'	blob \| diff \| raw
2016-05-06	Merge branch 'kn/for-each-tag-branch' into maint	blob \| diff \| raw
2016-05-06	Merge branch 'jk/diff-compact-heuristic'	blob \| diff \| raw
2016-05-03	Merge branch 'jd/send-email-to-whom'	blob \| diff \| raw
2016-05-03	Merge branch 'jk/fix-attribute-macro-in-2.5'	blob \| diff \| raw
2016-05-03	Merge branch 'js/name-rev-use-oldest-ref'	blob \| diff \| raw
2016-05-02	Merge branch 'ew/send-email-drop-data-dumper' into...	blob \| diff \| raw
2016-05-02	Merge branch 'ad/cygwin-wants-rename' into maint	blob \| diff \| raw
2016-05-02	Merge branch 'ad/commit-have-m-option' into maint	blob \| diff \| raw
2016-05-02	Merge branch 'sb/submodule-helper-clone-regression...	blob \| diff \| raw
2016-05-02	Merge branch 'es/format-patch-doc-hide-no-patch' into...	blob \| diff \| raw
2016-05-02	Merge branch 'ew/send-email-readable-message-id' into...	blob \| diff \| raw
2016-04-29	Merge branch 'ep/trace-doc-sample-fix' into maint	blob \| diff \| raw
2016-04-29	Merge branch 'jc/makefile-redirection-stderr' into...	blob \| diff \| raw
2016-04-29	Merge branch 'tb/blame-force-read-cache-to-workaround...	blob \| diff \| raw
2016-04-29	Merge branch 'sk/send-pack-all-fix' into maint	blob \| diff \| raw
2016-04-29	Merge branch 'sg/diff-multiple-identical-renames' into...	blob \| diff \| raw
2016-04-25	Merge branch 'jc/rerere-multi'	blob \| diff \| raw
2016-04-22	Merge branch 'ad/cygwin-wants-rename'	blob \| diff \| raw
2016-04-22	Merge branch 'ad/commit-have-m-option'	blob \| diff \| raw
2016-04-22	Merge branch 'ew/send-email-drop-data-dumper'	blob \| diff \| raw
2016-04-22	Merge branch 'ew/send-email-readable-message-id'	blob \| diff \| raw
2016-04-22	Merge branch 'sb/submodule-helper-clone-regression...	blob \| diff \| raw
2016-04-15	Merge branch 'ss/commit-squash-msg' into maint	blob \| diff \| raw
2016-04-15	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...	blob \| diff \| raw
2016-04-15	Merge branch 'pb/t7502-drop-dup' into maint	blob \| diff \| raw
2016-04-15	Merge branch 'ss/exc-flag-is-a-collection-of-bits'...	blob \| diff \| raw
2016-04-14	Merge branch 'sb/submodule-helper-clone-regression...	blob \| diff \| raw
2016-04-13	Merge branch 'tb/blame-force-read-cache-to-workaround...	blob \| diff \| raw
2016-04-13	Merge branch 'mg/complete-cherry-mark-to-log'	blob \| diff \| raw
2016-04-13	Merge branch 'ep/trace-doc-sample-fix'	blob \| diff \| raw
2016-04-13	Merge branch 'jc/makefile-redirection-stderr'	blob \| diff \| raw
2016-04-13	Merge branch 'es/format-patch-doc-hide-no-patch'	blob \| diff \| raw
2016-04-13	Merge branch 'sk/send-pack-all-fix'	blob \| diff \| raw
2016-04-13	Merge branch 'sg/diff-multiple-identical-renames'	blob \| diff \| raw
2016-04-13	Merge branch 'kn/for-each-tag-branch'	blob \| diff \| raw
2016-04-06	Merge branch 'ss/commit-squash-msg'	blob \| diff \| raw
2016-04-06	Merge branch 'pb/t7502-drop-dup'	blob \| diff \| raw
2016-04-06	Merge branch 'ss/exc-flag-is-a-collection-of-bits'	blob \| diff \| raw
2016-04-03	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'	blob \| diff \| raw
2016-04-03	Merge branch 'jc/maint-index-pack-keep'	blob \| diff \| raw
2016-03-21	Merge branch 'mm/doc-hooks-linkgit-fix' into maint	blob \| diff \| raw
2016-03-21	Merge branch 'es/st-add4-gcc-4.2-workaround' into maint	blob \| diff \| raw
2016-03-21	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2016-03-17	Merge branch 'maint-2.5' into maint-2.6	blob \| diff \| raw
2016-03-16	Merge branch 'jk/path-name-safety-2.5' into jk/path...	blob \| diff \| raw
2016-03-14	Merge branch 'mg/wt-status-mismarked-i18n'	blob \| diff \| raw
2016-03-10	Merge branch 'ma/update-hooks-sample-typofix' into...	blob \| diff \| raw
2016-03-10	Merge branch 'ak/extract-argv0-last-dir-sep' into maint	blob \| diff \| raw
2016-03-10	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| diff \| raw
2016-03-10	Merge branch 'jk/grep-binary-workaround-in-test' into...	blob \| diff \| raw
2016-03-10	Merge branch 'mm/push-simple-doc' into maint	blob \| diff \| raw
2016-03-10	Merge branch 'jk/more-comments-on-textconv' into maint	blob \| diff \| raw
2016-03-10	Merge branch 'jk/no-diff-emit-common' into maint	blob \| diff \| raw
2016-03-10	Merge branch 'jc/am-i-v-fix' into maint	blob \| diff \| raw
2016-03-10	Merge branch 'nd/dwim-wildcards-as-pathspecs' into...	blob \| diff \| raw
2016-03-10	Merge branch 'mg/work-tree-tests' into maint	blob \| diff \| raw
2016-03-04	Merge branch 'nd/clear-gitenv-upon-use-of-alias'	blob \| diff \| raw
2016-03-04	Merge branch 'jk/pack-idx-corruption-safety'	blob \| diff \| raw
2016-03-03	Merge branch 'jc/maint-index-pack-keep' into jc/index...	blob \| diff \| raw
2016-02-26	Merge branch 'ma/update-hooks-sample-typofix'	blob \| diff \| raw
2016-02-26	Merge branch 'jk/grep-binary-workaround-in-test'	blob \| diff \| raw
2016-02-26	Merge branch 'mm/push-simple-doc'	blob \| diff \| raw
2016-02-26	Merge branch 'mg/work-tree-tests'	blob \| diff \| raw
2016-02-26	Merge branch 'jk/more-comments-on-textconv'	blob \| diff \| raw
2016-02-26	Merge branch 'jk/no-diff-emit-common'	blob \| diff \| raw
2016-02-26	Merge branch 'ak/extract-argv0-last-dir-sep'	blob \| diff \| raw
2016-02-24	Merge branch 'jc/am-i-v-fix'	blob \| diff \| raw
2016-02-24	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| diff \| raw
2016-02-22	Merge branch 'js/git-remote-add-url-insteadof-test'	blob \| diff \| raw
2016-02-22	Merge branch 'jk/config-include'	blob \| diff \| raw
2016-02-22	Merge branch 'nd/ita-cleanup' into maint	blob \| diff \| raw
2016-02-17	Merge branch 'jk/rerere-xsnprintf'	blob \| diff \| raw
2016-02-17	Merge branch 'nd/clear-gitenv-upon-use-of-alias'	blob \| diff \| raw
2016-02-10	Merge branch 'wp/sha1-name-negative-match'	blob \| diff \| raw
2016-02-05	Merge branch 'lv/add-doc-working-tree' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'ss/clone-depth-single-doc' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'sg/t6050-failing-editor-test-fix' into...	blob \| diff \| raw
2016-02-05	Merge branch 'ew/for-each-ref-doc' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'ss/user-manual' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'tb/complete-word-diff-regex' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'jk/sanity' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...	blob \| diff \| raw
2016-02-05	Merge branch 'ho/gitweb-squelch-undef-warning' into...	blob \| diff \| raw
2016-02-05	Merge branch 'nd/exclusion-regression-fix' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'ew/send-email-mutt-alias-fix' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'nd/dir-exclude-cleanup' into maint	blob \| diff \| raw
2016-02-05	Merge branch 'nd/stop-setenv-work-tree' into maint	blob \| diff \| raw
2016-02-03	Merge branch 'lv/add-doc-working-tree'	blob \| diff \| raw
2016-02-03	Merge branch 'tb/complete-word-diff-regex'	blob \| diff \| raw
2016-01-29	Merge branch 'jk/sanity'	blob \| diff \| raw
2016-01-26	Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'	blob \| diff \| raw
next