merge-file: ensure that conflict sections match eol style
[git] / quote.c
2016-01-04  Junio C HamanoMerge branch 'jk/pending-keep-tag-name' into maint
2016-01-04  Junio C HamanoMerge branch 'jk/symbolic-ref-maint' into maint
2016-01-04  Junio C HamanoMerge branch 'sg/completion-no-column' into maint
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-11  Junio C HamanoMerge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11  Junio C HamanoMerge branch 'cb/t3404-shellquote' into maint
2015-12-11  Junio C HamanoMerge branch 'sb/doc-submodule-sync-recursive' into...
2015-12-11  Junio C HamanoMerge branch 'nd/doc-check-ref-format-typo' into maint
2015-12-11  Junio C HamanoMerge branch 'rs/show-branch-argv-array' into maint
2015-12-11  Junio C HamanoMerge branch 'rs/pop-commit' into maint
2015-12-11  Junio C HamanoMerge branch 'as/subtree-with-spaces' into maint
2015-12-11  Junio C HamanoMerge branch 'jk/test-lint-forbid-when-finished-in...
2015-12-08  Junio C HamanoMerge branch 'ad/sha1-update-chunked' into maint
2015-12-08  Junio C HamanoMerge branch 'jk/interpret-trailers-outside-a-repositor...
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 'dk/gc-idx-wo-pack' into maint
2015-12-01  Jeff KingMerge branch 'ld/p4-detached-head' into maint
2015-12-01  Jeff KingMerge branch 'pt/http-socks-proxy' into maint
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05  Junio C HamanoMerge branch 'rs/daemon-plug-child-leak' into maint
2015-11-05  Junio C HamanoMerge branch 'rs/wt-status-detached-branch-fix' into...
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 'js/imap-send-curl-compilation-fix' into...
2015-11-05  Junio C HamanoMerge branch 'rp/link-curl-before-ssl' into maint
2015-11-05  Junio C HamanoMerge branch 'nd/clone-linked-checkout' 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 'jc/am-3-fallback-regression-fix' into...
2015-11-03  Junio C HamanoMerge branch 'rt/placeholder-in-usage' into maint
2015-11-03  Junio C HamanoMerge branch 'dt/t7063-fix-flaky-test' into maint
2015-11-03  Junio C HamanoMerge branch 'mk/submodule-gitdir-path' into maint
2015-11-03  Junio C HamanoMerge branch 'nd/gc-auto-background-fix' into maint
2015-11-03  Junio C HamanoMerge branch 'ls/p4-translation-failure' into maint
2015-11-03  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint
2015-11-03  Junio C HamanoMerge branch 'js/clone-dissociate' into maint
2015-11-03  Junio C HamanoMerge branch 'ld/p4-import-labels' into maint
2015-11-03  Junio C HamanoMerge branch 'tk/stripspace' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/repository-extension' into maint
2015-10-20  Junio C HamanoMerge branch 'js/gc-with-stale-symref' into maint
2015-10-20  Junio C HamanoMerge branch 'rd/test-path-utils' into maint
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-19  Junio C HamanoMerge branch 'maint' of git://github.com/git-l10n/git...
2015-10-16  Junio C HamanoMerge branch 'cc/quote-comments' 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 'jk/asciidoctor-section-heading-markup...
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-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint
2015-10-07  Christian Couderquote: move comment before sq_quote_buf()
2015-10-07  Christian Couderquote: fix broken sq_quote_buf() related comment
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 HamanoSync with 2.2.3
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-04  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings...
2015-09-04  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' into...
2015-09-04  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno' into maint
2015-09-02  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
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-31  Junio C HamanoMerge branch 'sg/describe-contains'
2015-08-31  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings'
2015-08-28  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-25  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno'
2015-08-25  Junio C HamanoMerge branch 'dt/notes-multiple'
2015-08-25  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19  Junio C HamanoMerge branch 'jc/finalize-temp-file'
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19  Junio C HamanoMerge branch 'kn/tag-doc-fix' into maint
2015-08-19  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools' into maint
2015-08-19  Junio C HamanoMerge branch 'nd/export-worktree' into maint
2015-08-19  Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs' into maint
2015-08-19  Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint
2015-08-19  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
next