Merge branch 'lt/reflog-expire'
[git] / builtin-merge.c
2009-04-08  Junio C HamanoMerge branch 'lt/reflog-expire'
2009-04-08  Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08  Junio C HamanoMerge branch 'ms/http-auth'
2009-04-08  Junio C HamanoMerge branch 'js/maint-submodule-checkout'
2009-04-08  Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-08  Junio C HamanoMerge branch 'mh/html-path'
2009-04-06  Junio C HamanoMerge branch 'jc/name-branch'
2009-04-06  Junio C HamanoMerge branch 'jc/shared-literally'
2009-04-05  Junio C HamanoMerge branch 'maint'
2009-04-05  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-05  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02  Junio C HamanoSync with 1.6.2.2
2009-04-02  Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02  Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02  Junio C HamanoMerge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-02  Junio C HamanoMerge branch 'tr/maint-1.6.1-doc-format-patch--root...
2009-04-02  Junio C HamanoMerge branch 'tr/maint-1.6.1-doc-format-patch--root'
2009-04-02  Junio C HamanoMerge branch 'maint'
2009-04-02  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-02  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02  Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack'
2009-04-02  Junio C HamanoMerge branch 'kb/tracking-count-no-merges'
2009-03-30  Junio C HamanoMerge branch 'maint'
2009-03-30  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-30  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30  Junio C HamanoMerge branch 'maint'
2009-03-30  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-30  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-28  Junio C HamanoMerge branch 'maint'
2009-03-28  Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-28  Junio C HamanoMerge branch 'js/remote-improvements'
2009-03-28  Junio C HamanoMerge branch 'jk/clone-post-checkout'
2009-03-28  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-27  Junio C HamanoMerge branch 'db/push-cleanup'
2009-03-26  Junio C HamanoMerge branch 'maint'
2009-03-26  Junio C HamanoMerge branch 'db/push-cleanup'
2009-03-26  Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s'
2009-03-26  Junio C HamanoMerge branch 'mg/http-auth'
2009-03-26  Junio C HamanoMerge branch 'jk/reflog-date'
2009-03-26  Junio C HamanoMerge branch 'jc/attributes-checkout'
2009-03-26  Junio C HamanoMerge branch 'js/maint-diff-temp-smudge'
2009-03-26  Junio C HamanoMerge branch 'js/maint-1.6.0-exec-path-env'
2009-03-26  Junio C HamanoMerge branch 'bc/maint-1.6.1-branch-deleted-was'
2009-03-26  Junio C HamanoMerge branch 'fg/push-default'
2009-03-26  Junio C HamanoMerge branch 'dm/maint-docco'
2009-03-25  Junio C HamanoMerge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t
2009-03-25  Junio C HamanoMerge branch 'maint'
2009-03-24  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-24  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-24  Junio C HamanoMerge branch 'js/windows-tests'
2009-03-23  Junio C Hamanostrbuf_branchname(): a wrapper for branch name shorthands
2009-03-23  Junio C HamanoRename interpret/substitute nth_last_branch functions
2009-03-22  Junio C HamanoMerge branch 'maint'
2009-03-22  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-22  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22  Junio C HamanoMerge branch 'dm/maint-docco'
2009-03-22  Junio C HamanoMerge branch 'mg/test-installed'
2009-03-22  Junio C HamanoSync with maint
2009-03-22  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-22  Junio C HamanoMerge branch 'tr/maint-1.6.0-send-email-irt' into maint
2009-03-22  Junio C HamanoMerge branch 'mg/maint-submodule-normalize-path' into...
2009-03-22  Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-22  Junio C HamanoMerge branch 'js/maint-1.6.0-path-normalize' into maint...
2009-03-22  Junio C HamanoMerge branch 'jc/maint-1.6.0-pack-directory' into maint...
2009-03-20  Junio C HamanoMerge branch 'maint'
2009-03-20  Junio C HamanoMerge branch 'mv/parseopt-ls-files'
2009-03-20  Junio C HamanoMerge branch 'fc/parseopt-config'
2009-03-18  Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18  Junio C HamanoMerge branch 'tr/maint-1.6.0-send-email-irt'
2009-03-18  Junio C HamanoMerge branch 'kb/checkout-optim'
2009-03-13  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-13  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-03-13  Junio C HamanoMerge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13  Junio C HamanoMerge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-11  Junio C HamanoMerge branch 'js/maint-send-email' into maint
2009-03-11  Junio C HamanoMerge branch 'fg/maint-exclude-bq' into maint
2009-03-11  Junio C HamanoMerge branch 'en/maint-hash-object' into maint
2009-03-11  Junio C HamanoMerge branch 'mg/maint-submodule-normalize-path'
2009-03-11  Junio C HamanoMerge branch 'jc/maint-1.6.0-keep-pack'
2009-03-08  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-03-05  Junio C HamanoMerge branch 'en/maint-hash-object'
2009-03-05  Junio C HamanoMerge branch 'jc/blame'
2009-03-05  Junio C HamanoMerge branch 'fc/config-editor'
2009-03-05  Junio C HamanoMerge branch 'js/send-email'
2009-03-05  Junio C HamanoMerge branch 'sg/rerere-cleanup'
2009-03-05  Junio C HamanoMerge branch 'jw/imap-preformatted-html'
2009-03-05  Junio C HamanoMerge branch 'jw/format-patch-attach'
2009-03-05  Junio C HamanoMerge branch 'sr/force-rebase'
2009-03-05  Junio C HamanoMerge branch 'fg/exclude-bq'
2009-03-05  Junio C HamanoMerge branch 'dm/add-i-edit-abort'
2009-03-05  Junio C HamanoMerge branch 'tp/completion'
2009-03-05  Junio C HamanoMerge branch 'js/branch-symref'
2009-03-05  Junio C HamanoMerge branch 'al/ansi-color'
2009-03-05  Junio C HamanoMerge branch 'js/valgrind'
2009-03-02  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01  Junio C HamanoMerge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28  Junio C HamanoMerge branch 'maint'
2009-02-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-02-28  Junio C HamanoMerge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27  Junio C HamanoMerge branch 'cc/maint-1.6.0-bisect-fix'
next