Merge branch 'bg/apply-doc'
[gitweb.git] / builtin-merge.c
2009-11-24 Merge branch 'mm/maint-hint-failed-merge'
2009-11-24 Merge branch 'jc/log-stdin'
2009-11-24 Merge branch 'mr/gitweb-snapshot'
2009-11-24 Merge branch 'maint'
2009-11-23 Merge branch 'bg/fetch-multi'
2009-11-23 Merge branch 'maint'
2009-11-23 Merge branch 'th/maint-remote-update-help-string'
2009-11-23 Merge branch 'jn/faster-completion-startup'
2009-11-23 Merge branch 'rj/maint-t9700'
2009-11-23 Merge branch 'ls/maint-mailinfo-no-inbody'
2009-11-23 Merge branch 'mo/maint-crlf-doc'
2009-11-23 Merge branch 'th/remote-usage'
2009-11-23 Merge branch 'pb/maint-use-custom-perl'
2009-11-23 Merge branch 'mm/config-pathname-tilde-expand'
2009-11-23 Merge branch 'bc/grep-i-F'
2009-11-23 Merge branch 'jk/maint-break-rename-reduce-memory'
2009-11-23 Merge branch 'tr/maint-merge-ours-clarification' (early...
2009-11-21 Merge branch 'jc/fix-tree-walk' (early part)
2009-11-21 Merge branch 'jh/notes' (early part)
2009-11-21 Merge branch 'sp/smart-http'
2009-11-21 Merge branch 'bw/autoconf-more'
2009-11-21 Merge branch 'jn/editor-pager'
2009-11-21 Merge branch 'rj/cygwin-msvc'
2009-11-21 Merge branch 'rj/maint-simplify-cygwin-makefile'
2009-11-21 Merge branch 'bg/format-patch-doc-update'
2009-11-21 Merge branch 'tr/filter-branch'
2009-11-21 Merge branch 'sc/protocol-doc'
2009-11-21 Merge branch 'jl/submodule-add-noname'
2009-11-21 Merge branch 'sb/ls-tree-parseopt'
2009-11-21 Merge branch 'rg/doc-workflow'
2009-11-21 Merge branch 'jn/gitweb-log-history'
2009-11-21 Merge branch 'jn/help-everywhere'
2009-11-21 Merge branch 'jp/fetch-cull-many-refs'
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-18 Merge branch 'sb/tutorial-test'
2009-11-18 Merge branch 'ef/msys-imap'
2009-11-17 Merge git://git.bogomips.org/git-svn
2009-11-16 Sync with 1.6.5.3
2009-11-16 Merge branch 'bs/maint-pre-commit-hook-sample' into...
2009-11-16 Merge branch 'jk/maint-add-p-empty' into maint
2009-11-16 Merge branch 'js/maint-diff-color-words' into maint
2009-11-16 Merge branch 'tz/maint-rpm' into maint
2009-11-16 Merge branch 'jk/maint-format-patch-p-suppress-stat...
2009-11-16 Merge branch 'pb/maint-gitweb-blob-lineno' into maint
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Merge branch 'vl/maint-openssl-signature-change' into...
2009-11-16 Merge branch 'jk/maint-push-config' into maint
2009-11-16 Merge branch 'sr/blame-incomplete' into maint
2009-11-16 Merge branch 'jc/maint-blank-at-eof' into maint
2009-11-16 Merge branch 'maint'
2009-11-16 Merge branch 'bs/maint-pre-commit-hook-sample'
2009-11-16 Merge branch 'js/maint-diff-color-words'
2009-11-16 Merge branch 'rs/pretty-wrap'
2009-11-16 Merge branch 'js/log-rewrap'
2009-11-16 Merge branch 'fc/doc-fast-forward'
2009-11-16 Merge branch 'sc/difftool-p4merge'
2009-11-16 Merge branch 'jk/maint-add-p-empty'
2009-11-16 Merge branch 'lt/revision-bisect'
2009-11-16 Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-11-16 Merge branch 'ja/fetch-doc' into maint
2009-11-16 Merge branch 'cb/doc-fetch-pull-merge' into maint
2009-11-16 Merge branch 'jk/maint-cvsimport-pathname' into maint
2009-11-16 Merge branch 'jc/receive-pack-auto' into maint
2009-11-16 Merge branch 'gb/maint-gitweb-esc-param' into maint
2009-11-16 Merge branch 'jn/gitweb-patch' into maint
2009-11-15 Merge branch 'maint'
2009-11-11 Merge branch 'maint'
2009-11-10 Merge branch 'maint'
2009-11-10 Merge branch 'jk/maint-format-patch-p-suppress-stat'
2009-11-10 Merge branch 'pb/maint-gitweb-blob-lineno'
2009-11-10 Merge branch 'tr/describe-advice'
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-11-10 Merge branch 'bg/merge-ff-only'
2009-11-10 Merge branch 'vl/maint-openssl-signature-change'
2009-11-10 Merge branch 'jk/maint-push-config'
2009-11-10 Merge branch 'jk/gitignore-anchored'
2009-11-10 Merge branch 'jp/dirty-describe'
2009-11-10 Merge branch 'sr/blame-incomplete'
2009-11-10 Merge branch 'jn/maint-http-fetch-mingw' into jn/help...
2009-11-10 merge: do not setup worktree twice
2009-11-09 Merge branch 'maint'
2009-11-07 Merge branch 'jc/commit-s-subject-is-not-a-footer'
2009-11-05 Merge branch 'maint'
2009-11-02 Merge branch 'jn/show-normalized-refs'
2009-11-02 Merge branch 'maint'
2009-10-31 fixup tr/stash-format merge
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-30 Teach 'git merge' and 'git pull' the option --ff-only
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-25 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-25 Use 'fast-forward' all over the place
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-20 Refactor pretty_print_commit arguments into a struct
next