git.oblomov.eu Git - git/history - git-merge-resolve.sh

2017-10-28	Junio C Hamano	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| commitdiff \| raw
2017-10-28	Junio C Hamano	Merge branch 'sb/rev-parse-show-superproject-root'	blob \| commitdiff \| raw
2017-10-28	Junio C Hamano	Merge branch 'ao/path-use-xmalloc'	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'ma/ts-cleanups' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'ls/travis-scriptify' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jt/fast-export-copy-modify-fix' into...	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'nd/worktree-kill-parse-ref' into maint	blob \| commitdiff \| raw
2017-10-19	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update'	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/qsort-s' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mr/doc-negative-pathspec' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'kd/doc-for-each-ref' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'cc/subprocess-handshake-missing-capabilit...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/system-path-cleanup' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'bb/doc-eol-dirty' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mg/timestamp-t-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/config-lockfile-leak-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'dw/diff-highlight-makefile-fix' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/drop-sha1-entry-pos' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rb/compat-poll-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ar/request-pull-phrasofix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ik/userdiff-html-h-element-fix' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/diff-blob' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/describe-omit-some-refs' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/archive-excluded-directory' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rk/commit-tree-make-F-verbatim' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mh/packed-ref-store-prep' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/strbuf-getwholeline-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'jk/ui-color-always-to-auto-maint' (early...	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'sb/diff-color-move'	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-10-11	Junio C Hamano	Merge branch 'ls/filter-process-delayed'	blob \| commitdiff \| raw
2017-10-09	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-10-08	Jiang Xin	Merge branch 'maint' of git://github.com/git-l10n/git-po	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'rb/compat-poll-fix'	blob \| commitdiff \| raw
2017-10-07	Junio C Hamano	Merge branch 'rs/qsort-s'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'ar/request-pull-phrasofix'	blob \| commitdiff \| raw
2017-10-05	Junio C Hamano	Merge branch 'sb/git-clang-format'	blob \| commitdiff \| raw
2017-10-04	Junio C Hamano	Merge branch 'jk/ui-color-always-to-auto-maint' into...	blob \| commitdiff \| raw
2017-10-03	Junio C Hamano	Merge branch 'bw/git-clang-format'	blob \| commitdiff \| raw
2017-10-03	Junio C Hamano	Merge branch 'mr/doc-negative-pathspec'	blob \| commitdiff \| raw
2017-10-03	Junio C Hamano	Merge branch 'sb/diff-color-move'	blob \| commitdiff \| raw
2017-10-03	Junio C Hamano	Merge branch 'sd/branch-copy'	blob \| commitdiff \| raw
2017-10-03	Junio C Hamano	Merge branch 'js/rebase-i-final'	blob \| commitdiff \| raw
2017-09-29	Junio C Hamano	Merge branch 'jt/fast-export-copy-modify-fix'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'mk/diff-delta-avoid-large-offset'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'mk/diff-delta-uint-may-be-shorter-than...	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'ik/userdiff-html-h-element-fix'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'jk/diff-blob'	blob \| commitdiff \| raw
2017-09-28	Junio C Hamano	Merge branch 'jk/describe-omit-some-refs'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'ls/travis-scriptify'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'bw/git-clang-format'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'rs/archive-excluded-directory'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'kd/doc-for-each-ref'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'cc/subprocess-handshake-missing-capabilities'	blob \| commitdiff \| raw
2017-09-25	Junio C Hamano	Merge branch 'kw/write-index-reduce-alloc'	blob \| commitdiff \| raw
2017-09-22	Junio C Hamano	Sync with 2.13.6	blob \| commitdiff \| raw
2017-09-20	Junio C Hamano	Merge branch 'jk/describe-omit-some-refs' into mk/descr...	blob \| commitdiff \| raw
2017-09-20	Junio C Hamano	Merge branch 'jk/info-alternates-fix-2.11' into jk...	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'rk/commit-tree-make-F-verbatim'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'jk/shortlog-ident-cleanup'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'kw/merge-recursive-cleanup'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'mh/packed-ref-store-prep'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'ma/remove-config-maybe-bool'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'jk/system-path-cleanup'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'bb/doc-eol-dirty'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'ma/split-symref-update-fix'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'mh/notes-cleanup'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'mg/timestamp-t-fix'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'jk/config-lockfile-leak-fix'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'dw/diff-highlight-makefile-fix'	blob \| commitdiff \| raw
2017-09-19	Junio C Hamano	Merge branch 'ti/external-sha1dc'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/apply-epoch'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/drop-sha1-entry-pos'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'nd/worktree-kill-parse-ref'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'ma/up-to-date'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'ma/ts-cleanups'	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jt/doc-pack-objects-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jn/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'bc/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/doc-the-this' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/commit-h-single-parent-cleanup' into...	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'mg/format-ref-doc-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/submodule-parallel-update' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'hv/t5526-andand-chain-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/sha1-file-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum' into maint	blob \| commitdiff \| raw
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom