git.oblomov.eu Git - git/history - builtin/merge-ours.c

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-06-18	Junio C Hamano	Merge branch 'km/doc-workflows-typofix'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'rd/diff-options-typofix'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'sb/grep-die-on-unreadable-index'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'nd/repo-clear-keep-the-index'	blob \| commitdiff \| raw
2018-05-23	Junio C Hamano	Merge branch 'tb/test-apfs-utf8-normalization'	blob \| commitdiff \| raw
2018-05-22	Junio C Hamano	Sync with Git 2.15.2	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 'nd/submodule-status-fix'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'ab/git-svn-get-record-typofix'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'sg/doc-gc-quote-mismatch-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'bp/fsmonitor-bufsize-fix'	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-25	Junio C Hamano	Merge branch 'bw/commit-partial-from-subdirectory-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'jk/flockfile-stdio'	blob \| commitdiff \| raw
2018-04-10	Junio C Hamano	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| commitdiff \| raw
2018-04-10	Junio C Hamano	Merge branch 'jk/diff-highlight-graph-fix'	blob \| commitdiff \| raw
2018-04-09	Junio C Hamano	Merge branch 'tg/stash-untracked-with-pathspec-fix'	blob \| commitdiff \| raw
2018-03-29	Junio C Hamano	Merge branch 'jh/partial-clone'	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'sm/mv-dry-run-update' into maint	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 'bp/fsmonitor' 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 'sg/doc-test-must-fail-args' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'nd/ignore-glob-doc-update' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'tz/doc-show-defaults-to-head' into maint	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 'rb/hashmap-h-compilation-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 'bw/oidmap-autoinit' 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 'tg/split-index-fixes' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'mr/packed-ref-store-fix' 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 'ml/filter-branch-portability-fix'	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-21	Junio C Hamano	Merge branch 'jh/fsck-promisors'	blob \| commitdiff \| raw
2018-03-21	Jiang Xin	Merge branch 'master' of https://github.com/Softcatala...	blob \| commitdiff \| raw
2018-03-13	Junio C Hamano	Merge branch 'jt/binsearch-with-fanout' into HEAD	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 'ds/find-unique-abbrev-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 'rs/strbuf-read-file-or-whine'	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 'sm/mv-dry-run-update'	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 'tk/apply-dev-null-verify-name-fix'	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 'jt/binsearch-with-fanout'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'jk/test-hashmap-updates'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'jk/sq-dequote-on-bogus-input'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'bp/fsmonitor'	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 'sg/doc-test-must-fail-args'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'sb/describe-blob'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'rs/check-ignore-multi'	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'	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 'ab/doc-cat-file-e-still-shows-errors...	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/stash-with-pathspec-fix' into maint	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'jk/abort-clone-with-existing-dest' into...	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'jc/merge-symlink-ours-theirs' into maint	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'rs/lose-leak-pending' into maint	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'jm/svn-pushmergeinfo-fix' into maint	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'dk/describe-all-output-fix' into maint	blob \| commitdiff \| raw
2018-02-15	Junio C Hamano	Merge branch 'nd/ignore-glob-doc-update'	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 'ab/wildmatch-tests'	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 'kg/packed-ref-cache-fix'	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 'tz/doc-show-defaults-to-head'	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 'tg/split-index-fixes'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'rs/strbuf-cocci-workaround'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'mr/packed-ref-store-fix'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'cc/sha1-file-name'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'rb/hashmap-h-compilation-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-02-13	Junio C Hamano	Merge branch 'gs/retire-mru'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'ot/mru-on-list'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'jh/partial-clone'	blob \| commitdiff \| raw
2018-02-13	Junio C Hamano	Merge branch 'jh/fsck-promisors'	blob \| commitdiff \| raw
next

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

RSS Atom