git.osdn.net Git - git-core/git.git/history

[git-core/git.git] / git-merge-one-file.sh

2016-03-17	Junio C Hamano	Merge branch 'maint-2.5' into maint-2.6	blob \| commitdiff
2016-01-04	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name' into maint	blob \| commitdiff
2016-01-04	Junio C Hamano	Merge branch 'jk/symbolic-ref-maint' into maint	blob \| commitdiff
2016-01-04	Junio C Hamano	Merge branch 'sg/completion-no-column' into maint	blob \| commitdiff
2015-12-15	Junio C Hamano	Merge branch 'ep/ident-with-getaddrinfo' into maint	blob \| commitdiff
2015-12-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits' into maint	blob \| commitdiff
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime' into maint	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote' into maint	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'sb/doc-submodule-sync-recursive' into...	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'nd/doc-check-ref-format-typo' into maint	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'rs/show-branch-argv-array' into maint	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'rs/pop-commit' into maint	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'as/subtree-with-spaces' into maint	blob \| commitdiff
2015-12-11	Junio C Hamano	Merge branch 'jk/test-lint-forbid-when-finished-in...	blob \| commitdiff
2015-12-08	Junio C Hamano	Merge branch 'ad/sha1-update-chunked' into maint	blob \| commitdiff
2015-12-08	Junio C Hamano	Merge branch 'jk/interpret-trailers-outside-a-repositor...	blob \| commitdiff
2015-12-08	Junio C Hamano	Merge branch 'jk/rebase-no-autostash' into maint	blob \| commitdiff
2015-12-04	Junio C Hamano	Merge branch 'da/difftool' into maint	blob \| commitdiff
2015-12-04	Junio C Hamano	Merge branch 'dk/gc-idx-wo-pack' into maint	blob \| commitdiff
2015-12-01	Jeff King	Merge branch 'eg/p4-submit-catch-failure' into maint	blob \| commitdiff
2015-12-01	Jeff King	Merge branch 'ld/p4-detached-head' into maint	blob \| commitdiff
2015-12-01	Jeff King	Merge branch 'pt/http-socks-proxy' into maint	blob \| commitdiff
2015-12-01	Jeff King	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| commitdiff
2015-11-05	Junio C Hamano	Merge branch 'rs/daemon-plug-child-leak' into maint	blob \| commitdiff
2015-11-05	Junio C Hamano	Merge branch 'rs/wt-status-detached-branch-fix' into...	blob \| commitdiff
2015-11-05	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff
2015-11-05	Junio C Hamano	Merge branch 'js/misc-fixes' into maint	blob \| commitdiff
2015-11-05	Junio C Hamano	Merge branch 'jc/add-u-A-default-to-top' into maint	blob \| commitdiff
2015-11-05	Junio C Hamano	Merge branch 'jk/delete-modechange-conflict' into maint	blob \| commitdiff
2015-10-26	Jeff King	merge: detect delete/modechange conflict	blob \| commitdiff
2015-10-16	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| commitdiff \| diff to current
2015-09-14	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'mp/t7060-diff-index-test'	blob \| commitdiff \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'gb/apply-comment-typofix'	blob \| commitdiff \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'ee/clean-test-fixes' into maint	blob \| commitdiff \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'sg/t3020-typofix' into maint	blob \| commitdiff \| diff to current
2015-09-02	Junio C Hamano	Merge branch 'ee/clean-test-fixes'	blob \| commitdiff \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/reflog-typofix-in-error'	blob \| commitdiff \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/read-tree-usage-string'	blob \| commitdiff \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/pack-objects-usage-strings'	blob \| commitdiff \| diff to current
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	blob \| commitdiff \| diff to current
2015-07-15	Junio C Hamano	Merge branch 'fk/doc-format-patch-vn' into maint	blob \| commitdiff \| diff to current
2015-06-24	Junio C Hamano	Merge branch 'fk/doc-format-patch-vn'	blob \| commitdiff \| diff to current
2015-06-16	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| commitdiff \| diff to current
2015-06-01	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix'	blob \| commitdiff \| diff to current
2015-05-26	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long' into...	blob \| commitdiff \| diff to current
2015-05-13	Junio C Hamano	Merge branch 'ep/fix-test-lib-functions-report' into...	blob \| commitdiff \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long'	blob \| commitdiff \| diff to current
2015-05-06	Junio C Hamano	Merge branch 'ep/fix-test-lib-functions-report'	blob \| commitdiff \| diff to current
2015-04-28	Junio C Hamano	Merge branch 'mg/show-notes-doc'	blob \| commitdiff \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jz/gitweb-conf-doc-fix' into maint	blob \| commitdiff \| diff to current
2015-04-19	Junio C Hamano	Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| diff to current
2015-04-14	Junio C Hamano	Merge branch 'sb/plug-streaming-leak'	blob \| commitdiff \| diff to current
2015-04-14	Junio C Hamano	Merge branch 'jz/gitweb-conf-doc-fix'	blob \| commitdiff \| diff to current
2015-03-24	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'tc/missing-http-proxyauth'	blob \| commitdiff \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/status-read-branch-name-fix' into...	blob \| commitdiff \| diff to current
2015-02-17	Junio C Hamano	Merge branch 'jk/status-read-branch-name-fix'	blob \| commitdiff \| diff to current
2015-02-17	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date' into...	blob \| commitdiff \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'sb/t5400-remove-unused'	blob \| commitdiff \| diff to current
2015-01-07	Junio C Hamano	Merge branch 'pd/completion-filenames-fix'	blob \| commitdiff \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date'	blob \| commitdiff \| diff to current
2014-11-18	Junio C Hamano	Merge branch 'jc/doc-commit-only'	blob \| commitdiff \| diff to current
2014-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| diff to current
2014-10-29	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| commitdiff \| diff to current
2014-10-14	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| commitdiff \| diff to current
2014-09-30	Junio C Hamano	Merge branch 'sb/merge-recursive-copy-paste-fix'	blob \| commitdiff \| diff to current
2014-09-26	Junio C Hamano	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| commitdiff \| diff to current
2014-08-10	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| diff to current
2014-06-27	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| diff to current
2014-06-26	Junio C Hamano	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| commitdiff \| diff to current
2014-06-26	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| diff to current
2014-04-09	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| commitdiff \| diff to current
2014-04-09	Junio C Hamano	Merge commit 'doc/http-backend: missing accent grave...	blob \| commitdiff \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	blob \| commitdiff \| diff to current
2014-03-31	Junio C Hamano	Merge branch 'wt/doc-submodule-name-path-confusion-1'	blob \| commitdiff \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| commitdiff \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| commitdiff \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/config-path-include-fix' into maint	blob \| commitdiff \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'nd/sha1-file-delta-stack-leakage-fix'	blob \| commitdiff \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	blob \| commitdiff \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree'	blob \| commitdiff \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/hold-diff-remove-q-synonym-for-no...	blob \| commitdiff \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/core-checkstat-2.0'	blob \| commitdiff \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/push-2.0-default-to-simple'	blob \| commitdiff \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'bs/stdio-undef-before-redef'	blob \| commitdiff \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'jk/config-path-include-fix'	blob \| commitdiff \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'jc/revision-range-unpeel' into maint	blob \| commitdiff \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'jc/maint-pull-docfix' into maint	blob \| commitdiff \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jc/revision-range-unpeel'	blob \| commitdiff \| diff to current
2014-01-27	Junio C Hamano	Merge branch 'jc/maint-pull-docfix'	blob \| commitdiff \| diff to current
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| diff to current
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| diff to current
2014-01-14	Junio C Hamano	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| commitdiff \| diff to current
next

Mirror of official git.git repository

RSS Atom

About OSDN

Find Software

Develop Software

Help