]> git.ipfire.org Git - thirdparty/git.git/history - ll-merge.c
Sync with 2.16.6
[thirdparty/git.git] / ll-merge.c
2017-11-21  Junio C HamanoMerge branch 'bw/rebase-i-ignored-submodule-fix' into...
2017-11-15  Junio C HamanoMerge branch 'jk/info-alternates-fix'
2017-11-15  Junio C HamanoMerge branch 'cb/t4201-robustify'
2017-11-15  Junio C HamanoMerge branch 'ab/pcre-v2'
2017-11-15  Junio C HamanoMerge branch 'ad/rebase-i-serie-typofix'
2017-11-15  Junio C HamanoMerge branch 'bw/rebase-i-ignored-submodule-fix'
2017-11-15  Junio C HamanoMerge branch 'ao/merge-verbosity-getenv-just-once'
2017-11-15  Junio C HamanoMerge branch 'mh/avoid-rewriting-packed-refs'
2017-11-15  Junio C HamanoMerge branch 'rs/imap-send-next-arg-fix'
2017-11-15  Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix' into...
2017-11-15  Junio C HamanoMerge branch 'js/early-config' into maint
2017-11-15  Junio C HamanoMerge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-15  Junio C HamanoMerge branch 'jc/check-ref-format-oor' into maint
2017-11-15  Junio C HamanoMerge branch 'jk/rebase-i-exec-gitdir-fix' into maint
2017-11-15  Junio C HamanoMerge branch 'bw/grep-recurse-submodules' into maint
2017-11-15  Junio C HamanoMerge branch 'js/submodule-in-excluded' into maint
2017-11-15  Junio C HamanoMerge branch 'ao/check-resolve-ref-unsafe-result' into...
2017-11-15  Junio C HamanoMerge branch 'kd/auto-col-with-pager-fix' into maint
2017-11-15  Junio C HamanoMerge branch 'sg/travis-fixes' into maint
2017-11-09  Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix'
2017-11-09  Junio C HamanoMerge branch 'js/early-config'
2017-11-09  Junio C HamanoMerge branch 'sg/travis-fixes'
2017-11-09  Junio C HamanoMerge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-11-06  Junio C HamanoMerge branch 'jc/check-ref-format-oor'
2017-11-06  Junio C HamanoMerge branch 'jk/revision-pruning-optim'
2017-11-06  Junio C HamanoMerge branch 'ds/find-unique-abbrev-optim'
2017-11-06  Junio C HamanoMerge branch 'pc/submodule-helper'
2017-11-06  Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2017-11-06  Junio C HamanoMerge branch 'jk/rebase-i-exec-gitdir-fix'
2017-11-06  Junio C HamanoMerge branch 'bw/grep-recurse-submodules'
2017-11-06  Junio C HamanoMerge branch 'js/submodule-in-excluded'
2017-11-06  Junio C HamanoMerge branch 'ao/check-resolve-ref-unsafe-result'
2017-11-06  Junio C HamanoMerge branch 'kd/auto-col-with-pager-fix'
2017-11-06  Junio C HamanoMerge branch 'jc/no-cmd-as-subroutine'
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-28  Junio C HamanoMerge branch 'sb/rev-parse-show-superproject-root'
2017-10-28  Junio C HamanoMerge branch 'ao/path-use-xmalloc'
2017-10-28  Junio C HamanoMerge branch 'np/config-path-doc'
2017-10-26  Junio C HamanoMerge branch 'mh/ref-locking-fix'
2017-10-23  Junio C HamanoMerge branch 'jk/info-alternates-fix' into maint
2017-10-23  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-23  Junio C HamanoMerge branch 'jk/write-in-full-fix' into maint
2017-10-23  Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix' into...
2017-10-23  Junio C HamanoMerge branch 'nd/worktree-kill-parse-ref' into maint
2017-10-19  Junio C HamanoMerge branch 'jc/branch-force-doc-readability-fix'
2017-10-19  Junio C HamanoMerge branch 'dg/filter-branch-filter-order-doc'
2017-10-19  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-19  Junio C HamanoMerge branch 'wk/merge-options-gpg-sign-doc'
2017-10-18  Junio C HamanoSync with maint
2017-10-18  Junio C HamanoMerge branch 'rs/qsort-s' into maint
2017-10-18  Junio C HamanoMerge branch 'mr/doc-negative-pathspec' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix...
2017-10-18  Junio C HamanoMerge branch 'jk/system-path-cleanup' into maint
2017-10-18  Junio C HamanoMerge branch 'mg/timestamp-t-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'ma/pkt-line-leakfix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/config-lockfile-leak-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos' into maint
2017-10-18  Junio C HamanoMerge branch 'rb/compat-poll-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'ar/request-pull-phrasofix' into maint
2017-10-18  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix' into...
2017-10-18  Junio C HamanoMerge branch 'jk/diff-blob' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into maint
2017-10-18  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'mh/packed-ref-store-prep' into maint
2017-10-18  Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/ref-filter-colors-fix'
2017-10-18  Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17  Junio C HamanoMerge branch 'sb/diff-color-move'
2017-10-17  Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17  Junio C HamanoMerge branch 'jc/doc-checkout'
2017-10-11  Junio C HamanoMerge branch 'ls/filter-process-delayed'
2017-10-11  Junio C HamanoMerge branch 'tb/complete-describe'
2017-10-11  Junio C HamanoMerge branch 'rs/rs-mailmap'
2017-10-11  Junio C HamanoMerge branch 'rs/fsck-null-return-from-lookup'
2017-10-11  Junio C HamanoMerge branch 'jk/sha1-loose-object-info-fix'
2017-10-09  Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-08  Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2017-10-07  Junio C HamanoMerge branch 'tb/ref-filter-empty-modifier'
2017-10-07  Junio C HamanoMerge branch 'ks/verify-filename-non-option-error-messa...
2017-10-07  Junio C HamanoMerge branch 'ks/branch-tweak-error-message-for-extra...
2017-10-07  Junio C HamanoMerge branch 'ma/builtin-unleak'
2017-10-07  Junio C HamanoMerge branch 'rb/compat-poll-fix'
2017-10-07  Junio C HamanoMerge branch 'tg/memfixes'
2017-10-07  Junio C HamanoMerge branch 'sb/branch-avoid-repeated-strbuf-release'
2017-10-07  Junio C HamanoMerge branch 'rs/qsort-s'
2017-10-07  Junio C HamanoMerge branch 'jn/strbuf-doc-re-reuse'
2017-10-05  Junio C HamanoMerge branch 'ar/request-pull-phrasofix'
2017-10-05  Junio C HamanoMerge branch 'rs/run-command-use-alloc-array'
2017-10-05  Junio C HamanoMerge branch 'sb/git-clang-format'
2017-10-05  Junio C HamanoMerge branch 'rs/tag-null-pointer-arith-fix'
2017-10-05  Junio C HamanoMerge branch 'rs/cocci-de-paren-call-params'
2017-10-05  Junio C HamanoMerge branch 'rs/resolve-ref-optional-result'
2017-10-05  Junio C HamanoMerge branch 'er/fast-import-dump-refs-on-checkpoint'
2017-10-04  Junio C HamanoMerge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03  Junio C HamanoMerge branch 'bw/git-clang-format'
2017-10-03  Junio C HamanoMerge branch 'ad/doc-markup-fix'
2017-10-03  Junio C HamanoMerge branch 'mh/mmap-packed-refs'
next