projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
sequencer: signal failed ff as an aborted, not a conflicted merge
[git] / merge-blobs.h
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0' blob | commitdiff | raw
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1' blob | commitdiff | raw
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into... blob | commitdiff | raw
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint blob | commitdiff | raw
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' blob | commitdiff | raw
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple' blob | commitdiff | raw
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef' blob | commitdiff | raw
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix' blob | commitdiff | raw
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint blob | commitdiff | raw
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel' blob | commitdiff | raw
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui blob | commitdiff | raw
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into... blob | commitdiff | raw
2013-12-17  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' into... blob | commitdiff | raw
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2013-12-05  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' blob | commitdiff | raw
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint blob | commitdiff | raw
2013-11-07  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint blob | commitdiff | raw
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects' blob | commitdiff | raw
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc' blob | commitdiff | raw
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon' blob | commitdiff | raw
2013-10-30  Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix' blob | commitdiff | raw
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive' blob | commitdiff | raw
2013-10-28  Junio C HamanoMerge branch 'jc/revision-range-unpeel' blob | commitdiff | raw
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang' blob | commitdiff | raw
2013-10-14  Jonathan NiederMerge branch 'nv/doc-config-signingkey' blob | commitdiff | raw
2013-10-08  Jonathan NiederMerge branch 'tz/credential-netrc' blob | commitdiff | raw
2013-09-26  Jonathan NiederMerge branch 'js/xread-in-full' into maint blob | commitdiff | raw
2013-09-12  Junio C HamanoMerge branch 'mn/doc-pack-heu-remove-dead-pastebin' blob | commitdiff | raw
2013-09-11  Junio C HamanoMerge branch 'js/xread-in-full' blob | commitdiff | raw
2013-08-05  Junio C HamanoMerge branch 'dn/test-reject-utf-16' blob | commitdiff | raw
2013-07-31  Junio C HamanoMerge branch 'jk/commit-how-to-abort-cherry-pick' blob | commitdiff | raw
2013-07-31  Junio C HamanoMerge branch 'ds/doc-two-kinds-of-tags' blob | commitdiff | raw
2013-07-30  Junio C HamanoMerge branch 'jk/capabilities-doc' blob | commitdiff | raw
2013-07-22  Junio C HamanoMerge branch 'jk/t0008-sigpipe-fix' blob | commitdiff | raw
2013-07-22  Junio C HamanoMerge branch 'sb/parse-object-buffer-eaten' blob | commitdiff | raw
2013-07-22  Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks' into... blob | commitdiff | raw
2013-07-22  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' into maint blob | commitdiff | raw
2013-07-22  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' into maint blob | commitdiff | raw
2013-07-19  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half... blob | commitdiff | raw
2013-07-19  Junio C HamanoMerge branch 'jc/t1512-fix' into maint blob | commitdiff | raw
2013-07-15  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix... blob | commitdiff | raw
2013-07-12  Junio C HamanoMerge branch 'rs/pickaxe-simplify' blob | commitdiff | raw
2013-07-12  Junio C HamanoMerge branch 'ft/diff-rename-default-score-is-half' blob | commitdiff | raw
2013-07-11  Junio C HamanoMerge branch 'jc/t1512-fix' blob | commitdiff | raw
2013-07-11  Junio C HamanoMerge branch 'jc/maint-diff-core-safecrlf' blob | commitdiff | raw
2013-07-11  Junio C HamanoMerge branch 'mh/maint-lockfile-overflow' blob | commitdiff | raw
2013-07-03  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' into maint blob | commitdiff | raw
2013-07-03  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index... blob | commitdiff | raw
2013-06-27  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix'... blob | commitdiff | raw
2013-06-26  Junio C HamanoMerge branch 'tr/maint-apply-non-git-patch-parsefix' blob | commitdiff | raw
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui blob | commitdiff | raw
2013-06-11  Junio C HamanoMerge branch 'rr/maint-fetch-tag-doc-asterisks' blob | commitdiff | raw
2013-06-11  Junio C HamanoMerge branch 'cr/git-work-tree-sans-git-dir' blob | commitdiff | raw
2013-06-11  Junio C HamanoMerge branch 'fc/do-not-use-the-index-in-add-to-index' blob | commitdiff | raw
2013-06-02  Junio C HamanoMerge branch 'mk/combine-diff-context-horizon-fix' blob | commitdiff | raw
2013-05-29  Junio C HamanoMerge branch 'jk/lookup-object-prefer-latest' blob | commitdiff | raw
2013-05-29  Junio C HamanoMerge branch 'as/check-ignore' blob | commitdiff | raw
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2013-05-09  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' into maint blob | commitdiff | raw
2013-05-01  Junio C HamanoMerge branch 'hb/git-pm-tempfile' blob | commitdiff | raw
2013-04-26  Junio C HamanoMerge branch 'ph/rebase-original' blob | commitdiff | raw
2013-04-24  Junio C HamanoMerge branch 'sr/log-SG-no-textconv' into maint blob | commitdiff | raw
2013-04-24  Junio C HamanoMerge branch 'jc/merge-tag-object' into maint blob | commitdiff | raw
2013-04-22  Junio C HamanoMerge branch 'jc/detached-head-doc' into maint blob | commitdiff | raw
2013-04-22  Junio C HamanoMerge branch 'jk/show-branch-strbuf' into maint blob | commitdiff | raw
2013-04-22  Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL... blob | commitdiff | raw
2013-04-22  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent' into maint blob | commitdiff | raw
2013-04-22  Junio C HamanoMerge branch 'jk/suppress-clang-warning' into maint blob | commitdiff | raw
2013-04-22  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original... blob | commitdiff | raw
2013-04-19  Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' blob | commitdiff | raw
2013-04-18  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple' (early... blob | commitdiff | raw
2013-04-18  Junio C HamanoMerge branch 'jc/detached-head-doc' blob | commitdiff | raw
2013-04-15  Junio C HamanoMerge branch 'jk/show-branch-strbuf' blob | commitdiff | raw
2013-04-12  Junio C HamanoMerge branch 'jk/diffcore-break-divzero' into maint blob | commitdiff | raw
2013-04-12  Junio C HamanoMerge branch 'cn/commit-amend-doc' into maint blob | commitdiff | raw
2013-04-12  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' into maint blob | commitdiff | raw
2013-04-12  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint blob | commitdiff | raw
2013-04-12  Junio C HamanoMerge branch 'sr/log-SG-no-textconv' blob | commitdiff | raw
2013-04-12  Junio C HamanoMerge branch 'js/rerere-forget-protect-against-NUL' blob | commitdiff | raw
2013-04-07  Junio C HamanoMerge branch 'cn/commit-amend-doc' blob | commitdiff | raw
2013-04-07  Junio C HamanoMerge branch 'jk/diffcore-break-divzero' blob | commitdiff | raw
2013-04-07  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' blob | commitdiff | raw
2013-04-07  Junio C HamanoMerge branch 'jk/filter-branch-come-back-to-original' blob | commitdiff | raw
2013-04-07  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix' into... blob | commitdiff | raw
2013-04-05  Junio C HamanoMerge branch 'jl/submodule-deinit' blob | commitdiff | raw
2013-04-05  Junio C HamanoMerge branch 'jc/merge-tag-object' blob | commitdiff | raw
2013-04-04  Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes' into maint blob | commitdiff | raw
2013-04-04  Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix' into... blob | commitdiff | raw
2013-04-04  Junio C HamanoMerge branch 'jk/peel-ref' into maint blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'jc/apply-ws-fix-tab-in-indent' blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'jc/directory-attrs-regression-fix' blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time' into maint blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'lf/setup-prefix-pathspec' into maint blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'kb/name-hash' into maint-1.8.1 blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'kk/revwalk-slop-too-many-commit-within... blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint... blob | commitdiff | raw
2013-04-03  Junio C HamanoMerge branch 'jk/fully-peeled-packed-ref' into maint... blob | commitdiff | raw
next
Unnamed repository; edit this file 'description' to name the repository.