Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2010-05-28	Merge branch 'maint'	blob \| diff \| raw
2010-05-28	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-25	Merge branch 'maint'	blob \| diff \| raw
2010-05-21	Merge branch 'by/blame-doc-m-c'	blob \| diff \| raw
2010-05-21	Merge branch 'by/log-follow'	blob \| diff \| raw
2010-05-21	Merge branch 'mg/advice-statushints'	blob \| diff \| raw
2010-05-21	Merge branch 'cb/maint-stash-orphaned-file'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/maint-bundle'	blob \| diff \| raw
2010-05-21	Merge branch 'pb/patch-id-plus'	blob \| diff \| raw
2010-05-21	Merge branch 'rr/doc-submitting'	blob \| diff \| raw
2010-05-21	Merge branch 'st/remote-tags-no-tags'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/fsck-ident'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/gitweb-caching-prep'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/gitweb-install'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/gitweb-our-squelch'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/request-pull'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/shortlog'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/t7006-fixup'	blob \| diff \| raw
2010-05-21	Merge branch 'js/maint-receive-pack-symref-alias'	blob \| diff \| raw
2010-05-21	Merge branch 'sp/maint-dumb-http-pack-reidx'	blob \| diff \| raw
2010-05-21	Merge branch 'jn/submodule-basic-test'	blob \| diff \| raw
2010-05-21	Merge branch 'np/index-pack-memsave'	blob \| diff \| raw
2010-05-21	Merge branch 'jc/am-3-show-corrupted-patch'	blob \| diff \| raw
2010-05-21	Merge branch 'jc/maint-no-reflog-expire-unreach-for...	blob \| diff \| raw
2010-05-21	Merge branch 'cw/maint-exec-defpath'	blob \| diff \| raw
2010-05-21	Merge branch 'tr/word-diff'	blob \| diff \| raw
2010-05-21	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| diff \| raw
2010-05-21	Merge branch 'jc/status-show-ignored'	blob \| diff \| raw
2010-05-21	Merge branch 'np/malloc-threading'	blob \| diff \| raw
2010-05-21	Merge branch 'sr/remote-helper-export'	blob \| diff \| raw
2010-05-21	Merge branch 'ld/discovery-limit-to-fs' (early part)	blob \| diff \| raw
2010-05-21	Merge branch 'ar/config-from-command-line'	blob \| diff \| raw
2010-05-21	Merge branch 'em/checkout-orphan'	blob \| diff \| raw
2010-05-21	Merge branch 'maint'	blob \| diff \| raw
2010-05-20	Merge branch 'maint'	blob \| diff \| raw
2010-05-19	Merge branch 'maint'	blob \| diff \| raw
2010-05-12	Merge branch 'maint'	blob \| diff \| raw
2010-05-11	Merge branch 'maint'	blob \| diff \| raw
2010-05-09	Merge branch 'bg/apply-blank-trailing-context'	blob \| diff \| raw
2010-05-09	Merge branch 'bg/send-email-smtpdomain'	blob \| diff \| raw
2010-05-09	Merge branch 'rc/ls-remote-default'	blob \| diff \| raw
2010-05-09	Merge branch 'rc/maint-curl-helper'	blob \| diff \| raw
2010-05-09	Merge branch 'hg/maint-attr-fix'	blob \| diff \| raw
2010-05-09	Merge branch 'eb/unpretty-b-format'	blob \| diff \| raw
2010-05-09	Merge branch 'ab/commit-empty-message'	blob \| diff \| raw
2010-05-09	Merge branch 'jc/test-sleepless'	blob \| diff \| raw
2010-05-09	Merge branch 'jc/maint-reflog-expire-unreachable'	blob \| diff \| raw
2010-05-09	Merge branch 'sd/log-decorate'	blob \| diff \| raw
2010-05-09	Merge branch 'mh/status-optionally-refresh'	blob \| diff \| raw
2010-05-09	Merge branch 'cw/ws-indent-with-tab'	blob \| diff \| raw
2010-05-09	Merge branch 'cc/revert-strategy'	blob \| diff \| raw
2010-05-09	Merge branch 'pc/remove-warn'	blob \| diff \| raw \| diff to current
2010-05-08	Merge branch 'jn/maint-request-pull' into jn/request...	blob \| diff \| raw \| diff to current
2010-05-04	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-23	Sync with 1.7.0.6	blob \| diff \| raw \| diff to current
2010-04-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-19	Merge branch 'wp/doc-filter-direction'	blob \| diff \| raw \| diff to current
2010-04-19	Merge branch 'jk/maint-diffstat-overflow'	blob \| diff \| raw \| diff to current
2010-04-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-19	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2010-04-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-11	Merge branch 'jl/maint-submodule-gitfile-awareness'	blob \| diff \| raw \| diff to current
2010-04-11	Sync with 1.7.0.5	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'jl/maint-submodule-gitfile-awareness'	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'rc/maint-reflog-msg-for-forced-branch'	blob \| diff \| raw \| diff to current
2010-04-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-06	Merge branch 'da/maint-python-startup'	blob \| diff \| raw \| diff to current
2010-04-06	Merge branch 'sb/fmt-merge-msg'	blob \| diff \| raw \| diff to current
2010-04-06	Merge branch 'jc/conflict-marker-size'	blob \| diff \| raw \| diff to current
2010-04-06	Merge branch 'ef/maint-empty-commit-log'	blob \| diff \| raw \| diff to current
2010-04-06	Merge branch 'sg/bash-completion'	blob \| diff \| raw \| diff to current
2010-04-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'mb/rebase-i-no-ff'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'sp/maint-http-backend-die-triggers-die...	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'rr/imap-send-unconfuse-from-line'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'mg/use-default-abbrev-length-in-rev-list'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'mg/maint-send-email-lazy-editor'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'rb/maint-python-path'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'jn/merge-diff3-label'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'ef/cherry-abbrev'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'bw/template-tool-buildconfig'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'mg/mailmap-update'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'bc/t5505-fix'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'gh/maint-stash-show-error-message'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'rs/threaded-grep-context'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'bc/maint-daemon-sans-ss-family'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'bc/acl-test'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'ja/send-email-ehlo'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'do/rebase-i-arbitrary'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'ak/everyday-git'	blob \| diff \| raw \| diff to current
2010-04-01	merge: make function try_merge_command non static	blob \| diff \| raw \| diff to current
2010-04-01	merge: refactor code that calls "git merge-STRATEGY"	blob \| diff \| raw \| diff to current
2010-03-31	Sync with 1.7.0.4	blob \| diff \| raw \| diff to current
2010-03-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-03-29	Merge branch 'cc/cherry-pick-ff'	blob \| diff \| raw \| diff to current
next