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

2014-03-14	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree'	blob \| commitdiff \| raw
2014-03-07	Junio C Hamano	Merge branch 'jc/hold-diff-remove-q-synonym-for-no...	blob \| commitdiff \| raw
2014-03-07	Junio C Hamano	Merge branch 'jc/core-checkstat-2.0'	blob \| commitdiff \| raw
2014-03-07	Junio C Hamano	Merge branch 'jc/add-2.0-ignore-removal'	blob \| commitdiff \| raw
2014-03-07	Junio C Hamano	Merge branch 'jn/add-2.0-u-A-sans-pathspec'	blob \| commitdiff \| raw
2014-03-07	Junio C Hamano	Merge branch 'jc/push-2.0-default-to-simple'	blob \| commitdiff \| raw
2014-02-27	Junio C Hamano	Merge branch 'bs/stdio-undef-before-redef'	blob \| commitdiff \| raw
2014-02-27	Junio C Hamano	Merge branch 'jk/config-path-include-fix'	blob \| commitdiff \| raw
2014-02-13	Junio C Hamano	Merge branch 'jc/revision-range-unpeel' into maint	blob \| commitdiff \| raw
2014-02-05	Junio C Hamano	Merge branch 'jc/maint-pull-docfix' into maint	blob \| commitdiff \| raw
2014-01-27	Junio C Hamano	Merge branch 'jc/revision-range-unpeel'	blob \| commitdiff \| raw
2014-01-27	Junio C Hamano	Merge branch 'jc/maint-pull-docfix'	blob \| commitdiff \| raw
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw
2014-01-14	Junio C Hamano	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| commitdiff \| raw \| diff to current
2014-01-13	Junio C Hamano	Merge branch 'jk/t5531-prepare-to-default-to-non-matching'	blob \| commitdiff \| raw
2013-12-17	Junio C Hamano	Merge branch 'jk/two-way-merge-corner-case-fix' into...	blob \| commitdiff \| raw
2013-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2013-12-09	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2013-12-05	Junio C Hamano	Merge branch 'jk/two-way-merge-corner-case-fix'	blob \| commitdiff \| raw
2013-12-05	Junio C Hamano	Merge branch 'jk/replace-perl-in-built-scripts'	blob \| commitdiff \| raw
2013-11-07	Junio C Hamano	Merge branch 'vd/doc-unpack-objects' into maint	blob \| commitdiff \| raw
2013-11-07	Junio C Hamano	Merge branch 'hn/log-graph-color-octopus' into maint	blob \| commitdiff \| raw
2013-11-07	Junio C Hamano	Merge branch 'jc/revision-range-unpeel' into maint	blob \| commitdiff \| raw
2013-11-04	Junio C Hamano	Merge branch 'vd/doc-unpack-objects'	blob \| commitdiff \| raw
2013-11-04	Junio C Hamano	Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'jk/refs-c-squelch-gcc'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'jk/date-c-double-semicolon'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'nd/gc-lock-against-each-other'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'hn/log-graph-color-octopus'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'sg/t3600-nul-sha1-fix'	blob \| commitdiff \| raw
2013-10-28	Junio C Hamano	Merge branch 'ew/keepalive'	blob \| commitdiff \| raw
2013-10-28	Junio C Hamano	Merge branch 'jc/revision-range-unpeel'	blob \| commitdiff \| raw
2013-10-28	Junio C Hamano	Merge branch 'jk/diff-algo' into maint	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'jh/checkout-auto-tracking' into maint	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'mg/more-textconv'	blob \| commitdiff \| raw
2013-10-23	Junio C Hamano	Merge branch 'jc/pack-objects'	blob \| commitdiff \| raw
2013-10-18	Junio C Hamano	Merge branch 'jc/reflog-doc'	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'bc/http-backend-allow-405' into maint	blob \| commitdiff \| raw
2013-10-17	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix' into maint	blob \| commitdiff \| raw
2013-10-14	Jonathan Nieder	Merge branch 'rj/highlight-test-hang'	blob \| commitdiff \| raw
2013-10-14	Jonathan Nieder	Merge branch 'nv/doc-config-signingkey'	blob \| commitdiff \| raw
2013-10-14	Jonathan Nieder	Merge branch 'nd/clone-local-with-colon'	blob \| commitdiff \| raw
2013-10-14	Jonathan Nieder	Merge branch 'jk/diff-algo'	blob \| commitdiff \| raw
2013-10-08	Jonathan Nieder	Merge branch 'tz/credential-netrc'	blob \| commitdiff \| raw
2013-09-26	Jonathan Nieder	Merge branch 'mm/rebase-continue-freebsd-WB' into maint	blob \| commitdiff \| raw
2013-09-26	Jonathan Nieder	Merge branch 'js/xread-in-full' into maint	blob \| commitdiff \| raw
2013-09-20	Junio C Hamano	Merge branch 'mm/rebase-continue-freebsd-WB'	blob \| commitdiff \| raw
2013-09-20	Junio C Hamano	Merge branch 'jh/checkout-auto-tracking'	blob \| commitdiff \| raw
2013-09-20	Junio C Hamano	Merge branch 'bc/http-backend-allow-405'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jl/some-submodule-config-are-not-boolean...	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'jc/pager-configuration-doc'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'mm/fast-import-feature-doc'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'js/xread-in-full'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/diff-filter-negation'	blob \| commitdiff \| raw
2013-09-05	Junio C Hamano	Merge branch 'maint-1.8.2' into maint-1.8.3	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jl/some-submodule-config-are-not-boolean'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'nd/gc-lock-against-each-other'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'tr/fd-gotcha-fixes'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'bc/unuse-packfile'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jc/check-x-z'	blob \| commitdiff \| raw
2013-09-03	Junio C Hamano	Merge branch 'maint-1.8.2' into maint-1.8.3	blob \| commitdiff \| raw
2013-08-05	Junio C Hamano	Merge branch 'dn/test-reject-utf-16'	blob \| commitdiff \| raw
2013-08-01	Junio C Hamano	Merge branch 'lf/echo-n-is-not-portable'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'rr/rebase-autostash'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'rj/commit-slab-fix'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'jk/commit-how-to-abort-cherry-pick'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'ds/doc-two-kinds-of-tags'	blob \| commitdiff \| raw
2013-07-30	Junio C Hamano	Merge branch 'jk/capabilities-doc'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'rj/sparse'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'ml/avoid-using-grep-on-crlf-files'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'sb/misc-fixes'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'tr/line-log'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'jk/t0008-sigpipe-fix'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'db/show-ref-head'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'tr/protect-low-3-fds'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'sb/parse-object-buffer-eaten'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'dw/request-pull-diag'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'tr/fd-gotcha-fixes'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'mm/color-auto-default'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'dk/maint-t5150-dirname' into maint	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'dk/version-gen-gitdir' into maint	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'nk/config-local-doc' into maint	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'kb/diff-blob-blob-doc' into maint	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'mm/merge-in-dirty-worktree-doc' into...	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'mh/maint-lockfile-overflow' into maint	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Merge branch 'jc/maint-diff-core-safecrlf' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'rr/name-rev-stdin-doc' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'ft/diff-rename-default-score-is-half...	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'jc/t1512-fix' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'vl/typofix' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'wk/doc-git-has-grown' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'mm/push-force-is-dangerous' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'jk/apache-test-for-2.4' into maint	blob \| commitdiff \| raw
2013-07-19	Junio C Hamano	Merge branch 'tr/test-commit-only-on-orphan' into maint	blob \| commitdiff \| raw
next

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

RSS Atom