Merge branch 'gb/maint-am-stgit-author-to-from-fix'
[gitweb.git] / builtin / merge.c
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
2011-09-02 Merge branch 'ms/daemon-timeout-is-in-seconds'
2011-09-02 Merge branch 'bg/t5540-osx-grep'
2011-09-02 Merge branch 'jc/clean-exclude-doc'
2011-09-02 Merge branch 'mg/maint-notes-C-doc'
2011-09-02 Merge branch 'fg/submodule-ff-check-before-push'
2011-09-02 Merge branch 'rc/diff-cleanup-records'
2011-09-02 Merge branch 'fk/use-kwset-pickaxe-grep-f'
2011-09-02 Merge branch 'en/merge-recursive-2'
2011-08-30 Merge branch 'maint'
2011-08-29 Merge branch 'nd/decorate-grafts'
2011-08-29 Merge branch 'nd/maint-clone-gitdir'
2011-08-29 Merge branch 'ci/forbid-unwanted-current-branch-update'
2011-08-29 Merge branch 'jk/pager-with-external-command'
2011-08-29 Merge branch 'jc/maint-clone-alternates'
2011-08-29 Merge branch 'jk/color-and-pager'
2011-08-29 Merge branch 'mh/attr'
2011-08-29 Merge branch 'di/fast-import-tagging'
2011-08-29 Merge branch 'di/fast-import-blob-tweak'
2011-08-29 Merge branch 'di/fast-import-deltified-tree'
2011-08-29 Merge branch 'di/fast-import-ident'
2011-08-29 Merge branch 'bw/doc-repo-layout'
2011-08-29 Merge branch 'va/p4-branch-import'
2011-08-29 Merge branch 'jc/combine-diff-callback'
2011-08-29 Merge branch 'nk/branch-v-abbrev'
2011-08-25 Merge branch 'jc/merge-reword'
2011-08-25 Merge branch 'jn/plug-empty-tree-leak'
2011-08-23 Merge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-19 want_color: automatically fallback to color.ui
2011-08-18 diff: refactor COLOR_DIFF from a flag into an int
2011-08-18 Merge branch 'js/ref-namespaces'
2011-08-18 Merge branch 'jc/maint-combined-diff-work-tree'
2011-08-16 Merge branch 'jk/tag-list-multiple-patterns' into maint
2011-08-16 Merge branch 'jl/submodule-add-relurl-wo-upstream'...
2011-08-16 Merge branch 'jk/fast-export-quote-path' into maint
2011-08-16 Merge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-08-16 Merge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16 Merge branch 'jc/zlib-wrap' into maint
2011-08-16 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-16 Merge branch 'jc/diff-index-quick-exit-early' into...
2011-08-16 Merge branch 'jk/combine-diff-binary-etc' into maint
2011-08-11 Merge branch 'jk/fast-export-quote-path'
2011-08-11 Merge branch 'rc/maint-http-wrong-free'
2011-08-01 Merge branch 'jk/clone-detached'
2011-08-01 Merge branch 'jc/streaming-filter'
2011-08-01 Merge branch 'nk/ref-doc' into maint
2011-08-01 Merge branch 'jl/maint-fetch-recursive-fix' into maint
2011-08-01 Merge branch 'jc/maint-cygwin-trust-executable-bit...
2011-08-01 Merge branch 'jc/legacy-loose-object' into maint
2011-08-01 Merge branch 'an/shallow-doc' into maint
2011-08-01 Merge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-22 Merge branch 'dc/stash-con-untracked'
2011-07-22 Merge branch 'jk/tag-contains-ab'
2011-07-22 Merge branch 'bw/log-all-ref-updates-doc'
2011-07-22 Merge branch 'js/maint-add-path-stat-pwd'
2011-07-22 Merge branch 'jn/gitweb-search'
2011-07-22 Merge branch 'jl/submodule-add-relurl-wo-upstream'
2011-07-19 Merge branch 'jc/index-pack'
2011-07-19 Merge branch 'jn/mime-type-with-params'
2011-07-19 Merge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-19 Merge branch 'jk/clone-cmdline-config'
2011-07-19 Merge branch 'jk/maint-config-param'
2011-07-19 Merge branch 'jk/tag-list-multiple-patterns'
2011-07-19 Merge branch 'jc/zlib-wrap'
2011-07-13 Merge branch 'js/rebase-typo-branch-squelch-usage'
2011-07-13 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13 Merge branch 'nk/ref-doc'
2011-07-13 Merge branch 'jl/maint-fetch-recursive-fix'
2011-07-13 Merge branch 'jc/maint-cygwin-trust-executable-bit...
2011-07-13 Merge branch 'md/interix-update'
2011-07-13 Merge branch 'ln/gitweb-mime-types-split-at-blank'
2011-07-13 Merge branch 'jc/legacy-loose-object'
2011-07-13 Merge branch 'an/shallow-doc'
2011-07-06 Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-06-30 Merge branch 'jc/streaming-filter' into next
2011-06-30 Merge branch 'jn/gitweb-js-blame' into next
2011-06-30 Merge branch 'da/git-prefix-everywhere' into next
2011-06-30 Merge branch 'jc/streaming' into next
2011-06-30 Merge branch 'ab/i18n-scripts' into next
2011-06-30 Merge branch 'ef/maint-win-verify-path'
2011-06-30 Merge branch 'js/i18n-windows'
2011-06-30 Merge branch 'jc/maint-1.7.3-checkout-describe'
2011-06-30 Merge branch 'jk/maint-1.7.2-status-ignored'
2011-06-30 Merge branch 'jc/diff-index-quick-exit-early'
2011-06-30 Merge branch 'mg/diff-stat-count'
2011-06-30 Merge branch 'jc/advice-about-to-lose-commit'
2011-06-30 Merge branch 'jk/combine-diff-binary-etc'
2011-06-29 Merge branch 'maint-1.7.5' into maint
2011-06-29 Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
2011-06-26 Merge branch 'maint'
2011-06-24 Merge branch 'maint-1.7.4' into maint
2011-06-22 Merge branch 'maint'
2011-06-21 Merge branch 'maint'
2011-06-20 Merge branch 'mk/grep-pcre'
2011-06-19 Merge branch 'maint'
2011-06-17 Merge branch 'ab/i18n-scripts-basic'
2011-06-09 Merge branch 'maint'
next