]> git.ipfire.org Git - thirdparty/git.git/history - resolve-undo.c
Sync with 2.16.6
[thirdparty/git.git] / resolve-undo.c
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint
2018-03-21  Junio C HamanoMerge branch 'dp/merge-strategy-doc-fix'
2018-03-08  Junio C HamanoMerge branch 'mk/doc-pretty-fill'
2018-02-28  Junio C HamanoMerge branch 'tz/do-not-clean-spec-file'
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix'
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix'
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning'
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup'
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix'
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-28  Junio C HamanoMerge branch 'sr/http-sslverify-config-doc'
2017-12-27  Junio C HamanoMerge branch 'es/clone-shared-worktree'
2017-12-27  Junio C HamanoMerge branch 'jk/cvsimport-quoting'
2017-12-27  Junio C HamanoMerge branch 'rs/am-builtin-leakfix'
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-11-06  Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-23  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-19  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-18  Junio C HamanoMerge branch 'ma/pkt-line-leakfix' 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 'aw/gc-lockfile-fscanf-fix' into maint
2017-09-28  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-25  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22  Junio C HamanoSync with 2.10.5
2017-09-19  Junio C HamanoMerge branch 'ma/pkt-line-leakfix'
2017-09-10  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10  Junio C HamanoMerge branch 'rj/add-chmod-error-message' into maint
2017-09-10  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t4062-obsd' into maint
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-23  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix' into...
2017-08-23  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22  Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-11  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix'
2017-08-04  Junio C HamanoMerge branch 'ah/patch-id-doc'
2017-07-31  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30  Junio C HamanoMerge tag 'v2.10.4' into maint-2.11
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-21  Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture' into maint
2017-07-12  Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture'
2017-07-12  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-10  Junio C HamanoMerge branch 'jc/utf8-fprintf' into maint
2017-07-10  Junio C HamanoMerge branch 'js/fsck-name-object' into maint
2017-07-10  Junio C HamanoMerge branch 'mb/reword-autocomplete-message' into...
2017-07-10  Junio C HamanoMerge branch 'ks/t7508-indent-fix' into maint
2017-07-10  Junio C HamanoMerge branch 'sb/t4005-modernize' into maint
2017-07-10  Junio C HamanoMerge branch 'jc/pack-bitmap-unaligned' into maint
2017-07-10  Junio C HamanoMerge branch 'rs/pretty-add-again' into maint
2017-07-07  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-07  Junio C HamanoMerge branch 'jc/utf8-fprintf'
2017-07-07  Junio C HamanoMerge branch 'js/fsck-name-object'
2017-06-30  Junio C HamanoMerge branch 'jc/pack-bitmap-unaligned'
2017-06-26  Junio C HamanoMerge branch 'mb/reword-autocomplete-message'
2017-06-26  Junio C HamanoMerge branch 'ks/t7508-indent-fix'
2017-06-24  Junio C HamanoMerge branch 'km/test-mailinfo-b-failure' into maint
2017-06-24  Junio C HamanoMerge branch 'jc/diff-tree-stale-comment' into maint
2017-06-24  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2017-06-24  Junio C HamanoMerge branch 'rs/pretty-add-again'
2017-06-24  Junio C HamanoMerge branch 'ab/wildmatch-glob-slash-test'
2017-06-22  Junio C HamanoMerge branch 'km/test-mailinfo-b-failure'
2017-06-22  Junio C HamanoMerge branch 'sb/t4005-modernize'
2017-06-13  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety'
2017-06-13  Junio C HamanoMerge branch 'jc/diff-tree-stale-comment'
2017-06-13  Junio C HamanoMerge branch 'ab/t3070-test-dedup' into maint
2017-06-05  Junio C HamanoMerge branch 'ah/doc-filter-branch-export-env' into...
2017-06-05  Junio C HamanoMerge branch 'sd/t3200-typofix' into maint
2017-06-05  Junio C HamanoMerge branch 'sg/core-filemode-doc-typofix' into maint
2017-06-05  Junio C HamanoMerge branch 'js/bs-is-a-dir-sep-on-windows' into maint
2017-06-04  Junio C HamanoMerge branch 'jk/ignore-broken-tags-when-ignoring-missi...
2017-06-04  Junio C HamanoMerge branch 'jc/read-tree-empty-with-m' into maint
2017-06-04  Junio C HamanoMerge branch 'ab/t3070-test-dedup'
2017-06-04  Junio C HamanoMerge branch 'ah/doc-filter-branch-export-env'
2017-06-04  Junio C HamanoMerge branch 'sd/t3200-typofix'
2017-06-02  Junio C HamanoMerge branch 'js/bs-is-a-dir-sep-on-windows'
2017-05-29  Junio C HamanoMerge branch 'jk/ignore-broken-tags-when-ignoring-missi...
2017-05-29  Junio C HamanoMerge branch 'sg/core-filemode-doc-typofix'
2017-05-29  Junio C HamanoMerge branch 'jc/read-tree-empty-with-m'
2017-05-29  Junio C HamanoMerge branch 'jk/diff-submodule-diff-inline'
2017-05-05  Junio C HamanoMerge branch 'maint-2.10' into maint-2.11
2017-05-01  Junio C HamanoMerge branch 'jk/submodule-init-segv-fix'
2017-05-01  Junio C HamanoMerge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-24  Junio C HamanoMerge branch 'dt/xgethostname-nul-termination'
2017-04-24  Junio C HamanoMerge branch 'xy/format-patch-base'
next