gitweb: make the supported snapshot formats array global
[gitweb.git] / builtin-merge.c
2008-10-21 Merge branch 'maint'
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-19 Merge branch 'sh/maint-rebase3'
2008-10-19 Merge branch 'tr/workflow-doc'
2008-10-19 Merge branch 'mv/clonev'
2008-10-19 Merge branch 'ml/cygwin-filemode'
2008-10-19 Merge branch 'gb/refactor-pathinfo'
2008-10-19 Merge branch 'dp/checkattr'
2008-10-19 Merge branch 'gb/formatpatch-autonbr'
2008-10-19 Merge branch 'sp/describe-lwtag'
2008-10-19 Merge branch 'ae/preservemerge'
2008-10-19 Merge branch 'mv/merge-noff'
2008-10-19 Merge branch 'ns/rebase-noverify'
2008-10-19 Merge branch 'maint'
2008-10-18 Merge branch 'maint'
2008-10-18 Merge branch 'db/maint-checkout-b' into maint
2008-10-18 Merge branch 'pb/commit-where'
2008-10-17 Merge branch 'maint'
2008-10-13 Merge branch 'maint'
2008-10-12 Merge branch 'maint'
2008-10-12 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT...
2008-10-10 Merge branch 'maint'
2008-10-09 Merge branch 'js/objc-funchdr'
2008-10-09 Merge branch 'pb/gitweb'
2008-10-09 Merge branch 'dm/svn-branch'
2008-10-09 Merge branch 'bc/xdiffnl'
2008-10-09 Merge branch 'dp/cywginstat'
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Merge branch 'jc/add-ita'
2008-10-09 Merge branch 'mw/sendemail'
2008-10-09 Merge branch 'mv/merge-refresh'
2008-10-09 Merge branch 'ph/parseopt'
2008-10-09 Merge branch 'rz/grepz'
2008-10-09 Merge branch 'mg/verboseprune'
2008-10-09 Merge branch 'maint'
2008-10-09 Merge branch 'sg/maint-intrebase-msghook' into maint
2008-10-09 Merge branch 'jk/maint-soliconv' into maint
2008-10-09 builtin-merge.c: allocate correct amount of memory
2008-10-08 Merge branch 'maint'
2008-10-08 Replace xmalloc/memset(0) pairs with xcalloc
2008-10-06 Merge branch 'maint'
2008-10-03 builtin-commit: use reduce_heads() only when appropriate
2008-10-03 builtin-merge: refresh the index before calling a strategy
2008-10-03 Merge branch 'maint'
2008-10-01 Merge branch 'maint'
2008-09-30 Merge branch 'maint'
2008-09-29 Merge branch 'bc/master-diff-hunk-header-fix'
2008-09-29 Merge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-29 Merge branch 'bc/maint-diff-hunk-header-fix' into maint
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-29 Merge branch 'mg/maint-remote-fix' into maint
2008-09-26 Merge branch 'maint'
2008-09-25 Merge branch 'mv/merge-recursive'
2008-09-25 Merge branch 'jc/alternate-push'
2008-09-25 Merge branch 'am/status'
2008-09-25 Merge branch 'pb/autocorrect-wrapper'
2008-09-25 Merge branch 'mv/commit-tree'
2008-09-25 Merge branch 'jc/apply-include-exclude'
2008-09-25 Merge branch 'jc/safe-c-l-d'
2008-09-25 Merge branch 'ho/dirstat-by-file'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-25 Merge branch 'maint'
2008-09-24 maint: check return of split_cmdline to avoid bad confi...
2008-09-23 Merge branch 'maint'
2008-09-23 Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-22 Merge branch 'maint'
2008-09-22 Merge branch 'db/maint-checkout-b'
2008-09-21 Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-20 Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-20 Merge branch 'maint'
2008-09-19 Merge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-19 Merge branch 'maint'
2008-09-19 Merge branch 'jc/diff-prefix'
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-19 Merge branch 'cc/bisect'
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-16 Merge branch 'maint'
2008-09-16 Merge branch 'dp/maint-rebase-fix'
2008-09-16 Merge branch 'jc/maint-checkout-keep-remove'
2008-09-16 Merge branch 'jc/maint-diff-quiet'
2008-09-16 Merge branch 'jc/maint-name-hash-clear'
2008-09-16 Merge branch 'jc/maint-template-permbits'
2008-09-16 Merge branch 'mh/maint-honor-no-ssl-verify'
2008-09-13 Sync with 1.6.0.2
2008-09-10 commit_tree(): add a new author parameter
2008-09-10 Merge branch 'maint'
2008-09-10 Merge branch 'ho/dashless'
2008-09-08 Merge branch 'ar/autospell'
2008-09-08 Merge branch 'jc/cc-ld-dynpath'
2008-09-08 Merge branch 'jc/hide-cr-in-diff-from-less'
2008-09-08 Merge branch 'jc/maint-checkout-fix'
2008-09-07 builtin-merge: release the lockfile in try_merge_strategy()
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint'
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-05 Merge branch 'jc/maint-log-grep'
2008-09-03 Merge branch 'maint'
2008-09-03 Merge branch 'tr/filter-branch'
2008-09-03 Merge branch 'np/maint-safer-pack'
2008-09-03 Merge branch 'jc/author-nickname'
next