Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2012-07-05	Merge branch 'nd/clone-single-fix'	blob \| diff \| raw
2012-07-05	Merge branch 'th/diff-no-index-fixes'	blob \| diff \| raw
2012-07-05	Merge branch 'hv/remote-end-hung-up'	blob \| diff \| raw
2012-06-28	Merge branch 'fc/git-prompt-script'	blob \| diff \| raw
2012-06-28	Merge branch 'js/submodule-relative'	blob \| diff \| raw
2012-06-28	Merge branch 'hv/submodule-update-nuke-submodules'	blob \| diff \| raw
2012-06-28	Merge branch 'nd/exclude-workaround-top-heavy'	blob \| diff \| raw
2012-06-28	Merge branch 'nd/stream-pack-objects'	blob \| diff \| raw
2012-06-28	Merge branch 'nd/stream-index-pack'	blob \| diff \| raw
2012-06-28	Merge branch 'mm/verify-filename-fix'	blob \| diff \| raw
2012-06-28	Merge branch 'jk/diff-no-index-pager'	blob \| diff \| raw
2012-06-25	Merge branch 'lp/no-cmd-http-fetch'	blob \| diff \| raw
2012-06-25	Merge branch 'cn/cherry-pick-range-docs'	blob \| diff \| raw
2012-06-25	Merge branch 'lm/git-blame-el'	blob \| diff \| raw
2012-06-25	Merge branch 'rs/ipv6-ssh-url'	blob \| diff \| raw
2012-06-25	Merge branch 'jc/ustar-checksum-is-unsigned'	blob \| diff \| raw
2012-06-25	Merge branch 'rs/git-blame-mapcar-mapc'	blob \| diff \| raw
2012-06-25	Merge branch 'rr/doc-commit'	blob \| diff \| raw
2012-06-25	Merge branch 'nd/i18n-branch-lego'	blob \| diff \| raw
2012-06-22	Merge branch 'vr/help-per-platform'	blob \| diff \| raw
2012-06-21	Merge branch 'jk/maint-t1304-setfacl'	blob \| diff \| raw
2012-06-21	Merge branch 'vr/help-per-platform'	blob \| diff \| raw
2012-06-21	Merge branch 'jc/ls-files-i-dir'	blob \| diff \| raw
2012-06-21	Merge branch 'jc/request-pull-match-tagname'	blob \| diff \| raw
2012-06-17	Sync with 1.7.10.5	blob \| diff \| raw
2012-06-17	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| diff \| raw \| diff to current
2012-06-15	Merge branch 'as/diff-shortstat-ignore-binary'	blob \| diff \| raw
2012-06-13	Merge branch 'rj/gitweb-test-sans-date-parser'	blob \| diff \| raw
2012-06-13	Merge branch 'fc/git-complete-helper-fix'	blob \| diff \| raw
2012-06-12	Merge branch 'mm/api-credentials-doc'	blob \| diff \| raw
2012-06-12	Merge branch 'jc/fmt-merge-msg-people'	blob \| diff \| raw
2012-06-12	Merge branch 'js/maint-fast-export-mark-error'	blob \| diff \| raw
2012-06-08	Merge branch 'mm/api-credentials-doc'	blob \| diff \| raw
2012-06-07	Merge branch 'mm/api-credentials-doc'	blob \| diff \| raw
2012-06-07	Merge branch 'rr/maint-t3510-cascade-fix'	blob \| diff \| raw
2012-06-07	Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'	blob \| diff \| raw
2012-06-07	Merge branch 'cr/persistent-https'	blob \| diff \| raw
2012-06-03	Sync with 1.7.10.4	blob \| diff \| raw
2012-06-03	Merge branch 'ef/maint-rebase-error-message' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'ef/maint-rebase-error-message'	blob \| diff \| raw
2012-06-01	Merge branch 'nh/empty-rebase'	blob \| diff \| raw
2012-06-01	Merge branch 'vr/rebase-autosquash-does-not-imply-i'	blob \| diff \| raw
2012-06-01	Merge branch 'mm/levenstein-penalize-deletion-less'	blob \| diff \| raw
2012-06-01	Merge branch 'jl/submodule-report-new-path-once'	blob \| diff \| raw
2012-06-01	Sync with maint	blob \| diff \| raw
2012-06-01	Merge branch 'ef/http-o-depends-on-gvf' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw
2012-06-01	Merge branch 'rs/maint-grep-F' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'jk/ident-split-fix' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'jk/pretty-commit-header-incomplete-line...	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'jk/format-person-part-buffer-limit' into...	blob \| diff \| raw \| diff to current
2012-05-29	Merge git://bogomips.org/git-svn	blob \| diff \| raw
2012-05-29	Merge branch 'va/git-p4-test'	blob \| diff \| raw
2012-05-29	Merge branch 'jk/ident-gecos-strbuf'	blob \| diff \| raw
2012-05-29	Merge branch 'mh/fetch-pack-constness'	blob \| diff \| raw \| diff to current
2012-05-29	Merge branch 'mh/ref-api-lazy-loose'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'sp/sh-windows-pwd'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'mh/test-keep-prove-cache'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'jk/format-person-part-buffer-limit'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'jk/pretty-commit-header-incomplete-line'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'jk/ident-split-fix'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'rs/xdiff-fast-hash-fix'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'mh/ref-api'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'rs/maint-grep-F'	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'hv/submodule-alt-odb' into maint	blob \| diff \| raw \| diff to current
2012-05-25	Merge branch 'bp/diff-no-index-strbuf-fix' into maint	blob \| diff \| raw \| diff to current
2012-05-25	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	blob \| diff \| raw
2012-05-23	Merge branch 'rs/archive-tree-in-tip-simplify'	blob \| diff \| raw \| diff to current
2012-05-23	Merge branch 'js/rev-parse-doc-fix'	blob \| diff \| raw \| diff to current
2012-05-23	Merge branch 'js/rebase-i-p-test-fix'	blob \| diff \| raw \| diff to current
2012-05-23	Merge branch 'bp/diff-no-index-strbuf-fix'	blob \| diff \| raw \| diff to current
2012-05-23	Merge branch 'hv/submodule-alt-odb'	blob \| diff \| raw \| diff to current
2012-05-17	Merge branch 'ld/git-p4-tags-and-labels'	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'nd/threaded-index-pack'	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'jk/maint-reflog-walk-count-vs-time' into...	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'jk/doc-asciidoc-inline-literal' into...	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'ef/checkout-empty' into maint	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'jk/maint-tformat-with-z' into maint	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'js/checkout-detach-count' into maint	blob \| diff \| raw \| diff to current
2012-05-14	Merge branch 'ef/maint-clone-progress-fix' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'ef/checkout-empty'	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'jk/maint-reflog-walk-count-vs-time'	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'jc/diff-algo-cleanup' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'ct/advise-push-default' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'js/fast-import-test-9300' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'jk/repack-no-explode-objects-from-old...	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'ah/maint-grep-double-init' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'fa/maint-config-doc' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'rs/unpack-trees-leakfix' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'sl/test-wc-l-line-count' into maint	blob \| diff \| raw \| diff to current
2012-05-11	Merge branch 'rl/show-empty-prefix' into maint	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'fa/maint-config-doc'	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'ef/maint-clone-progress-fix'	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'ah/maint-grep-double-init'	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'js/checkout-detach-count'	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'jc/install-no-hardlinks'	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'mh/ref-api-lazy-loose'	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'mm/include-userpath' into maint	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'cc/fix-missing-va-end-in-revert' into...	blob \| diff \| raw \| diff to current
2012-05-10	Merge branch 'bw/test-fix-grep-gnuism' into maint	blob \| diff \| raw \| diff to current
next