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

2013-09-20	Junio C Hamano	Merge branch 'mm/status-without-comment-char'	blob \| commitdiff \| raw
2013-09-20	Junio C Hamano	Merge branch 'rh/peeling-tag-to-tag'	blob \| commitdiff \| raw
2013-09-20	Junio C Hamano	Merge branch 'jx/branch-vv-always-compare-with-upstream'	blob \| commitdiff \| raw
2013-09-20	Junio C Hamano	Merge branch 'nd/fetch-into-shallow'	blob \| commitdiff \| raw
2013-09-19	Junio C Hamano	Merge branch 'jk/config-int-range-check'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jc/url-match'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'bc/send-email-ssl-die-message-fix'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'uh/git-svn-serf-fix'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'fc/contrib-bzr-hg-fixes'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'js/add-i-mingw'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'ks/p4-view-spec'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jk/duplicate-objects-in-packs'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'nd/git-dir-pointing-at-gitfile'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jk/pager-bypass-cat-for-default-pager'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'fc/t3200-fixes'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'fc/rev-parse-test-updates'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'rh/ishes-doc'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'dw/diff-no-index-doc'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'ta/user-manual'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'fc/trivial'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'fc/fast-export'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'ab/gitweb-author-initials'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'jk/has-sha1-file-retry-packed'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'jk/write-broken-index-with-nul-sha1'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'jx/clean-interactive'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'tb/precompose-autodetect-fix'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'kk/tests-with-no-perl'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'ap/commit-author-mailmap'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'jk/free-tree-buffer'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Sync with maint for l10n updates	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 'mm/remote-helpers-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-12	Junio C Hamano	Merge branch 'mm/mediawiki-dumb-push-fix'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'jc/commit-is-spelled-with-two-ems'	blob \| commitdiff \| raw
2013-09-12	Junio C Hamano	Merge branch 'jk/config-int-range-check'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'jc/ls-files-killed-optim'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'es/rebase-i-no-abbrev'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'rt/rebase-p-no-merge-summary'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'tf/gitweb-ss-tweak'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'sb/mailmap-freeing-NULL-is-ok'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'js/xread-in-full'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'es/rebase-i-respect-core-commentchar'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'jn/post-receive-utf8'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'sh/pull-rebase-preserve'	blob \| commitdiff \| raw
2013-09-11	Junio C Hamano	Merge branch 'nd/push-no-thin'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'nd/magic-pathspec'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jk/mailmap-incomplete-line'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'sp/clip-read-write-to-8mb'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'tg/index-struct-sizes'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/transport-do-not-use-connect-twice...	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'es/contacts-blame-L-multi'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/url-match'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jl/submodule-mv'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'es/blame-L-twice'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'tr/log-full-diff-keep-true-parents'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jk/cat-file-batch-optim'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'es/blame-L-more'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'db/http-savecookies'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/push-cas'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'nd/clone-connectivity-shortcut'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'jc/diff-filter-negation'	blob \| commitdiff \| raw
2013-09-09	Junio C Hamano	Merge branch 'ms/fetch-prune-configuration'	blob \| commitdiff \| raw
2013-09-05	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'sb/parseopt-boolean-removal'	blob \| commitdiff \| raw
2013-08-05	Stefan Beller	Replace deprecated OPT_BOOLEAN by OPT_BOOL	blob \| commitdiff \| raw
2013-08-05	Junio C Hamano	Merge branch 'dn/test-reject-utf-16'	blob \| commitdiff \| raw \| diff to current
2013-07-22	Junio C Hamano	Merge branch 'jk/t0008-sigpipe-fix'	blob \| commitdiff \| raw \| diff to current
2013-07-22	Junio C Hamano	Merge branch 'jc/maint-diff-core-safecrlf' into maint	blob \| commitdiff \| raw \| diff to current
2013-07-19	Junio C Hamano	Merge branch 'jc/t1512-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-07-15	Junio C Hamano	Merge branch 'tr/maint-apply-non-git-patch-parsefix...	blob \| commitdiff \| raw \| diff to current
2013-07-12	Junio C Hamano	Merge branch 'rs/pickaxe-simplify'	blob \| commitdiff \| raw \| diff to current
2013-07-11	Junio C Hamano	Merge branch 'jc/t1512-fix'	blob \| commitdiff \| raw \| diff to current
2013-07-11	Junio C Hamano	Merge branch 'jc/maint-diff-core-safecrlf'	blob \| commitdiff \| raw \| diff to current
2013-06-26	Junio C Hamano	Merge branch 'tr/maint-apply-non-git-patch-parsefix'	blob \| commitdiff \| raw \| diff to current
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-05-29	Junio C Hamano	Merge branch 'as/check-ignore'	blob \| commitdiff \| raw \| diff to current
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-09	Junio C Hamano	Merge branch 'tr/copy-revisions-from-stdin' into maint	blob \| commitdiff \| raw \| diff to current
2013-04-26	Junio C Hamano	Merge branch 'ph/rebase-original'	blob \| commitdiff \| raw \| diff to current
2013-04-24	Junio C Hamano	Merge branch 'sr/log-SG-no-textconv' into maint	blob \| commitdiff \| raw \| diff to current
2013-04-19	Junio C Hamano	Merge branch 'tr/copy-revisions-from-stdin'	blob \| commitdiff \| raw \| diff to current
2013-04-12	Junio C Hamano	Merge branch 'sr/log-SG-no-textconv'	blob \| commitdiff \| raw \| diff to current
2013-04-04	Junio C Hamano	Merge branch 'nd/index-pack-threaded-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2013-04-04	Junio C Hamano	Merge branch 'jk/index-pack-correct-depth-fix' into...	blob \| commitdiff \| raw \| diff to current
2013-04-04	Junio C Hamano	Merge branch 'jk/peel-ref' into maint	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'lf/setup-prefix-pathspec' into maint	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'jk/fully-peeled-packed-ref' into maint...	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'jc/perl-cat-blob' into maint-1.8.1	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| commitdiff \| raw \| diff to current
2013-04-02	Junio C Hamano	Merge branch 'sw/safe-create-leading-dir-race'	blob \| commitdiff \| raw \| diff to current
2013-04-01	Junio C Hamano	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom