Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2012-02-21	Merge branch 'nd/find-pack-entry-recent-cache-invalidat...	blob \| diff \| raw
2012-02-21	Merge branch 'tt/profile-build-fix' into maint	blob \| diff \| raw
2012-02-21	Merge branch 'fc/zsh-completion' into maint	blob \| diff \| raw
2012-02-20	Merge branch 'tg/tag-points-at'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'jc/diff-stat-scaler'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'zj/decimal-width'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'zj/term-columns'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'cb/transfer-no-progress'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'cb/receive-pack-keep-errors'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'cb/maint-t5541-make-server-port-portable'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'cb/maint-rev-list-verify-object'	blob \| diff \| raw \| diff to current
2012-02-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2012-02-16	Sync with maint	blob \| diff \| raw \| diff to current
2012-02-16	Merge branch 'jc/checkout-out-of-unborn' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'jc/maint-mailmap-output' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'jk/prompt-fallback-to-tty' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'jn/gitweb-search-utf-8' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'jc/maint-commit-ignore-i-t-a' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'mm/empty-loose-error-message' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'nk/ctype-for-perf' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'jx/i18n-more-marking' into maint	blob \| diff \| raw
2012-02-16	Merge branch 'rt/completion-branch-edit-desc' into...	blob \| diff \| raw
2012-02-14	Merge branch 'jk/git-dir-lookup'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'jk/grep-binary-attribute'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'nd/pack-objects-parseopt'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'dp/i18n-libcharset'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'mh/war-on-extra-refs'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'lt/pull-no-edit'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'bl/gitweb-project-filter'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'jn/ancient-meld-support'	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'jk/userdiff-config-simplify'	blob \| diff \| raw \| diff to current
2012-02-14	Sync with 1.7.9.1	blob \| diff \| raw \| diff to current
2012-02-14	Merge branch 'jk/maint-tag-show-fixes' into maint	blob \| diff \| raw
2012-02-14	Merge branch 'bw/inet-pton-ntop-compat' into maint	blob \| diff \| raw
2012-02-14	Merge branch 'mp/make-cleanse-x-for-exe' into maint	blob \| diff \| raw
2012-02-14	Merge branch 'jn/merge-no-edit-fix' into maint	blob \| diff \| raw
2012-02-13	Sync with maint	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'js/add-e-submodule-fix' into maint	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jc/parse-date-raw' into maint	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jc/merge-ff-only-stronger-than-signed...	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jc/checkout-out-of-unborn'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jc/maint-mailmap-output'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jk/prompt-fallback-to-tty'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jn/gitweb-search-utf-8'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'nd/diffstat-gramnum'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'nd/find-pack-entry-recent-cache-invalidation'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'tt/profile-build-fix'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'nd/cache-tree-api-refactor'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'fc/zsh-completion'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'mp/make-cleanse-x-for-exe'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'bw/inet-pton-ntop-compat'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jc/maint-commit-ignore-i-t-a'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jk/maint-tag-show-fixes'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'mm/empty-loose-error-message'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'nk/ctype-for-perf'	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'jn/merge-no-edit-fix'	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'js/add-e-submodule-fix'	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'jc/parse-date-raw'	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'jc/merge-ff-only-stronger-than-signed...	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'jc/branch-desc-typoavoidance'	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'jn/rpm-spec'	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'jk/tests-write-script'	blob \| diff \| raw \| diff to current
2012-02-10	Sync with maint	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'tr/grep-l-with-decoration' into maint	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'jl/submodule-re-add' into maint	blob \| diff \| raw \| diff to current
2012-02-10	Merge branch 'da/maint-mergetool-twoway' into maint	blob \| diff \| raw \| diff to current
2012-02-09	merge: do not launch an editor on "--no-edit $tag"	blob \| diff \| raw
2012-02-07	Merge branch 'jc/maint-request-pull-for-tag'	blob \| diff \| raw \| diff to current
2012-02-07	Merge branch 'bl/gitweb-project-filter'	blob \| diff \| raw \| diff to current
2012-02-07	Merge branch 'jx/i18n-more-marking'	blob \| diff \| raw \| diff to current
2012-02-07	Merge branch 'jn/svn-fe'	blob \| diff \| raw \| diff to current
2012-02-07	Merge branch 'rt/completion-branch-edit-desc'	blob \| diff \| raw \| diff to current
2012-02-06	Sync with maint	blob \| diff \| raw \| diff to current
2012-02-06	Merge branch 'sp/smart-http-failure-to-push' into maint	blob \| diff \| raw \| diff to current
2012-02-06	Merge branch 'jc/maint-log-first-parent-pathspec' into...	blob \| diff \| raw \| diff to current
2012-02-06	Sync with 1.7.6.6	blob \| diff \| raw \| diff to current
2012-02-06	Sync with 1.7.6.6	blob \| diff \| raw \| diff to current
2012-02-06	Sync with 1.7.6.6	blob \| diff \| raw \| diff to current
2012-02-06	merge: do not create a signed tag merge under --ff...	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'tr/merge-edit-guidance'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'jc/pull-signed-tag'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'ar/i18n-no-gettext'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'nd/clone-detached'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'da/maint-mergetool-twoway'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'va/git-p4-branch'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'jl/submodule-re-add'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'tr/grep-l-with-decoration'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'ks/sort-wildcard-in-makefile'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'rr/sequencer'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'ld/git-p4-branches-and-labels'	blob \| diff \| raw \| diff to current
2012-02-01	Merge branch 'jc/advise-i18n'	blob \| diff \| raw \| diff to current
2012-01-31	merge: add instructions to the commit message when...	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'nd/index-pack-no-recurse'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'rs/diff-postimage-in-context'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jk/parse-object-cached'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'sp/smart-http-failure-to-push'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jc/maint-log-first-parent-pathspec'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'jl/test-pause'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'tr/maint-mailinfo'	blob \| diff \| raw \| diff to current
2012-01-29	Merge branch 'pw/p4-view-updates'	blob \| diff \| raw \| diff to current
next