Merge branch 'jk/git-no-more-argv0-path-munging' into maint
[git] / Documentation / merge-config.txt
2015-05-26  Junio C HamanoMerge branch 'jk/git-no-more-argv0-path-munging' into...
2015-05-13  Junio C HamanoMerge branch 'sb/line-log-plug-pairdiff-leak' into...
2015-05-13  Junio C HamanoMerge branch 'sb/test-bitmap-free-at-end' into maint
2015-05-13  Junio C HamanoMerge branch 'nd/t1509-chroot-test' into maint
2015-05-13  Junio C HamanoMerge branch 'jk/type-from-string-gently' into maint
2015-05-13  Junio C HamanoMerge branch 'ep/fix-test-lib-functions-report' into...
2015-05-13  Junio C HamanoMerge branch 'cn/bom-in-gitignore' into maint
2015-05-13  Junio C HamanoMerge branch 'jk/prune-mtime' into maint
2015-05-13  Junio C HamanoMerge branch 'jk/init-core-worktree-at-root' into maint
2015-05-11  Junio C HamanoSync with 2.3.8
2015-04-28  Junio C HamanoMerge branch 'mh/multimail-renewal'
2015-04-28  Junio C HamanoMerge branch 'mg/show-notes-doc'
2015-04-28  Junio C HamanoMerge branch 'nd/versioncmp-prereleases'
2015-04-28  Junio C HamanoMerge branch 'mg/status-v-v'
2015-04-27  Junio C HamanoSync with 2.3.7
2015-04-21  Junio C HamanoSync with maint
2015-04-21  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-20  Junio C HamanoMerge branch 'ps/grep-help-all-callback-arg'
2015-04-20  Junio C HamanoMerge branch 'tb/connect-ipv6-parse-fix'
2015-04-20  Junio C HamanoMerge branch 'va/fix-git-p4-tests'
2015-04-20  Junio C HamanoMerge branch 'jc/push-cert'
2015-04-20  Junio C HamanoMerge branch 'ma/bash-completion-leaking-x'
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14  Junio C HamanoMerge branch 'jk/colors'
2015-04-14  Junio C HamanoMerge branch 'jk/merge-quiet'
2015-04-14  Junio C HamanoMerge branch 'jk/pack-corruption-post-mortem'
2015-04-14  Junio C HamanoMerge branch 'jc/update-instead-into-void'
2015-04-14  Junio C HamanoMerge branch 'sb/plug-streaming-leak'
2015-04-14  Junio C HamanoMerge branch 'jn/doc-fast-import-no-16-octopus-limit'
2015-04-14  Junio C HamanoMerge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14  Junio C HamanoMerge branch 'pt/enter-repo-comment-fix'
2015-04-14  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix'
2015-04-14  Junio C HamanoMerge branch 'jk/cherry-pick-docfix'
2015-04-14  Junio C HamanoMerge branch 'iu/fix-parse-options-h-comment'
2015-04-14  Junio C HamanoMerge branch 'jg/cguide-we-cannot-count'
2015-04-02  Junio C HamanoMerge branch 'sb/atomic-push'
2015-03-31  Junio C HamanoSync with 2.3.5
2015-03-28  Junio C HamanoSync with maint
2015-03-28  Junio C HamanoMerge branch 'ph/push-doc-cas'
2015-03-28  Junio C HamanoMerge branch 'ss/pull-rebase-preserve'
2015-03-28  Junio C HamanoMerge branch 'jn/doc-api-errors'
2015-03-27  Junio C HamanoSync with maint
2015-03-27  Junio C HamanoMerge branch 'sb/leaks'
2015-03-27  Jiang XinMerge branch 'maint'
2015-03-27  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00...
2015-03-26  Junio C HamanoMerge branch 'jk/test-chain-lint'
2015-03-26  Junio C HamanoMerge branch 'sg/completion-gitcomp-nl-for-refs'
2015-03-26  Junio C HamanoMerge branch 'jc/report-path-error-to-dir'
2015-03-25  Junio C HamanoMerge branch 'nd/doc-git-index-version'
2015-03-25  Junio C HamanoMerge branch 'jk/run-command-capture'
2015-03-25  Junio C HamanoMerge branch 'tg/test-index-v4'
2015-03-25  Junio C HamanoMerge branch 'jk/prune-with-corrupt-refs'
2015-03-25  Junio C HamanoMerge branch 'tg/fix-check-order-with-split-index'
2015-03-25  Junio C HamanoMerge branch 'jk/fetch-pack'
2015-03-25  Junio C HamanoMerge branch 'jk/cleanup-failed-clone'
2015-03-25  Junio C HamanoMerge branch 'jc/submitting-patches-mention-send-email'
2015-03-25  Junio C HamanoMerge branch 'dj/log-graph-with-no-walk'
2015-03-25  Junio C HamanoMerge branch 'kd/rev-list-bisect-first-parent'
2015-03-25  Junio C HamanoMerge branch 'ws/grep-quiet-no-pager'
2015-03-25  Junio C HamanoMerge branch 'jk/simplify-csum-file-sha1fd-check'
2015-03-25  Junio C HamanoMerge branch 'ct/prompt-untracked-fix'
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-23  Junio C HamanoSync with v2.3.4
2015-03-23  Junio C HamanoMerge branch 'js/completion-ctags-pattern-substitution...
2015-03-23  Junio C HamanoMerge branch 'jk/push-config'
2015-03-23  Junio C HamanoMerge branch 'nd/config-doc-camelCase'
2015-03-14  Nguyễn Thái Ngọc Duy*config.txt: stick to camelCase naming convention
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'tc/missing-http-proxyauth'
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25  Junio C HamanoMerge branch 'jk/status-read-branch-name-fix' into...
2015-02-17  Junio C HamanoMerge branch 'jk/status-read-branch-name-fix'
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07  Junio C HamanoMerge branch 'sb/t5400-remove-unused'
2015-01-07  Junio C HamanoMerge branch 'pd/completion-filenames-fix'
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
next