Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.h

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 'sc/http-late-auth'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'jk/cached-textconv'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'pc/remove-warn'	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-23	Merge branch 'jk/maint-diffstat-overflow' into maint	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 'maint-1.6.6' into 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-11	Merge branch 'rc/maint-reflog-msg-for-forced-branch...	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'mr/gitweb-jsmin'	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 'jc/conflict-marker-size' into maint	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'mg/maint-send-email-lazy-editor' into...	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 early parts of jk/cached-textconv	blob \| diff \| raw \| diff to current
2010-04-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2010-04-07	Merge branch 'mg/notes-reflog'	blob \| diff \| raw \| diff to current
2010-04-07	Merge branch 'jn/mailinfo-scissors'	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 'ic/bash-completion-rpm'	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-01	merge: make function try_merge_command non static	blob \| diff \| raw
2010-03-31	Merge branch 'jc/maint-refs-dangling' into maint	blob \| diff \| raw \| diff to current
2010-03-29	Merge branch 'cp/add-u-pathspec' into maint	blob \| diff \| raw \| diff to current
2010-03-24	Merge branch 'jc/maint-refs-dangling'	blob \| diff \| raw \| diff to current
2010-03-24	Merge branch 'jc/color-attrs' into maint	blob \| diff \| raw \| diff to current
2010-03-24	Merge branch 'jk/maint-add-ignored-dir' into maint	blob \| diff \| raw \| diff to current
2010-03-22	Merge branch 'maint-1.6.6' into maint	blob \| diff \| raw \| diff to current
2010-03-21	merge_trees(): add ancestor label parameter for diff3...	blob \| diff \| raw \| diff to current
2010-03-20	Merge branch 'jk/maint-add-ignored-dir'	blob \| diff \| raw \| diff to current
2010-03-20	Merge branch 'jc/color-attrs'	blob \| diff \| raw \| diff to current
2010-03-10	Merge branch 'cp/add-u-pathspec'	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'fn/maint-mkdtemp-compat' into maint	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'jk/maint-push-tracking-wo-remote' into...	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'jk/maint-add--interactive-delete' into...	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'jc/grep-author-all-match-implicit' into...	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'maint-1.6.6' into maint	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'rs/optim-text-wrap' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'tr/maint-cherry-pick-list' into maint...	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'fn/maint-mkdtemp-compat'	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jk/maint-push-tracking-wo-remote'	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'nd/root-git'	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jk/maint-add--interactive-delete'	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'tr/maint-cherry-pick-list' into maint	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'rs/optim-text-wrap' into maint	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'gf/maint-sh-setup-nongit-ok' into maint	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'cc/maint-bisect-paths' into maint	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'maint-1.6.6' into maint	blob \| diff \| raw \| diff to current
2010-03-03	Merge branch 'hm/maint-imap-send-crlf' into maint	blob \| diff \| raw \| diff to current
2010-03-03	Merge branch 'sp/maint-push-sideband' into maint	blob \| diff \| raw \| diff to current
2010-03-03	Merge branch 'jc/maint-fix-test-perm' into maint	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'tr/maint-cherry-pick-list'	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'rs/optim-text-wrap'	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'gf/maint-sh-setup-nongit-ok'	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'jc/grep-author-all-match-implicit'	blob \| diff \| raw \| diff to current
2010-03-01	Merge branch 'cc/maint-bisect-paths'	blob \| diff \| raw \| diff to current
2010-02-26	Merge branch 'maint-1.6.6' into maint	blob \| diff \| raw \| diff to current
2010-02-24	Merge branch 'ml/maint-grep-doc' into maint	blob \| diff \| raw \| diff to current
2010-02-23	Merge branch 'il/rev-glob'	blob \| diff \| raw \| diff to current
2010-02-21	Merge branch 'ml/maint-grep-doc'	blob \| diff \| raw \| diff to current
2010-02-21	Merge branch 'hm/maint-imap-send-crlf'	blob \| diff \| raw \| diff to current
next