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

2016-04-14	Junio C Hamano	Merge branch 'sb/submodule-helper-clone-regression...	blob \| commitdiff \| raw
2016-03-21	Junio C Hamano	Merge branch 'mm/doc-hooks-linkgit-fix' into maint	blob \| commitdiff \| raw
2016-03-21	Junio C Hamano	Merge branch 'es/st-add4-gcc-4.2-workaround' into maint	blob \| commitdiff \| raw
2016-03-21	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2016-03-17	Junio C Hamano	Merge branch 'maint-2.5' into maint-2.6	blob \| commitdiff \| raw
2016-03-16	Junio C Hamano	Merge branch 'jk/path-name-safety-2.5' into jk/path...	blob \| commitdiff \| raw
2016-03-14	Junio C Hamano	Merge branch 'mg/wt-status-mismarked-i18n'	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'ma/update-hooks-sample-typofix' into...	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'ak/git-strip-extension-from-dashed-comman...	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'ak/extract-argv0-last-dir-sep' into maint	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'jk/grep-binary-workaround-in-test' into...	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'mm/push-simple-doc' into maint	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'jk/more-comments-on-textconv' into maint	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'jk/no-diff-emit-common' into maint	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'jc/am-i-v-fix' into maint	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'nd/dwim-wildcards-as-pathspecs' into...	blob \| commitdiff \| raw
2016-03-10	Junio C Hamano	Merge branch 'mg/work-tree-tests' into maint	blob \| commitdiff \| raw
2016-03-04	Junio C Hamano	Merge branch 'nd/clear-gitenv-upon-use-of-alias'	blob \| commitdiff \| raw
2016-03-04	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'ma/update-hooks-sample-typofix'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'jk/grep-binary-workaround-in-test'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'mm/push-simple-doc'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'mg/work-tree-tests'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'jk/more-comments-on-textconv'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'jk/no-diff-emit-common'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'ak/git-strip-extension-from-dashed-command'	blob \| commitdiff \| raw
2016-02-26	Junio C Hamano	Merge branch 'ak/extract-argv0-last-dir-sep'	blob \| commitdiff \| raw
2016-02-24	Junio C Hamano	Merge branch 'jc/am-i-v-fix'	blob \| commitdiff \| raw
2016-02-24	Junio C Hamano	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| commitdiff \| raw
2016-02-22	Junio C Hamano	Merge branch 'js/git-remote-add-url-insteadof-test'	blob \| commitdiff \| raw
2016-02-22	Junio C Hamano	Merge branch 'jk/config-include'	blob \| commitdiff \| raw
2016-02-22	Junio C Hamano	Merge branch 'nd/ita-cleanup' into maint	blob \| commitdiff \| raw
2016-02-17	Junio C Hamano	Merge branch 'jk/rerere-xsnprintf'	blob \| commitdiff \| raw
2016-02-17	Junio C Hamano	Merge branch 'nd/clear-gitenv-upon-use-of-alias'	blob \| commitdiff \| raw
2016-02-17	Junio C Hamano	Merge branch 'nd/do-not-move-worktree-manually' into...	blob \| commitdiff \| raw
2016-02-10	Junio C Hamano	Merge branch 'wp/sha1-name-negative-match'	blob \| commitdiff \| raw
2016-02-10	Junio C Hamano	Merge branch 'nd/do-not-move-worktree-manually'	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'lv/add-doc-working-tree' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'ss/clone-depth-single-doc' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'sg/t6050-failing-editor-test-fix' into...	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'ew/for-each-ref-doc' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'ss/user-manual' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'tb/complete-word-diff-regex' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'jk/sanity' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'ho/gitweb-squelch-undef-warning' into...	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'nd/exclusion-regression-fix' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'ew/send-email-mutt-alias-fix' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'nd/dir-exclude-cleanup' into maint	blob \| commitdiff \| raw
2016-02-05	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree' into maint	blob \| commitdiff \| raw
2016-02-03	Junio C Hamano	Merge branch 'lv/add-doc-working-tree'	blob \| commitdiff \| raw
2016-02-03	Junio C Hamano	Merge branch 'tb/complete-word-diff-regex'	blob \| commitdiff \| raw
2016-01-29	Junio C Hamano	Merge branch 'jk/sanity'	blob \| commitdiff \| raw
2016-01-26	Junio C Hamano	Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'tg/grep-no-index-fallback'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'ho/gitweb-squelch-undef-warning'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'ss/clone-depth-single-doc'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'nd/exclusion-regression-fix'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'sg/t6050-failing-editor-test-fix'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'ew/for-each-ref-doc'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'ew/send-email-mutt-alias-fix'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'ss/user-manual'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'nd/clear-gitenv-upon-use-of-alias'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'nd/ita-cleanup'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'nd/dir-exclude-cleanup'	blob \| commitdiff \| raw
2016-01-20	Junio C Hamano	Merge branch 'jk/pack-revindex'	blob \| commitdiff \| raw
2016-01-12	Junio C Hamano	Merge branch 'vl/grep-configurable-threads'	blob \| commitdiff \| raw
2016-01-12	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree'	blob \| commitdiff \| raw
2016-01-04	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name' into maint	blob \| commitdiff \| raw
2016-01-04	Junio C Hamano	Merge branch 'jk/symbolic-ref-maint' into maint	blob \| commitdiff \| raw
2016-01-04	Junio C Hamano	Merge branch 'sg/completion-no-column' into maint	blob \| commitdiff \| raw
2015-12-28	Junio C Hamano	Merge branch 'jk/pending-keep-tag-name'	blob \| commitdiff \| raw
2015-12-28	Junio C Hamano	Merge branch 'jk/symbolic-ref-maint'	blob \| commitdiff \| raw
2015-12-22	Junio C Hamano	Merge branch 'nd/stop-setenv-work-tree' into nd/clear...	blob \| commitdiff \| raw \| diff to current
2015-12-21	Junio C Hamano	Merge branch 'sg/completion-no-column'	blob \| commitdiff \| raw
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2015-12-15	Junio C Hamano	Merge branch 'ep/ident-with-getaddrinfo' into maint	blob \| commitdiff \| raw
2015-12-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits' into maint	blob \| commitdiff \| raw
2015-12-15	Junio C Hamano	Merge branch 'ep/ident-with-getaddrinfo'	blob \| commitdiff \| raw
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime' into maint	blob \| commitdiff \| raw
2015-12-15	Junio C Hamano	Merge branch 'ls/p4-keep-empty-commits'	blob \| commitdiff \| raw
2015-12-15	Junio C Hamano	Merge branch 'jk/prune-mtime'	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote' into maint	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'sb/doc-submodule-sync-recursive' into...	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'nd/doc-check-ref-format-typo' into maint	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'rs/show-branch-argv-array' into maint	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'rs/pop-commit' into maint	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'as/subtree-with-spaces' into maint	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'jk/test-lint-forbid-when-finished-in...	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'sb/doc-submodule-sync-recursive'	blob \| commitdiff \| raw
2015-12-11	Junio C Hamano	Merge branch 'cb/t3404-shellquote'	blob \| commitdiff \| raw
2015-12-11	Jiang Xin	Merge branch 'master' of git://github.com/git-l10n...	blob \| commitdiff \| raw
2015-12-10	Junio C Hamano	Merge branch 'nd/doc-check-ref-format-typo'	blob \| commitdiff \| raw
2015-12-08	Junio C Hamano	Merge branch 'ep/ident-with-getaddrinfo'	blob \| commitdiff \| raw
2015-12-08	Junio C Hamano	Merge branch 'ad/sha1-update-chunked' into maint	blob \| commitdiff \| raw
2015-12-08	Junio C Hamano	Merge branch 'jk/interpret-trailers-outside-a-repositor...	blob \| commitdiff \| raw
2015-12-08	Junio C Hamano	Merge branch 'jk/rebase-no-autostash' into maint	blob \| commitdiff \| raw
next

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

RSS Atom