builtin-am: implement --3way
[git] / fsck.c
2015-08-03  Junio C HamanoMerge branch 'jk/date-mode-format'
2015-08-03  Junio C HamanoMerge branch 'pt/am-tests'
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 'ib/scripted-parse-opt-better-hint-string'
2015-08-03  Junio C HamanoMerge branch 'mh/fast-import-optimize-current-from'
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 'gr/rebase-i-drop-warn'
2015-08-03  Junio C HamanoMerge branch 'jc/commit-slab'
2015-08-03  Junio C HamanoMerge branch 'dt/log-follow-config'
2015-08-03  Junio C HamanoMerge branch 'gp/status-rebase-i-info'
2015-08-03  Junio C HamanoMerge branch 'jk/cat-file-batch-all'
2015-08-03  Junio C HamanoMerge branch 'js/fsck-opt'
2015-08-03  Junio C HamanoMerge branch 'mh/init-delete-refs-api'
2015-08-03  Junio C HamanoMerge branch 'pt/pull-builtin'
2015-08-03  Junio C HamanoMerge branch 'jk/pkt-log-pack'
2015-08-03  Junio C HamanoMerge branch 'mr/rebase-i-customize-insn-sheet'
2015-08-03  Junio C HamanoMerge branch 'rl/send-email-aliases'
2015-08-03  Junio C HamanoMerge branch 'kb/i18n-doc'
2015-08-03  Junio C HamanoMerge branch 'nd/export-worktree'
2015-08-03  Junio C HamanoMerge branch 'ee/clean-remove-dirs'
2015-08-03  Junio C HamanoMerge branch 'cb/parse-magnitude'
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 HamanoMerge branch 'kn/for-each-ref'
2015-08-03  Junio C HamanoMerge branch 'mh/replace-refs'
2015-07-27  Junio C HamanoMerge branch 'jk/pretty-encoding-doc' into maint
2015-07-27  Junio C HamanoMerge branch 'tb/checkout-doc' into maint
2015-07-27  Junio C HamanoMerge branch 'ls/hint-rev-list-count' 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 'jk/fix-refresh-utime' into maint
2015-07-27  Junio C HamanoMerge branch 'cb/rebase-am-exit-code' into maint
2015-07-27  Junio C HamanoMerge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-21  Junio C HamanoMerge branch 'tf/gitweb-typofix'
2015-07-17  Junio C HamanoMerge branch 'jk/still-interesting'
2015-07-17  Junio C HamanoMerge branch 'es/worktree-add'
2015-07-15  Junio C HamanoSync with 2.4.6
2015-07-15  Junio C HamanoMerge branch 'jc/diff-ws-error-highlight'
2015-07-15  Junio C HamanoMerge branch 'mm/describe-doc' into maint
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro' into...
2015-07-15  Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround' into...
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-15  Junio C HamanoMerge branch 'me/fetch-into-shallow-safety' into maint
2015-07-15  Junio C HamanoMerge branch 'af/tcsh-completion-noclobber' into maint
2015-07-15  Junio C HamanoMerge branch 'pa/auto-gc-mac-osx' into maint
2015-07-15  Junio C HamanoMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks...
2015-07-13  Junio C HamanoMerge tag 'l10n-2.5.0-rnd1' of git://github.com/git...
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 'ss/clone-guess-dir-name-simplify'
2015-07-13  Junio C HamanoMerge branch 'kb/config-unmap-before-renaming'
2015-07-13  Junio C HamanoMerge branch 'mh/strbuf-read-file-returns-ssize-t'
2015-07-13  Junio C HamanoMerge branch 'jc/unexport-git-pager-in-use-in-pager'
2015-07-13  Junio C HamanoMerge branch 'kb/use-nsec-doc'
2015-07-13  Junio C HamanoMerge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-07-13  Junio C HamanoMerge branch 'et/http-proxyauth'
2015-07-13  Junio C HamanoMerge branch 'jc/fsck-retire-require-eoh'
2015-07-10  Junio C HamanoMerge branch 'cb/rebase-am-exit-code'
2015-07-10  Junio C HamanoMerge branch 'jk/fix-refresh-utime'
2015-07-10  Junio C HamanoMerge branch 'mm/branch-doc-updates'
2015-07-10  Junio C HamanoMerge branch 'jk/rev-list-no-bitmap-while-pruning'
2015-07-10  Junio C HamanoMerge branch 'jk/pretty-encoding-doc'
2015-07-01  Junio C HamanoMerge branch 'me/fetch-into-shallow-safety'
2015-07-01  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-07-01  Junio C HamanoMerge branch 'mm/describe-doc'
2015-06-28  Junio C Hamanofsck: it is OK for a tag and a commit to lack the body
2015-06-26  Junio C HamanoMerge branch 'jk/stash-require-clean-index' into maint
2015-06-26  Junio C HamanoMerge branch 'cb/array-size' into maint
2015-06-25  Junio C HamanoMerge branch 'cn/cvsimport-perl-update'
2015-06-25  Junio C HamanoMerge branch 'cb/array-size'
2015-06-25  Junio C HamanoMerge branch 'sg/merge-summary-config' into maint
2015-06-25  Junio C HamanoMerge branch 'jk/make-fix-dependencies' into maint
2015-06-25  Junio C HamanoMerge branch 'sb/pack-protocol-mention-smart-http'...
2015-06-25  Junio C HamanoMerge branch 'jk/die-on-bogus-worktree-late' into maint
2015-06-25  Junio C HamanoMerge branch 'jk/color-diff-plain-is-context' into...
2015-06-25  Junio C HamanoMerge branch 'jk/diagnose-config-mmap-failure' into...
2015-06-25  Junio C HamanoMerge branch 'jk/squelch-missing-link-warning-for-unrea...
2015-06-25  Junio C HamanoMerge branch 'mm/rebase-i-post-rewrite-exec' into maint
2015-06-24  Junio C HamanoMerge branch 'jk/stash-require-clean-index'
2015-06-24  Junio C HamanoMerge branch 'pa/auto-gc-mac-osx'
2015-06-24  Junio C HamanoMerge branch 'fk/doc-format-patch-vn'
2015-06-24  Junio C HamanoMerge branch 'sg/commit-cleanup-scissors'
2015-06-24  Junio C HamanoMerge branch 'jk/index-pack-reduce-recheck'
2015-06-24  Junio C HamanoMerge branch 'af/tcsh-completion-noclobber'
2015-06-24  Junio C HamanoMerge branch 'sg/completion-commit-cleanup'
2015-06-24  Junio C HamanoMerge branch 'pt/am-abort-fix'
2015-06-24  Junio C HamanoMerge branch 'es/utf8-stupid-compiler-workaround'
2015-06-24  Junio C HamanoMerge branch 'jc/ll-merge-expose-path'
2015-06-24  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro'
2015-06-24  Junio C HamanoMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks'
2015-06-24  Junio C HamanoMerge branch 'jc/apply-reject-noop-hunk'
2015-06-23  Johannes Schindelinfsck: git receive-pack: support excluding objects from...
2015-06-23  Johannes Schindelinfsck: allow upgrading fsck warnings to errors
2015-06-23  Johannes Schindelinfsck: optionally ignore specific fsck issues completely
next