Andrew's git - gitweb.git/history

[gitweb.git] / merge.c

2012-11-20	Merge branch 'jk/checkout-out-of-unborn'	blob \| diff \| raw
2012-11-20	Merge branch 'cn/config-missing-path'	blob \| diff \| raw
2012-11-20	Merge branch 'jl/submodule-rm'	blob \| diff \| raw
2012-11-20	Merge branch 'jk/maint-gitweb-xss'	blob \| diff \| raw
2012-11-20	Merge branch 'rh/maint-gitweb-highlight-ext'	blob \| diff \| raw
2012-11-20	Merge branch 'pw/maint-p4-rcs-expansion-newline'	blob \| diff \| raw
2012-11-20	Merge branch 'mh/alt-odb-string-list-cleanup'	blob \| diff \| raw
2012-11-20	Merge branch 'ta/doc-cleanup'	blob \| diff \| raw
2012-11-20	Merge branch 'kb/preload-index-more'	blob \| diff \| raw
2012-11-20	Merge branch 'jk/maint-http-half-auth-fetch'	blob \| diff \| raw
2012-11-20	Sync with maint	blob \| diff \| raw
2012-11-19	Sync with maint	blob \| diff \| raw
2012-11-15	Merge branch 'jc/prettier-pretty-note'	blob \| diff \| raw
2012-11-15	Merge branch 'mg/maint-pull-suggest-upstream-to'	blob \| diff \| raw
2012-11-15	Merge branch 'mh/notes-string-list'	blob \| diff \| raw
2012-11-15	Merge branch 'mh/strbuf-split'	blob \| diff \| raw
2012-11-15	Merge branch 'mm/maint-doc-commit-edit'	blob \| diff \| raw
2012-11-15	Merge branch 'as/maint-doc-fix-no-post-rewrite'	blob \| diff \| raw
2012-11-15	Merge branch 'js/hp-nonstop'	blob \| diff \| raw
2012-11-15	Merge branch 'cr/cvsimport-local-zone'	blob \| diff \| raw
2012-11-15	Merge branch 'jc/same-encoding'	blob \| diff \| raw
2012-11-15	Merge branch 'ph/submodule-sync-recursive'	blob \| diff \| raw
2012-11-15	Merge branch 'jk/maint-diff-grep-textconv'	blob \| diff \| raw
2012-11-15	Merge branch 'jh/symbolic-ref-d'	blob \| diff \| raw
2012-11-15	Merge branch 'jc/maint-fetch-tighten-refname-check'	blob \| diff \| raw
2012-11-09	Merge branch 'ph/maint-submodule-status-fix'	blob \| diff \| raw
2012-11-09	Merge branch 'nd/builtin-to-libgit'	blob \| diff \| raw
2012-10-29	Move try_merge_command and checkout_fast_forward to...	blob \| diff \| raw