merge-file: ensure that conflict sections match eol style
[git] / Documentation / RelNotes / 1.9.5.txt
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint
2015-12-15  Junio C HamanoMerge branch 'jk/prune-mtime' into maint
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-04  Junio C HamanoMerge branch 'jc/everyday-markup' into maint
2015-11-04  Junio C HamanoMerge branch 'es/worktree-add' into maint
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 'sb/http-flaky-test-fix' into maint
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix'
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into...
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string'
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings'
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-25  Junio C HamanoMerge branch 'dt/notes-multiple'
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools' into maint
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add-cleanup'
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add'
2015-08-03  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools'
2015-07-27  Junio C HamanoMerge branch 'mm/branch-doc-updates' into maint
2015-07-27  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27  Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager...
2015-07-27  Junio C HamanoMerge branch 'jk/fix-refresh-utime' into maint
2015-07-17  Junio C HamanoMerge branch 'es/worktree-add'
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-13  Junio C HamanoMerge branch 'es/worktree-add'
2015-07-13  Junio C HamanoMerge branch 'nd/multiple-work-trees'
2015-07-13  Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager'
2015-07-13  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh'
2015-07-10  Junio C HamanoMerge branch 'jk/fix-refresh-utime'
2015-07-10  Junio C HamanoMerge branch 'mm/branch-doc-updates'
2015-07-01  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24  Junio C HamanoMerge branch 'fk/doc-format-patch-vn'
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-05  Junio C HamanoMerge branch 'jc/gitignore-precedence' into maint
2015-06-05  Junio C HamanoMerge branch 'jk/sha1-file-reduce-useless-warnings...
2015-06-05  Junio C HamanoMerge branch 'jc/plug-fmt-merge-msg-leak' into maint
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix'
2015-05-26  Junio C HamanoMerge branch 'jc/hash-object' into maint
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into...
2015-05-22  Junio C HamanoMerge branch 'lm/squelch-bg-progress'
2015-05-19  Junio C HamanoMerge branch 'jc/gitignore-precedence'
2015-05-13  Junio C HamanoMerge branch 'sb/line-log-plug-pairdiff-leak' into...
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 'jk/prune-mtime' into maint
2015-05-11  Junio C HamanoMerge branch 'oh/fix-config-default-user-name-section...
2015-05-11  Junio C HamanoMerge branch 'jc/hash-object'
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long'
2015-05-11  Junio C HamanoMerge branch 'va/fix-git-p4-tests'
2015-05-11  Junio C HamanoMerge branch 'jc/plug-fmt-merge-msg-leak'
2015-05-11  Junio C HamanoMerge branch 'lm/squelch-bg-progress'
2015-05-11  Junio C HamanoMerge branch 'jk/sha1-file-reduce-useless-warnings'
2015-05-11  Junio C HamanoMerge branch 'nd/multiple-work-trees'
2015-05-06  Junio C HamanoMerge branch 'jk/prune-mtime'
2015-05-06  Junio C HamanoMerge branch 'ep/fix-test-lib-functions-report'
2015-05-06  Junio C HamanoMerge branch 'oh/fix-config-default-user-name-section'
2015-05-06  Junio C HamanoMerge branch 'jk/type-from-string-gently'
2015-05-06  Junio C HamanoMerge branch 'sb/line-log-plug-pairdiff-leak'
2015-04-28  Junio C HamanoMerge branch 'mg/show-notes-doc'
2015-04-27  Junio C HamanoMerge branch 'jc/push-cert' into maint
2015-04-21  Junio C HamanoMerge branch 'jk/colors' into maint
2015-04-21  Junio C HamanoMerge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21  Junio C HamanoMerge branch 'jk/cherry-pick-docfix' into maint
2015-04-21  Junio C HamanoMerge branch 'iu/fix-parse-options-h-comment' into...
2015-04-21  Junio C HamanoMerge branch 'jk/pack-corruption-post-mortem' into...
2015-04-21  Junio C HamanoMerge branch 'jn/doc-fast-import-no-16-octopus-limit...
2015-04-20  Junio C HamanoMerge branch 'va/fix-git-p4-tests'
2015-04-20  Junio C HamanoMerge branch 'jc/push-cert'
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/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 '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-02  Junio C HamanoMerge branch 'sb/atomic-push'
2015-03-28  Junio C HamanoMerge branch 'jn/doc-api-errors'
2015-03-27  Junio C HamanoMerge branch 'jk/tag-h-column-is-a-listing-option'...
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-23  Junio C HamanoMerge branch 'jk/tag-h-column-is-a-listing-option'
2015-03-23  Junio C HamanoMerge branch 'jc/decorate-leaky-separator-color' into...
2015-03-23  Junio C HamanoMerge branch 'km/imap-send-libcurl-options' into maint
2015-03-23  Junio C HamanoMerge branch 'mg/verify-commit' into maint
next