projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'db/doc-custom-xmlto' into maint
[git] / builtin / merge.c
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo' blob | commitdiff | raw
2012-07-22  Junio C HamanoMerge branch 'jc/sha1-name-more' blob | commitdiff | raw
2012-07-22  Junio C HamanoMerge branch 'jc/maint-filter-branch-epoch-date' blob | commitdiff | raw
2012-07-17  Junio C HamanoMerge branch 'kk/maint-1.7.9-commit-tree' into kk/maint... blob | commitdiff | raw
2012-07-16  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' blob | commitdiff | raw
2012-07-16  Junio C HamanoMerge branch 'jk/index-pack-streaming-fix' blob | commitdiff | raw
2012-07-16  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths' blob | commitdiff | raw
2012-07-16  Junio C HamanoMerge branch 'cw/amend-commit-without-message' blob | commitdiff | raw
2012-07-16  Junio C HamanoMerge branch 'ar/clone-honor-umask-at-top' blob | commitdiff | raw
2012-07-16  Junio C HamanoMerge branch 'jc/apply-3way' blob | commitdiff | raw
2012-07-14  Junio C HamanoMerge branch 'jk/push-delete-ref-error-message' blob | commitdiff | raw
2012-07-13  Junio C HamanoMerge branch 'jc/refactor-diff-stdin' blob | commitdiff | raw
2012-07-13  Junio C HamanoMerge branch 'jn/vcs-svn' blob | commitdiff | raw
2012-07-13  Junio C HamanoMerge branch 'tr/maint-show-walk' blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'th/diff-no-index-fixes' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'nd/clone-single-fix' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'hv/submodule-update-nuke-submodules'... blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'jk/diff-no-index-pager' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'mm/verify-filename-fix' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'cn/cherry-pick-range-docs' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'jc/ustar-checksum-is-unsigned' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'jc/ls-files-i-dir' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'jc/request-pull-match-tagname' into maint blob | commitdiff | raw
2012-07-11  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg... blob | commitdiff | raw
2012-07-09  Junio C HamanoMerge branch 'mz/empty-rebase-test' blob | commitdiff | raw
2012-07-09  Junio C HamanoMerge branch 'js/fast-export-paths-with-spaces' blob | commitdiff | raw
2012-07-09  Junio C HamanoMerge branch 'cw/no-detaching-an-unborn' blob | commitdiff | raw
2012-07-09  Junio C HamanoMerge branch 'jc/maint-blame-unique-abbrev' blob | commitdiff | raw
2012-07-05  Junio C HamanoMerge branch 'nd/clone-single-fix' blob | commitdiff | raw
2012-07-05  Junio C HamanoMerge branch 'th/diff-no-index-fixes' blob | commitdiff | raw
2012-07-05  Junio C HamanoMerge branch 'hv/remote-end-hung-up' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'fc/git-prompt-script' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'js/submodule-relative' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'hv/submodule-update-nuke-submodules' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'nd/exclude-workaround-top-heavy' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'nd/stream-pack-objects' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'nd/stream-index-pack' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'mm/verify-filename-fix' blob | commitdiff | raw
2012-06-28  Junio C HamanoMerge branch 'jk/diff-no-index-pager' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'cn/cherry-pick-range-docs' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'lm/git-blame-el' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'rs/ipv6-ssh-url' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'jc/ustar-checksum-is-unsigned' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'rs/git-blame-mapcar-mapc' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'rr/doc-commit' blob | commitdiff | raw
2012-06-25  Junio C HamanoMerge branch 'nd/i18n-branch-lego' blob | commitdiff | raw
2012-06-22  Junio C HamanoMerge branch 'vr/help-per-platform' blob | commitdiff | raw
2012-06-21  Junio C HamanoMerge branch 'jk/maint-t1304-setfacl' blob | commitdiff | raw
2012-06-21  Junio C HamanoMerge branch 'vr/help-per-platform' blob | commitdiff | raw
2012-06-21  Junio C HamanoMerge branch 'jc/ls-files-i-dir' blob | commitdiff | raw
2012-06-21  Junio C HamanoMerge branch 'jc/request-pull-match-tagname' blob | commitdiff | raw
2012-06-17  Junio C HamanoSync with 1.7.10.5 blob | commitdiff | raw
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into... blob | commitdiff | raw | diff to current
2012-06-15  Junio C HamanoMerge branch 'as/diff-shortstat-ignore-binary' blob | commitdiff | raw
2012-06-13  Junio C HamanoMerge branch 'rj/gitweb-test-sans-date-parser' blob | commitdiff | raw
2012-06-13  Junio C HamanoMerge branch 'fc/git-complete-helper-fix' blob | commitdiff | raw
2012-06-12  Junio C HamanoMerge branch 'mm/api-credentials-doc' blob | commitdiff | raw
2012-06-12  Junio C HamanoMerge branch 'jc/fmt-merge-msg-people' blob | commitdiff | raw
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' blob | commitdiff | raw
2012-06-08  Junio C HamanoMerge branch 'mm/api-credentials-doc' blob | commitdiff | raw
2012-06-07  Junio C HamanoMerge branch 'mm/api-credentials-doc' blob | commitdiff | raw
2012-06-07  Junio C HamanoMerge branch 'rr/maint-t3510-cascade-fix' blob | commitdiff | raw
2012-06-07  Junio C HamanoMerge branch 'jc/svn-auth-providers-unusable-at-1.6.12' blob | commitdiff | raw
2012-06-07  Junio C HamanoMerge branch 'cr/persistent-https' blob | commitdiff | raw
2012-06-03  Junio C HamanoSync with 1.7.10.4 blob | commitdiff | raw
2012-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint blob | commitdiff | raw | diff to current
2012-06-01  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' blob | commitdiff | raw
2012-06-01  Junio C HamanoMerge branch 'nh/empty-rebase' blob | commitdiff | raw
2012-06-01  Junio C HamanoMerge branch 'vr/rebase-autosquash-does-not-imply-i' blob | commitdiff | raw
2012-06-01  Junio C HamanoMerge branch 'mm/levenstein-penalize-deletion-less' blob | commitdiff | raw
2012-06-01  Junio C HamanoMerge branch 'jl/submodule-report-new-path-once' blob | commitdiff | raw
2012-06-01  Junio C HamanoSync with maint blob | commitdiff | raw
2012-06-01  Junio C HamanoMerge branch 'ef/http-o-depends-on-gvf' into maint blob | commitdiff | raw | diff to current
2012-06-01  Junio C HamanoMerge git://github.com/git-l10n/git-po blob | commitdiff | raw
2012-06-01  Junio C HamanoMerge branch 'rs/maint-grep-F' into maint blob | commitdiff | raw | diff to current
2012-06-01  Junio C HamanoMerge branch 'jk/ident-split-fix' into maint blob | commitdiff | raw | diff to current
2012-06-01  Junio C HamanoMerge branch 'jk/pretty-commit-header-incomplete-line... blob | commitdiff | raw | diff to current
2012-06-01  Junio C HamanoMerge branch 'jk/format-person-part-buffer-limit' into... blob | commitdiff | raw | diff to current
2012-05-29  Junio C HamanoMerge git://bogomips.org/git-svn blob | commitdiff | raw
2012-05-29  Junio C HamanoMerge branch 'va/git-p4-test' blob | commitdiff | raw
2012-05-29  Junio C HamanoMerge branch 'jk/ident-gecos-strbuf' blob | commitdiff | raw
2012-05-29  Junio C HamanoMerge branch 'mh/fetch-pack-constness' blob | commitdiff | raw | diff to current
2012-05-29  Junio C HamanoMerge branch 'mh/ref-api-lazy-loose' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'sp/sh-windows-pwd' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'mh/test-keep-prove-cache' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'jk/format-person-part-buffer-limit' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'jk/pretty-commit-header-incomplete-line' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'jk/ident-split-fix' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'rs/xdiff-fast-hash-fix' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'mh/ref-api' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'rs/maint-grep-F' blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'hv/submodule-alt-odb' into maint blob | commitdiff | raw | diff to current
2012-05-25  Junio C HamanoMerge branch 'bp/diff-no-index-strbuf-fix' into maint blob | commitdiff | raw | diff to current
2012-05-25  Jeff Kingident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT blob | commitdiff | raw
2012-05-23  Junio C HamanoMerge branch 'rs/archive-tree-in-tip-simplify' blob | commitdiff | raw | diff to current
2012-05-23  Junio C HamanoMerge branch 'js/rev-parse-doc-fix' blob | commitdiff | raw | diff to current
2012-05-23  Junio C HamanoMerge branch 'js/rebase-i-p-test-fix' blob | commitdiff | raw | diff to current
2012-05-23  Junio C HamanoMerge branch 'bp/diff-no-index-strbuf-fix' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.