Merge branch 'sb/submodule-module-list-pathspec-fix'
[git] / Documentation / merge-config.txt
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-05-06  Junio C HamanoMerge branch 'kn/for-each-tag-branch' into maint
2016-05-03  Junio C HamanoMerge branch 'jk/fix-attribute-macro-in-2.5'
2016-05-02  Junio C HamanoMerge branch 'ad/cygwin-wants-rename' into maint
2016-04-25  Junio C HamanoMerge branch 'jc/rerere-multi'
2016-04-22  Junio C HamanoMerge branch 'ad/cygwin-wants-rename'
2016-04-13  Junio C HamanoMerge branch 'kn/for-each-tag-branch'
2016-04-03  Junio C HamanoMerge branch 'jc/maint-index-pack-keep'
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-14  Junio C HamanoMerge branch 'mg/wt-status-mismarked-i18n'
2016-03-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into...
2016-03-03  Junio C HamanoMerge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf'
2016-02-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match'
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/sanity' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into maint
2016-01-29  Junio C HamanoMerge branch 'jk/sanity'
2016-01-20  Junio C HamanoMerge branch 'ss/clone-depth-single-doc'
2016-01-20  Junio C HamanoMerge branch 'nd/exclusion-regression-fix'
2016-01-20  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20  Junio C HamanoMerge branch 'ew/for-each-ref-doc'
2016-01-20  Junio C HamanoMerge branch 'ss/user-manual'
2016-01-20  Junio C HamanoMerge branch 'nd/ita-cleanup'
2016-01-20  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup'
2016-01-20  Junio C HamanoMerge branch 'jk/pack-revindex'
2016-01-12  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree'
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint
2015-12-28  Junio C HamanoMerge branch 'jk/pending-keep-tag-name'
2015-12-22  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits' into maint
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' into maint
2015-12-15  Junio C HamanoMerge branch 'ls/p4-keep-empty-commits'
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime'
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote' into maint
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote'
2015-12-08  Junio C HamanoMerge branch 'ad/sha1-update-chunked' into maint
2015-12-08  Junio C HamanoMerge branch 'jk/rebase-no-autostash' into maint
2015-12-04  Junio C HamanoMerge branch 'da/difftool' into maint
2015-12-04  Junio C HamanoMerge branch 'ad/sha1-update-chunked'
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05  Junio C HamanoMerge branch 'js/misc-fixes' into maint
2015-11-05  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' into maint
2015-11-05  Junio C HamanoMerge branch 'jk/delete-modechange-conflict' into maint
2015-11-05  Junio C HamanoMerge branch 'sa/send-email-smtp-batch-data-limit'...
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-ff' into maint
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-markup' into maint
2015-11-04  Junio C HamanoMerge branch 'jc/everyday-markup' into maint
2015-11-04  Junio C HamanoMerge branch 'jc/em-dash-in-doc' into maint
2015-11-04  Junio C HamanoMerge branch 'es/worktree-add' into maint
2015-11-03  Junio C HamanoMerge branch 'mk/blame-error-message' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/merge-file-exit-code' into maint
2015-11-03  Junio C HamanoMerge branch 'dt/name-hash-dir-entry-fix' into maint
2015-11-03  Junio C HamanoMerge branch 'nd/gc-auto-background-fix' into maint
2015-11-03  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03  Junio C HamanoMerge branch 'da/difftool'
2015-10-30  Junio C HamanoMerge branch 'jk/merge-file-exit-code'
2015-10-30  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn'
2015-10-30  Junio C HamanoMerge branch 'xf/user-manual-ff'
2015-10-30  Junio C HamanoMerge branch 'mk/blame-error-message'
2015-10-30  Junio C HamanoMerge branch 'js/misc-fixes'
2015-10-30  Junio C HamanoMerge branch 'jk/delete-modechange-conflict'
2015-10-30  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top'
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-29  Junio C HamanoMerge branch 'dt/name-hash-dir-entry-fix'
2015-10-29  Junio C HamanoMerge branch 'tk/sigchain-unnecessary-post-tempfile'
2015-10-29  Junio C HamanoMerge branch 'jc/em-dash-in-doc'
2015-10-29  Junio C HamanoMerge branch 'jc/everyday-markup'
2015-10-29  Junio C HamanoMerge branch 'xf/user-manual-markup'
2015-10-26  Junio C HamanoMerge branch 'es/worktree-add'
2015-10-20  Junio C HamanoMerge branch 'tb/t0027-crlf'
2015-10-20  Junio C HamanoMerge branch 'jc/doc-gc-prune-now' into maint
2015-10-20  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16  Junio C HamanoMerge branch 'jc/doc-gc-prune-now'
2015-10-16  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16  Junio C HamanoMerge branch 'es/worktree-add-cleanup' into maint
2015-10-16  Junio C HamanoMerge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16  Junio C HamanoMerge branch 'jc/fsck-dropped-errors' into maint
2015-10-16  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' into maint
2015-10-16  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint
2015-10-16  Junio C HamanoMerge branch 'pt/pull-builtin' into maint
2015-10-15  Junio C HamanoMerge branch 'tk/doc-interpret-trailers-grammo'
2015-10-15  Junio C HamanoMerge branch 'es/worktree-add-cleanup'
2015-10-15  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn'
next