Merge branch 'sb/unpack-trees-grammofix' into maint
[git] / resolve-undo.c
2017-01-17  Junio C HamanoMerge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17  Junio C HamanoMerge branch 'ak/lazy-prereq-mktemp' into maint
2017-01-17  Junio C HamanoMerge branch 'nd/qsort-in-merge-recursive' into maint
2017-01-17  Junio C HamanoMerge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17  Junio C HamanoMerge branch 'gv/p4-multi-path-commit-fix' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/difftool-in-subdir' into maint
2017-01-17  Junio C HamanoMerge branch 'jc/push-default-explicit' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/parseopt-usage-msg-opt' into maint
2017-01-17  Junio C HamanoMerge branch 'nd/shallow-fixup' into maint
2017-01-17  Junio C HamanoMerge branch 'jc/pull-rebase-ff' into maint
2017-01-17  Junio C HamanoMerge branch 'js/normalize-path-copy-ceil' into maint
2017-01-17  Junio C HamanoMerge branch 'ak/commit-only-allow-empty' into maint
2017-01-17  Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into maint
2017-01-17  Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'...
2017-01-17  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect' into maint
2017-01-17  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17  Junio C HamanoMerge branch 'da/mergetool-trust-exit-code' into maint
2017-01-17  Junio C HamanoMerge branch 'js/mingw-isatty' into maint
2017-01-17  Junio C HamanoMerge branch 'bb/unicode-9.0' into maint
2016-12-05  Junio C HamanoSync with maint-2.10
2016-11-29  Junio C HamanoMerge branch 'jk/common-main'
2016-11-23  Junio C HamanoMerge branch 'js/rebase-i-commentchar-fix'
2016-11-23  Junio C HamanoMerge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-17  Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused'
2016-11-17  Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param'
2016-11-17  Junio C HamanoMerge branch 'nd/worktree-lock'
2016-11-11  Junio C HamanoMerge branch 'ps/common-info-doc'
2016-11-11  Junio C HamanoMerge branch 'ls/filter-process'
2016-11-11  Junio C HamanoMerge branch 'as/merge-attr-sleep'
2016-11-11  Junio C HamanoMerge branch 'ls/macos-update'
2016-11-10  Junio C HamanoMerge branch 'jk/filter-process-fix'
2016-11-10  Junio C HamanoMerge branch 'ls/filter-process'
2016-11-02  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00...
2016-11-01  Junio C HamanoMerge branch 'rs/cocci'
2016-10-31  Junio C HamanoMerge branch 'nd/test-helpers'
2016-10-31  Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31  Junio C HamanoMerge branch 'ak/sh-setup-dot-source-i18n-fix'
2016-10-31  Junio C HamanoMerge branch 'rs/commit-pptr-simplify'
2016-10-31  Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-31  Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix'
2016-10-31  Junio C HamanoMerge branch 'jk/common-main'
2016-10-31  Junio C HamanoMerge branch 'ls/filter-process'
2016-10-28  Junio C HamanoSync with 2.10.2
2016-10-27  Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation'
2016-10-27  Junio C HamanoMerge branch 'rs/ring-buffer-wraparound'
2016-10-27  Junio C HamanoMerge branch 'sb/submodule-ignore-trailing-slash'
2016-10-26  Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2016-10-26  Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration'
2016-10-26  Junio C HamanoMerge branch 'jk/tap-verbose-fix'
2016-10-26  Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address'
2016-10-26  Junio C HamanoMerge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-26  Junio C HamanoMerge branch 'jk/diff-submodule-diff-inline'
2016-10-26  Junio C HamanoMerge branch 'tg/add-chmod+x-fix'
2016-10-26  Junio C HamanoMerge branch 'bw/submodule-branch-dot-doc'
2016-10-26  Junio C HamanoMerge branch 'pb/test-parse-options-expect'
2016-10-26  Junio C HamanoMerge branch 'jk/tighten-alloc'
2016-10-26  Junio C HamanoMerge branch 'jk/fetch-quick-tag-following'
2016-10-26  Junio C HamanoMerge branch 'jk/merge-base-fork-point-without-reflog'
2016-10-26  Junio C HamanoMerge branch 'ab/gitweb-abbrev-links'
2016-10-26  Junio C HamanoMerge branch 'dk/worktree-dup-checkout-with-bare-is-ok'
2016-10-26  Junio C HamanoMerge branch 'jc/cocci-xstrdup-or-null'
2016-10-26  Junio C HamanoMerge branch 'mm/credential-libsecret'
2016-10-26  Junio C HamanoMerge branch 'bw/ls-files-recurse-submodules'
2016-10-26  Junio C HamanoMerge branch 'js/libify-require-clean-work-tree'
2016-10-26  Junio C HamanoMerge branch 'jc/ws-error-highlight'
2016-10-26  Junio C HamanoMerge branch 'jc/diff-unique-abbrev-comments'
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-10-17  Junio C HamanoSync with maint
2016-10-17  Junio C HamanoMerge branch 'sb/submodule-config-doc-drop-path'
2016-10-17  Junio C HamanoMerge branch 'rs/pretty-format-color-doc-fix'
2016-10-17  Junio C HamanoMerge branch 'js/reset-usage'
2016-10-17  Junio C HamanoMerge branch 'rs/cocci'
2016-10-17  Junio C HamanoMerge branch 'js/regexec-buf'
2016-10-17  Junio C HamanoMerge branch 'jk/ref-symlink-loop'
2016-10-17  Junio C HamanoMerge branch 'nd/commit-p-doc'
2016-10-17  Junio C HamanoMerge branch 'jk/clone-copy-alternates-fix'
2016-10-17  Junio C HamanoMerge branch 'dt/http-empty-auth'
2016-10-11  Junio C HamanoSync with maint
2016-10-10  Junio C HamanoMerge branch 'jc/blame-reverse'
2016-10-10  Junio C HamanoMerge branch 'nd/shallow-deepen'
2016-10-10  Junio C HamanoMerge branch 'cp/completion-negative-refs'
2016-10-10  Junio C HamanoMerge branch 'dp/autoconf-curl-ssl'
2016-10-10  Junio C HamanoMerge branch 'ak/curl-imap-send-explicit-scheme'
2016-10-10  Junio C HamanoMerge branch 'jk/pack-objects-optim-mru'
2016-10-06  Junio C HamanoMerge branch 'sg/ref-filter-parse-optim'
2016-10-06  Junio C HamanoMerge branch 'rs/cocci'
2016-10-06  Junio C HamanoMerge branch 'rs/c-auto-resets-attributes'
2016-10-06  Junio C HamanoMerge branch 'ps/http-gssapi-cred-delegation'
2016-10-06  Junio C HamanoMerge branch 'jk/graph-padding-fix'
2016-10-06  Junio C HamanoMerge branch 'vn/revision-shorthand-for-side-branch...
2016-10-06  Junio C HamanoMerge branch 'jc/blame-abbrev'
2016-10-03  Junio C HamanoSync with 2.10.1
2016-10-03  Junio C HamanoMerge branch 'pb/rev-list-reverse-with-count'
2016-10-03  Junio C HamanoMerge branch 'kd/mailinfo-quoted-string'
2016-10-03  Junio C HamanoMerge branch 'mh/diff-indent-heuristic'
2016-10-03  Junio C HamanoMerge branch 'dt/mailinfo'
2016-10-03  Junio C HamanoMerge branch 'rs/git-gui-use-modern-git-merge-syntax'
2016-10-03  Junio C HamanoMerge branch 'jc/verify-loose-object-header'
2016-10-03  Junio C HamanoMerge branch 'nd/init-core-worktree-in-multi-worktree...
2016-10-03  Junio C HamanoMerge branch 'rs/copy-array'
next