Andrew's git - gitweb.git/history

[gitweb.git] / builtin / merge.c

2010-06-18	Merge branch 'rc/ls-remote-default'	blob \| diff \| raw
2010-06-18	Merge branch 'hg/id-munging'	blob \| diff \| raw
2010-06-18	Merge branch 'tc/merge-m-log'	blob \| diff \| raw
2010-06-18	Merge branch 'ph/clone-message-reword'	blob \| diff \| raw \| diff to current
2010-06-17	Merge 'maint' updates in	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'cw/maint-exec-defpath' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'cb/maint-stash-orphaned-file' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/maint-bundle' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'rr/doc-submitting' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/t7006-fixup' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jn/shortlog' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'np/index-pack-memsave' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sp/maint-dumb-http-pack-reidx' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jc/am-3-show-corrupted-patch' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'np/malloc-threading' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'bg/send-email-smtpdomain' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'rc/maint-curl-helper' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'hg/maint-attr-fix' into maint	blob \| diff \| raw \| diff to current
2010-06-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'mc/maint-zoneparse'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jk/diff-m-doc'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/maint-doc-ignore'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/fsck-ident'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'bs/userdiff-php'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jk/maint-sha1-file-name-fix'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jk/maint-pull-dry-run-noop'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/gitweb-syntax-highlight'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'js/maint-windows'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'bw/diff-metainfo-color'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'js/try-to-free-stackable'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/make-header-dependency'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'cb/assume-unchanged-fix'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/notes-doc'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'wp/pretty-enhancement'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'ab/test-cleanup'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'jn/maint-amend-missing-name'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'rs/diff-no-minimal'	blob \| diff \| raw \| diff to current
2010-06-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-06-01	Merge branch 'maint-1.7.0' into maint	blob \| diff \| raw \| diff to current
2010-05-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
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 \| diff to current
2010-05-21	Merge branch 'by/blame-doc-m-c'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'by/log-follow'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'mg/advice-statushints'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'cb/maint-stash-orphaned-file'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/maint-bundle'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'pb/patch-id-plus'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'rr/doc-submitting'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'st/remote-tags-no-tags'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/fsck-ident'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/gitweb-caching-prep'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/gitweb-install'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/gitweb-our-squelch'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/request-pull'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/shortlog'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/t7006-fixup'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'js/maint-receive-pack-symref-alias'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'sp/maint-dumb-http-pack-reidx'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/submodule-basic-test'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'np/index-pack-memsave'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/am-3-show-corrupted-patch'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/maint-no-reflog-expire-unreach-for...	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'cw/maint-exec-defpath'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'tr/word-diff'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/status-show-ignored'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'np/malloc-threading'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'sr/remote-helper-export'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'ld/discovery-limit-to-fs' (early part)	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'ar/config-from-command-line'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'em/checkout-orphan'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-05-10	merge: --log appends shortlog to message if specified	blob \| diff \| raw \| diff to current
2010-05-10	merge: rename variable	blob \| diff \| raw \| diff to current
2010-05-10	merge: update comment	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'bg/apply-blank-trailing-context'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'bg/send-email-smtpdomain'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'rc/ls-remote-default'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'rc/maint-curl-helper'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'hg/maint-attr-fix'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'eb/unpretty-b-format'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'ab/commit-empty-message'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'jc/test-sleepless'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'jc/maint-reflog-expire-unreachable'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'sd/log-decorate'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'mh/status-optionally-refresh'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'cw/ws-indent-with-tab'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'cc/revert-strategy'	blob \| diff \| raw \| diff to current
next