diff: introduce diff.wsErrorHighlight option
[git] / notes-merge.c
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-02  Junio C HamanoMerge branch 'jk/log-missing-default-HEAD'
2015-09-01  Junio C HamanoMerge branch 'dt/commit-preserve-base-index-upon-opport...
2015-09-01  Junio C HamanoMerge branch 'rs/archive-zip-many'
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-09-01  Junio C HamanoMerge branch 'nd/fixup-linked-gitdir'
2015-08-31  Junio C HamanoMerge branch 'sg/describe-contains'
2015-08-31  Junio C HamanoMerge branch 'db/push-sign-if-asked'
2015-08-31  Junio C HamanoMerge branch 'jk/notes-merge-config'
2015-08-31  Junio C HamanoMerge branch 'jc/am-state-fix'
2015-08-31  Junio C HamanoMerge branch 'jk/fix-alias-pager-config-key-warnings'
2015-08-31  Junio C HamanoMerge branch 'jk/rev-list-has-no-notes'
2015-08-31  Junio C HamanoMerge branch 'hv/submodule-config'
2015-08-31  Junio C HamanoMerge branch 'sg/config-name-only'
2015-08-28  Junio C HamanoSync with 2.5.1
2015-08-28  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
2015-08-28  Junio C HamanoMerge branch 'dt/untracked-subdir'
2015-08-26  Junio C HamanoMerge branch 'sg/help-group'
2015-08-26  Junio C HamanoMerge branch 'sg/wt-status-header-inclusion'
2015-08-26  Junio C HamanoMerge branch 'as/docfix-reflog-expire-unreachable'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-26  Junio C HamanoMerge branch 'jc/calloc-pathspec'
2015-08-26  Junio C HamanoMerge branch 'dt/untracked-sparse'
2015-08-26  Junio C HamanoMerge branch 'pt/am-builtin'
2015-08-26  Junio C HamanoMerge branch 'pt/am-builtin-abort-fix'
2015-08-26  Junio C HamanoMerge branch 'po/po-readme'
2015-08-26  Junio C HamanoMerge branch 'jv/send-email-selective-smtp-auth'
2015-08-26  Junio C HamanoMerge branch 'ep/http-configure-ssl-version'
2015-08-26  Junio C HamanoMerge branch 'ss/fix-config-fd-leak'
2015-08-25  Junio C HamanoSync with maint
2015-08-25  Junio C HamanoMerge branch 'jk/guess-repo-name-regression-fix' into...
2015-08-25  Junio C HamanoMerge branch 'jk/test-with-x' into maint
2015-08-25  Junio C HamanoMerge branch 'sb/check-return-from-read-ref' into maint
2015-08-25  Junio C HamanoMerge branch 'cb/open-noatime-clear-errno'
2015-08-25  Junio C HamanoMerge branch 'mh/tempfile'
2015-08-25  Junio C HamanoMerge branch 'pt/am-builtin-options'
2015-08-25  Junio C HamanoMerge branch 'dt/refs-pseudo'
2015-08-25  Junio C HamanoMerge branch 'dt/notes-multiple'
2015-08-25  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2015-08-25  Junio C HamanoMerge branch 'jk/long-error-messages'
2015-08-25  Junio C HamanoMerge branch 'ee/clean-remove-dirs'
2015-08-25  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19  Junio C HamanoSync with maint
2015-08-19  Junio C HamanoMerge branch 'tb/complete-rebase-i-edit-todo'
2015-08-19  Junio C HamanoMerge branch 'jk/git-path'
2015-08-19  Junio C HamanoMerge branch 'jc/finalize-temp-file'
2015-08-19  Junio C HamanoMerge branch 'ps/guess-repo-name-at-root'
2015-08-19  Junio C HamanoMerge branch 'jk/guess-repo-name-regression-fix'
2015-08-19  Junio C HamanoMerge branch 'jk/test-with-x'
2015-08-19  Junio C HamanoMerge branch 'sb/check-return-from-read-ref'
2015-08-19  Junio C HamanoMerge branch 'ta/docfix-index-format-tech' into maint
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 'cb/uname-in-untracked' into maint
2015-08-19  Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint
2015-08-19  Junio C HamanoMerge branch 'db/send-pack-user-signingkey' into maint
2015-08-19  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-19  Junio C HamanoMerge branch 'da/subtree-date-confusion' into maint
2015-08-17  Junio C HamanoMerge branch 'ta/docfix-index-format-tech'
2015-08-17  Junio C HamanoMerge branch 'mh/get-remote-group-fix'
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-12  Junio C HamanoMerge branch 'dt/unpack-trees-cache-tree-revalidate'
2015-08-12  Junio C HamanoMerge branch 'dt/reflog-tests'
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add-cleanup'
2015-08-12  Junio C HamanoMerge branch 'es/worktree-add'
2015-08-10  Jeff Kingprefer git_pathdup to git_path in some possibly-dangero...
2015-08-03  Junio C HamanoMerge branch 'es/doc-clean-outdated-tools'
2015-08-03  Junio C HamanoMerge branch 'jk/refspec-parse-wildcard'
2015-08-03  Junio C HamanoMerge branch 'da/subtree-date-confusion'
2015-08-03  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03  Junio C HamanoMerge branch 'db/send-pack-user-signingkey'
2015-08-03  Junio C HamanoMerge branch 'as/sparse-checkout-removal'
2015-08-03  Junio C HamanoMerge branch 'sg/bash-prompt-untracked-optim'
2015-08-03  Junio C HamanoMerge branch 'cb/uname-in-untracked'
2015-08-03  Junio C HamanoMerge branch 'se/doc-checkout-ours-theirs'
2015-08-03  Junio C HamanoMerge branch 'kn/tag-doc-fix'
2015-08-03  Junio C HamanoMerge branch 'mh/fast-import-get-mark'
2015-08-03  Junio C HamanoMerge branch 'jc/commit-slab'
2015-08-03  Junio C HamanoMerge branch 'nd/export-worktree'
2015-08-03  Junio C HamanoMerge branch 'bc/gpg-verify-raw'
2015-08-03  Junio C HamanoMerge branch 'pt/am-foreign'
2015-08-03  Junio C HamanoSync with 2.4.8
2015-08-03  Junio C HamanoMerge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-08-03  Junio C HamanoMerge branch 'sg/completion-commit-cleanup' into maint
2015-08-03  Junio C HamanoMerge branch 'pt/am-abort-fix' into maint
2015-08-03  Junio C HamanoMerge branch 'sg/commit-cleanup-scissors' into maint
2015-07-27  Junio C HamanoSync with 2.4.7
2015-07-27  Junio C HamanoMerge branch 'jk/pretty-encoding-doc' into maint
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/rev-list-no-bitmap-while-pruning'...
2015-07-27  Junio C HamanoMerge branch 'rh/test-color-avoid-terminfo-in-original...
next