Andrew's git - gitweb.git/history

[gitweb.git] / builtin-merge.c

2009-03-26	Merge branch 'jc/maint-1.6.0-blame-s'	blob \| diff \| raw
2009-03-26	Merge branch 'mg/http-auth'	blob \| diff \| raw
2009-03-26	Merge branch 'jk/reflog-date'	blob \| diff \| raw
2009-03-26	Merge branch 'jc/attributes-checkout'	blob \| diff \| raw
2009-03-26	Merge branch 'js/maint-diff-temp-smudge'	blob \| diff \| raw
2009-03-26	Merge branch 'js/maint-1.6.0-exec-path-env'	blob \| diff \| raw
2009-03-26	Merge branch 'bc/maint-1.6.1-branch-deleted-was'	blob \| diff \| raw
2009-03-26	Merge branch 'fg/push-default'	blob \| diff \| raw
2009-03-26	Merge branch 'dm/maint-docco'	blob \| diff \| raw
2009-03-25	Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t	blob \| diff \| raw
2009-03-25	Merge branch 'maint'	blob \| diff \| raw
2009-03-24	Merge branch 'maint-1.6.1' into maint	blob \| diff \| raw \| diff to current
2009-03-24	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-03-24	Merge branch 'js/windows-tests'	blob \| diff \| raw
2009-03-22	Merge branch 'maint'	blob \| diff \| raw
2009-03-22	Merge branch 'maint-1.6.1' into maint	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'dm/maint-docco'	blob \| diff \| raw
2009-03-22	Merge branch 'mg/test-installed'	blob \| diff \| raw
2009-03-22	Sync with maint	blob \| diff \| raw
2009-03-22	Merge branch 'maint-1.6.1' into maint	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'tr/maint-1.6.0-send-email-irt' into maint	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'mg/maint-submodule-normalize-path' into...	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'js/maint-1.6.0-path-normalize' into maint...	blob \| diff \| raw \| diff to current
2009-03-22	Merge branch 'jc/maint-1.6.0-pack-directory' into maint...	blob \| diff \| raw \| diff to current
2009-03-20	Merge branch 'maint'	blob \| diff \| raw
2009-03-20	Merge branch 'mv/parseopt-ls-files'	blob \| diff \| raw
2009-03-20	Merge branch 'fc/parseopt-config'	blob \| diff \| raw \| diff to current
2009-03-18	Merge branch 'jc/maint-1.6.0-read-tree-overlay'	blob \| diff \| raw \| diff to current
2009-03-18	Merge branch 'tr/maint-1.6.0-send-email-irt'	blob \| diff \| raw \| diff to current
2009-03-18	Merge branch 'kb/checkout-optim'	blob \| diff \| raw \| diff to current
2009-03-13	Merge branch 'maint-1.6.1' into maint	blob \| diff \| raw \| diff to current
2009-03-13	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| diff \| raw \| diff to current
2009-03-13	Merge branch 'js/maint-1.6.1-remote-remove-mirror'...	blob \| diff \| raw \| diff to current
2009-03-13	Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...	blob \| diff \| raw \| diff to current
2009-03-11	Merge branch 'js/maint-send-email' into maint	blob \| diff \| raw \| diff to current
2009-03-11	Merge branch 'fg/maint-exclude-bq' into maint	blob \| diff \| raw \| diff to current
2009-03-11	Merge branch 'en/maint-hash-object' into maint	blob \| diff \| raw \| diff to current
2009-03-11	Merge branch 'mg/maint-submodule-normalize-path'	blob \| diff \| raw \| diff to current
2009-03-11	Merge branch 'jc/maint-1.6.0-keep-pack'	blob \| diff \| raw \| diff to current
2009-03-08	Merge branch 'maint-1.6.1' into maint	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'en/maint-hash-object'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'jc/blame'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'fc/config-editor'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'js/send-email'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'sg/rerere-cleanup'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'jw/imap-preformatted-html'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'jw/format-patch-attach'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'sr/force-rebase'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'fg/exclude-bq'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'dm/add-i-edit-abort'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'tp/completion'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'js/branch-symref'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'al/ansi-color'	blob \| diff \| raw \| diff to current
2009-03-05	Merge branch 'js/valgrind'	blob \| diff \| raw \| diff to current
2009-03-02	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2009-03-01	Merge branch 'jc/maint-1.6.0-pack-directory'	blob \| diff \| raw \| diff to current
2009-02-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-28	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-28	Merge branch 'cc/maint-1.6.0-bisect-fix'	blob \| diff \| raw \| diff to current
2009-02-27	Merge branch 'cc/maint-1.6.0-bisect-fix'	blob \| diff \| raw \| diff to current
2009-02-25	Merge branch 'jc/maint-1.6.0-pack-directory'	blob \| diff \| raw \| diff to current
2009-02-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-18	Turn the flags in struct dir_struct into a single variable	blob \| diff \| raw
2009-02-15	Merge branch 'mc/setup-cd-p'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'ff/submodule-no-fetch'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'ms/mailmap'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'jn/gitweb-committag'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'rc/http-push'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'js/gc-prune'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'tr/abbrev-commit-no-ellipses'	blob \| diff \| raw \| diff to current
2009-02-15	Merge branch 'jc/branch-previous'	blob \| diff \| raw \| diff to current
2009-02-14	Teach @{-1} to git merge	blob \| diff \| raw \| diff to current
2009-02-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-12	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-11	Merge branch 'maint-1.5.6' into maint	blob \| diff \| raw \| diff to current
2009-02-11	Merge branch 'js/maint-1.6.0-path-normalize'	blob \| diff \| raw \| diff to current
2009-02-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-10	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-07	Merge branch 'tr/add-p-single'	blob \| diff \| raw \| diff to current
2009-02-07	Merge branch 'js/filter-branch-submodule'	blob \| diff \| raw \| diff to current
2009-02-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'js/maint-remote-remove-mirror'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'js/notes'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'jc/refuse-push-to-current'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'rc/http-push'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'gt/utf8-width'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'jk/head-symref'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'cb/mergetool'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'sg/maint-gitdir-in-subdir' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'lt/maint-wrap-zlib' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'js/maint-all-implies-HEAD' into maint	blob \| diff \| raw \| diff to current
2009-02-06	Merge branch 'kc/maint-diff-bwi-fix' into maint	blob \| diff \| raw \| diff to current
2009-02-05	Merge branch 'jc/fsck' (early part)	blob \| diff \| raw \| diff to current
next