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

2019-01-18	Junio C Hamano	Merge branch 'js/gc-repack-close-before-remove'	blob \| commitdiff \| raw
2019-01-18	Junio C Hamano	Merge branch 'en/show-ref-doc-fix'	blob \| commitdiff \| raw
2019-01-18	Junio C Hamano	Merge branch 'ot/ref-filter-object-info'	blob \| commitdiff \| raw
2019-01-18	Junio C Hamano	Merge branch 'jk/dev-build-format-security'	blob \| commitdiff \| raw
2019-01-18	Junio C Hamano	Merge branch 'es/doc-worktree-guessremote-config'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'km/rebase-doc-typofix'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'md/exclude-promisor-objects-fix-cleanup'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'sb/diff-color-moved-config-option-fixup'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'hn/highlight-sideband-keywords'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'cb/t5004-empty-tar-archive-fix'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'cb/openbsd-allows-reading-directory'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'hb/t0061-dot-in-path-fix'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'nd/checkout-noisy'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'ab/commit-graph-progress-fix'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'md/list-lazy-objects-fix'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'mk/http-backend-kill-children-before...	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'sd/stash-wo-user-name'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'sg/clone-initial-fetch-configuration'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'nd/checkout-dwim-fix'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'ab/push-dwim-dst'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'en/fast-export-import'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'nd/the-index'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'jk/loose-object-cache'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'fc/http-version'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'en/merge-path-collision'	blob \| commitdiff \| raw
2019-01-04	Junio C Hamano	Merge branch 'nd/i18n'	blob \| commitdiff \| raw
2019-01-03	Junio C Hamano	Merge branch 'sg/test-bash-version-fix'	blob \| commitdiff \| raw
2018-12-15	Junio C Hamano	Merge branch 'jc/run-command-report-exec-failure-fix...	blob \| commitdiff \| raw
2018-12-15	Junio C Hamano	Merge branch 'js/help-commands-verbose-by-default-fix...	blob \| commitdiff \| raw
2018-12-15	Junio C Hamano	Merge branch 'nd/show-gitcomp-compilation-fix' into...	blob \| commitdiff \| raw
2018-12-15	Junio C Hamano	Merge branch 'js/mailinfo-format-flowed-fix' into maint	blob \| commitdiff \| raw
2018-12-15	Junio C Hamano	Merge branch 'ds/hash-independent-tests-fix' into maint	blob \| commitdiff \| raw
2018-12-04	Junio C Hamano	Merge branch 'en/rebase-consistency'	blob \| commitdiff \| raw
2018-12-01	Junio C Hamano	Merge branch 'ss/msvc-strcasecmp'	blob \| commitdiff \| raw
2018-12-01	Junio C Hamano	Merge branch 'ab/push-example-in-doc'	blob \| commitdiff \| raw
2018-12-01	Junio C Hamano	Merge branch 'rt/rebase-in-c-message-fix'	blob \| commitdiff \| raw
2018-12-01	Junio C Hamano	Merge branch 'sg/daemon-test-signal-fix'	blob \| commitdiff \| raw
2018-12-01	Junio C Hamano	Merge branch 'ma/reset-doc-rendering-fix'	blob \| commitdiff \| raw
2018-12-01	Junio C Hamano	Merge branch 'ab/replace-graft-with-replace-advice'	blob \| commitdiff \| raw
2018-11-29	Junio C Hamano	Merge branch 'nd/n18n-fix'	blob \| commitdiff \| raw
2018-11-26	Junio C Hamano	Merge branch 'nd/per-worktree-ref-iteration'	blob \| commitdiff \| raw
2018-11-26	Junio C Hamano	Merge branch 'tb/clone-case-smashing-warning-test'	blob \| commitdiff \| raw
2018-11-26	Junio C Hamano	Merge branch 'jk/t5562-perl-path-fix'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Sync with 2.19.2	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw \| diff to current
2018-11-21	Junio C Hamano	Merge branch 'cc/shared-index-permbits'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'nd/clone-case-smashing-warning'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'cc/delta-islands'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'js/rebase-am-options-fix'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'js/builtin-rebase-perf-fix-err-fix'	blob \| commitdiff \| raw
2018-11-20	Jiang Xin	Merge branch 'master' of git://github.com/git-l10n...	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'sb/cocci-pending'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'js/test-git-installed'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'dd/poll-dot-h'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'tb/print-size-t-with-uintmax-format'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'tb/xcurl-off-t'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'nd/format-patch-cover-letter-stat-width'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'ds/push-squelch-ambig-warning'	blob \| commitdiff \| raw
2018-11-19	Junio C Hamano	Merge branch 'ab/dynamic-gettext-poison'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'ab/rebase-in-c-escape-hatch'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/rebase-am-options'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'sg/ref-filter-wo-repository'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'nd/doc-extensions'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/fuzz-cxxflags'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/mingw-msdn-url'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/mingw-create-hard-link'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/config-sequence'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'lj/mingw-pthread-cond'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'nd/command-list-gen-fix'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'ag/p3400-force-checkout'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'cb/notes-freeing-always-null-fix'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/rebase-r-and-merge-head'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/apply-recount-allow-noop'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'ra/rev-parse-exclude-glob'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/builtin-rebase-perf-fix'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/mailmap'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/rebase-autostash-detach-fix'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'ab/range-diff-no-patch'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'jk/verify-sig-merge-into-void'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'js/mingw-res-rebuild'	blob \| commitdiff \| raw
2018-11-18	Junio C Hamano	Merge branch 'jk/unused-parameter-fixes'	blob \| commitdiff \| raw
2018-11-06	Jeff King	assert NOARG/NONEG behavior of parse-options callbacks	blob \| commitdiff \| raw
2018-10-31	Junio C Hamano	Adjust for 2.19.x series	blob \| commitdiff \| raw \| diff to current
2018-10-16	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t7501-thinkofix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t0020-conversion-fix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t4051-fix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'js/larger-timestamps'	blob \| commitdiff \| raw \| diff to current
2018-08-20	Junio C Hamano	Merge branch 'sb/pull-rebase-submodule'	blob \| commitdiff \| raw \| diff to current
2018-08-20	Junio C Hamano	Merge branch 'js/typofixes'	blob \| commitdiff \| raw \| diff to current
2018-08-15	Junio C Hamano	Merge branch 'sb/histogram-less-memory'	blob \| commitdiff \| raw \| diff to current
2018-07-24	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	blob \| commitdiff \| raw \| diff to current
2018-06-28	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	blob \| commitdiff \| raw \| diff to current
2018-06-18	Junio C Hamano	Merge branch 'mw/doc-merge-enumfix'	blob \| commitdiff \| raw \| diff to current
2018-05-30	Junio C Hamano	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| commitdiff \| raw \| diff to current
2018-05-22	Junio C Hamano	Sync with Git 2.13.7	blob \| commitdiff \| raw \| diff to current
2018-05-22	Jeff King	Merge branch 'jk/submodule-name-verify-fix' into jk...	blob \| commitdiff \| raw \| diff to current
2018-05-08	Junio C Hamano	Merge branch 'ab/git-svn-get-record-typofix'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom