rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / reflog-walk.c
2017-10-23 Sync with 2.14.3
2017-10-23 Merge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-23 Merge branch 'ma/ts-cleanups' into maint
2017-10-23 Merge branch 'jt/fast-export-copy-modify-fix' into...
2017-10-23 Merge branch 'nd/worktree-kill-parse-ref' into maint
2017-10-19 Merge branch 'jc/branch-force-doc-readability-fix'
2017-10-19 Merge branch 'dg/filter-branch-filter-order-doc'
2017-10-19 Merge branch 'jc/fetch-refspec-doc-update'
2017-10-19 Merge branch 'wk/merge-options-gpg-sign-doc'
2017-10-18 Sync with maint
2017-10-18 Merge branch 'rs/qsort-s' into maint
2017-10-18 Merge branch 'mr/doc-negative-pathspec' into maint
2017-10-18 Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...
2017-10-18 Merge branch 'kd/doc-for-each-ref' into maint
2017-10-18 Merge branch 'cc/subprocess-handshake-missing-capabilit...
2017-10-18 Merge branch 'jk/system-path-cleanup' into maint
2017-10-18 Merge branch 'mg/timestamp-t-fix' into maint
2017-10-18 Merge branch 'ma/pkt-line-leakfix' into maint
2017-10-18 Merge branch 'jk/config-lockfile-leak-fix' into maint
2017-10-18 Merge branch 'jk/drop-sha1-entry-pos' into maint
2017-10-18 Merge branch 'rb/compat-poll-fix' into maint
2017-10-18 Merge branch 'ar/request-pull-phrasofix' into maint
2017-10-18 Merge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18 Merge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18 Merge branch 'ik/userdiff-html-h-element-fix' into...
2017-10-18 Merge branch 'jk/diff-blob' into maint
2017-10-18 Merge branch 'jk/describe-omit-some-refs' into maint
2017-10-18 Merge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-18 Merge branch 'rs/archive-excluded-directory' into maint
2017-10-18 Merge branch 'mh/packed-ref-store-prep' into maint
2017-10-18 Merge branch 'rs/strbuf-getwholeline-fix' into maint
2017-10-18 Merge branch 'jk/ref-filter-colors-fix'
2017-10-18 Merge branch 'js/rebase-i-final'
2017-10-17 Merge branch 'jk/ui-color-always-to-auto-maint' (early...
2017-10-17 Merge branch 'sb/diff-color-move'
2017-10-17 Merge branch 'js/rebase-i-final'
2017-10-17 Merge branch 'jc/doc-checkout'
2017-10-16 refs: convert dwim_log to struct object_id
2017-10-11 Merge branch 'ls/filter-process-delayed'
2017-10-11 Merge branch 'tb/complete-describe'
2017-10-11 Merge branch 'rs/rs-mailmap'
2017-10-11 Merge branch 'rs/fsck-null-return-from-lookup'
2017-10-11 Merge branch 'jk/sha1-loose-object-info-fix'
2017-10-11 Merge branch 'hn/string-list-doc'
2017-10-11 Merge branch 'tb/show-trailers-in-ref-filter'
2017-10-11 Merge branch 'jt/oidmap'
2017-10-11 Merge branch 'jr/hash-migration-plan-doc'
2017-10-09 Merge branch 'js/rebase-i-final'
2017-10-08 Merge branch 'maint' of git://github.com/git-l10n/git-po
2017-10-07 Merge branch 'tb/ref-filter-empty-modifier'
2017-10-07 Merge branch 'ks/verify-filename-non-option-error-messa...
2017-10-07 Merge branch 'ks/branch-tweak-error-message-for-extra...
2017-10-07 Merge branch 'jk/ui-color-always-to-auto'
2017-10-07 Merge branch 'ma/builtin-unleak'
2017-10-07 Merge branch 'rb/compat-poll-fix'
2017-10-07 Merge branch 'tg/memfixes'
2017-10-07 Merge branch 'sb/branch-avoid-repeated-strbuf-release'
2017-10-07 Merge branch 'rs/qsort-s'
2017-10-07 Merge branch 'jn/strbuf-doc-re-reuse'
2017-10-07 Merge branch 'tb/delimit-pretty-trailers-args-with...
2017-10-05 Merge branch 'ar/request-pull-phrasofix'
2017-10-05 Merge branch 'rs/run-command-use-alloc-array'
2017-10-05 Merge branch 'sb/git-clang-format'
2017-10-05 Merge branch 'rs/use-free-and-null'
2017-10-05 Merge branch 'rs/tag-null-pointer-arith-fix'
2017-10-05 Merge branch 'rs/cocci-de-paren-call-params'
2017-10-05 Merge branch 'rs/cleanup-strbuf-users'
2017-10-05 Merge branch 'rs/resolve-ref-optional-result'
2017-10-04 Merge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03 Merge branch 'mr/doc-negative-pathspec'
2017-10-03 Merge branch 'sb/diff-color-move'
2017-10-03 Merge branch 'sd/branch-copy'
2017-10-03 Merge branch 'js/rebase-i-final'
2017-10-01 refs: pass NULL to resolve_refdup() if hash is not...
2017-09-29 Merge branch 'jt/fast-export-copy-modify-fix'
2017-09-28 Merge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Merge branch 'mk/diff-delta-avoid-large-offset'
2017-09-28 Merge branch 'mk/diff-delta-uint-may-be-shorter-than...
2017-09-28 Merge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28 Merge branch 'ik/userdiff-html-h-element-fix'
2017-09-28 Merge branch 'jk/diff-blob'
2017-09-28 Merge branch 'jk/describe-omit-some-refs'
2017-09-25 Merge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-25 Merge branch 'rs/archive-excluded-directory'
2017-09-25 Merge branch 'kd/doc-for-each-ref'
2017-09-25 Merge branch 'cc/subprocess-handshake-missing-capabilities'
2017-09-22 Sync with 2.13.6
2017-09-22 Sync with 2.12.5
2017-09-20 Merge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20 Merge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19 Merge branch 'mh/packed-ref-store-prep'
2017-09-19 Merge branch 'jk/system-path-cleanup'
2017-09-19 Merge branch 'ma/split-symref-update-fix'
2017-09-19 Merge branch 'mg/timestamp-t-fix'
2017-09-19 Merge branch 'ma/pkt-line-leakfix'
2017-09-19 Merge branch 'jk/config-lockfile-leak-fix'
2017-09-19 Merge branch 'ti/external-sha1dc'
2017-09-10 Merge branch 'jk/drop-sha1-entry-pos'
2017-09-10 Merge branch 'nd/worktree-kill-parse-ref'
next