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

2020-07-31	Junio C Hamano	Merge branch 'jb/doc-packfile-name' into master	blob \| commitdiff \| raw
2020-07-20	Junio C Hamano	Merge https://github.com/prati0100/git-gui into master	blob \| commitdiff \| raw
2020-05-21	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'dl/wrapper-fix-indentation'	blob \| commitdiff \| raw
2020-03-19	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2019-11-04	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2019-09-18	Junio C Hamano	Merge branch 'master' of https://github.com/prati0100...	blob \| commitdiff \| raw
2019-09-17	Junio C Hamano	Merge gitk to pick up emergency build fix	blob \| commitdiff \| raw
2019-09-16	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2019-08-07	Junio C Hamano	Merge branch 'py/call-do-quit-before-exit' of github...	blob \| commitdiff \| raw
2019-03-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2019-02-05	Junio C Hamano	Merge branch 'cc/test-ref-store-typofix'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw
2018-10-31	Junio C Hamano	Adjust for 2.19.x series	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t7501-thinkofix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t0020-conversion-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t4051-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'js/larger-timestamps'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'sb/pull-rebase-submodule'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'js/typofixes'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sb/histogram-less-memory'	blob \| commitdiff \| raw
2018-07-24	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	blob \| commitdiff \| raw
2018-06-28	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'ks/branch-set-upstream'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'mw/doc-merge-enumfix'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| commitdiff \| raw
2018-05-22	Junio C Hamano	Sync with Git 2.13.7	blob \| commitdiff \| raw
2018-05-22	Jeff King	Merge branch 'jk/submodule-name-verify-fix' into jk...	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'ab/git-svn-get-record-typofix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'es/fread-reads-dir-autoconf-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'js/t5404-path-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'mn/send-email-credential-doc'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'ak/bisect-doc-typofix'	blob \| commitdiff \| raw
2018-04-10	Junio C Hamano	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'gs/test-unset-xdg-cache-home' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'sb/status-doc-fix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'bc/doc-interpret-trailers-grammofix'...	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'jc/mailinfo-cleanup-fix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'cl/t9001-cleanup' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'jt/fsck-code-cleanup' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'sg/travis-build-during-script-phase'...	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'dp/merge-strategy-doc-fix'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'ks/t3200-typofix'	blob \| commitdiff \| raw
2018-03-08	Junio C Hamano	Merge branch 'mk/doc-pretty-fill'	blob \| commitdiff \| raw
2018-03-08	Junio C Hamano	Merge branch 'ds/mark-parents-uninteresting-optim'	blob \| commitdiff \| raw
2018-03-08	Junio C Hamano	Merge branch 'sg/travis-build-during-script-phase'	blob \| commitdiff \| raw
2018-03-06	Junio C Hamano	Merge branch 'xz/send-email-batch-size'	blob \| commitdiff \| raw
2018-03-06	Junio C Hamano	Merge branch 'cb/ttk-style' of git-gui into cb/git...	blob \| commitdiff \| raw
2018-03-02	Junio C Hamano	Merge branch 'bb/ssh-key-files' of git-gui into bb...	blob \| commitdiff \| raw
2018-03-02	Junio C Hamano	Merge branch 'bp/bind-kp-enter' of git-gui into bp...	blob \| commitdiff \| raw
2018-02-28	Junio C Hamano	Merge branch 'tz/do-not-clean-spec-file'	blob \| commitdiff \| raw
2018-02-28	Junio C Hamano	Merge branch 'gs/test-unset-xdg-cache-home'	blob \| commitdiff \| raw
2018-02-28	Junio C Hamano	Merge branch 'sb/status-doc-fix'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'nd/ita-wt-renames-in-status' into maint	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'bc/doc-interpret-trailers-grammofix'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'bp/name-hash-dirname-fix'	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'as/read-tree-prefix-doc-fix' into maint	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'tg/reset-hard-show-head-with-pretty'	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'sb/pull-rebase-submodule'	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'jt/fsck-code-cleanup'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'jc/mailinfo-cleanup-fix'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'cl/t9001-cleanup'	blob \| commitdiff \| raw
2018-01-23	Junio C Hamano	Merge branch 'as/read-tree-prefix-doc-fix'	blob \| commitdiff \| raw
2018-01-23	Junio C Hamano	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| commitdiff \| raw
2018-01-23	Junio C Hamano	Merge branch 'nd/ita-wt-renames-in-status'	blob \| commitdiff \| raw
2018-01-11	Junio C Hamano	Merge branch 'js/test-with-ws-in-path'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'jk/doc-diff-options'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'sg/travis-check-untracked'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'js/test-with-ws-in-path'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'sg/travis-skip-identical-test'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'sg/travis-fixes'	blob \| commitdiff \| raw
2018-01-09	Junio C Hamano	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| commitdiff \| raw
2018-01-05	Junio C Hamano	Merge branch 'jh/memihash-opt'	blob \| commitdiff \| raw
2017-12-28	Junio C Hamano	Merge branch 'sr/http-sslverify-config-doc'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'sg/travis-fixes'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'es/clone-shared-worktree'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'jk/cvsimport-quoting'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'rs/strbuf-read-once-reset-length'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'rs/fmt-merge-msg-string-leak-fix'	blob \| commitdiff \| raw
2017-12-27	Junio C Hamano	Merge branch 'rs/am-builtin-leakfix'	blob \| commitdiff \| raw
2017-12-19	Junio C Hamano	Merge branch 'sg/setup-doc-update'	blob \| commitdiff \| raw
2017-12-19	Junio C Hamano	Merge branch 'bw/submodule-config-cleanup'	blob \| commitdiff \| raw
2017-12-19	Junio C Hamano	Merge branch 'bw/pathspec-match-submodule-boundary'	blob \| commitdiff \| raw
2017-12-13	Junio C Hamano	Merge branch 'ks/doc-checkout-previous'	blob \| commitdiff \| raw
2017-12-13	Junio C Hamano	Merge branch 'jc/receive-pack-hook-doc'	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'sp/doc-info-attributes'	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'rd/doc-notes-prune-fix'	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'rd/man-reflog-add-n'	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'rd/man-prune-progress'	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'tz/branch-doc-remove-set-upstream'	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'sb/submodule-recursive-checkout-detach...	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'jc/merge-base-fork-point-doc' into maint	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'tz/notes-error-to-stderr' into maint	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'rs/apply-inaccurate-eof-with-incomplete...	blob \| commitdiff \| raw
2017-12-06	Junio C Hamano	Merge branch 'tz/complete-branch-copy' into maint	blob \| commitdiff \| raw
next

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

RSS Atom