Code

gitweb: Fix unintended "--no-merges" for regular Atom feed
[git.git] / merge-recursive.c
2012-04-10 Junio C HamanoMerge branch 'maint-1.7.9' into maint
2012-04-10 Junio C HamanoMerge branch 'maint-1.7.8' into maint-1.7.9
2012-04-10 David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Junio C HamanoMerge branch 'jc/maint-verify-objects-remove-pessimism...
2012-04-09 Junio C HamanoMerge branch 'dw/gitweb-doc-grammo' into maint-1.7.8
2012-04-09 Junio C HamanoMerge branch 'tr/cache-tree' into maint-1.7.8
2012-04-09 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Junio C HamanoMerge branch 'pt/gitk'
2012-04-02 Junio C HamanoSync with 1.7.9.6
2012-03-31 Junio C HamanoMerge branch 'maint'
2012-03-26 Junio C HamanoSync with 1.7.9.5
2012-03-26 Junio C HamanoMerge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-26 Junio C HamanoMerge branch 'ph/rerere-doc' into maint
2012-03-26 Junio C HamanoMerge branch 'ms/maint-config-error-at-eol-linecount...
2012-03-24 Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-23 Junio C HamanoMerge branch 'am/completion-zsh-fix'
2012-03-23 Junio C HamanoMerge branch 'dw/gitweb-doc-grammo'
2012-03-20 Junio C HamanoMerge branch 'maint'
2012-03-20 Junio C HamanoMerge branch 'maint-1.7.8' into maint
2012-03-16 Junio C HamanoMerge branch 'ab/perl-i18n'
2012-03-16 Junio C HamanoMerge branch 'jc/maint-verify-objects-remove-pessimism'
2012-03-16 Junio C HamanoMerge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-03-13 Junio C HamanoMerge branch 'jc/maint-undefined-i18n-observation-test'
2012-03-13 Junio C HamanoMerge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-13 Junio C HamanoMerge branch 'ph/rerere-doc'
2012-03-12 Junio C HamanoMerge branch 'az/verify-tag-use-gpg-config'
2012-03-12 Junio C HamanoSync with 1.7.9.4
2012-03-12 Junio C HamanoMerge branch 'tr/maint-bundle-boundary' into maint
2012-03-12 Junio C HamanoMerge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-12 Junio C HamanoMerge branch 'jc/am-3-nonstandard-popt' into maint
2012-03-08 Junio C HamanoMerge branch 'kb/maint-prune-rmdir-closedir'
2012-03-08 Junio C HamanoMerge branch 'jl/maint-submodule-relative'
2012-03-08 Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Junio C HamanoMerge branch 'vr/branch-doc'
2012-03-07 Junio C HamanoMerge branch 'jc/pickaxe-ignore-case'
2012-03-06 Junio C HamanoMerge branch 'jh/threadable-symlink-check'
2012-03-06 Junio C HamanoMerge branch 'jc/maint-diff-patch-header'
2012-03-06 Junio C HamanoMerge branch 'sl/modern-t0000'
2012-03-06 Junio C HamanoMerge branch 'tr/maint-bundle-boundary'
2012-03-06 Junio C HamanoMerge branch 'zj/diff-stat-dyncol'
2012-03-06 Junio C HamanoMerge branch 'maint'
2012-03-06 Junio C HamanoMerge branch 'maint-1.7.8' into maint
2012-03-06 Junio C HamanoMerge branch 'maint-1.7.7' into maint-1.7.8
2012-03-05 Junio C HamanoSync with 1.7.9.3
2012-03-05 Junio C HamanoMerge branch 'jc/doc-merge-options' into maint
2012-03-05 Junio C HamanoMerge branch 'cn/maint-rev-list-doc' into maint
2012-03-05 Junio C HamanoMerge branch 'jc/am-3-nonstandard-popt'
2012-03-05 Junio C HamanoMerge branch 'maint'
2012-03-05 Junio C HamanoMerge branch 'cn/maint-branch-with-bad' into maint
2012-03-05 Junio C HamanoMerge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Junio C HamanoMerge branch 'nd/maint-verify-objects' into maint
2012-03-05 Junio C HamanoMerge branch 'jk/maint-avoid-streaming-filtered-content...
2012-03-05 Junio C HamanoMerge branch 'jb/filter-ignore-sigpipe' into maint
2012-03-05 Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-03-05 Junio C HamanoMerge branch 'tr/maint-bundle-long-subject' into maint
2012-03-02 Junio C HamanoMerge branch 'maint'
2012-03-02 Junio C HamanoMerge branch 'rs/no-no-no-parseopt'
2012-03-01 Junio C HamanoMerge branch 'maint'
2012-03-01 Junio C HamanoMerge branch 'nd/maint-verify-objects'
2012-03-01 Junio C HamanoMerge branch 'jn/maint-gitweb-invalid-regexp'
2012-03-01 Junio C HamanoMerge branch 'cn/maint-rev-list-doc'
2012-03-01 Junio C HamanoMerge branch 'cn/maint-branch-with-bad'
2012-02-28 Junio C HamanoMerge branch 'pj/completion-remote-set-url-branches'
2012-02-28 Junio C HamanoMerge branch 'ph/cherry-pick-advice-refinement'
2012-02-28 Jiang XinMerge branch 'master' into git-po
2012-02-27 Junio C HamanoMerge branch 'maint'
2012-02-27 Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Junio C HamanoMerge branch 'jn/ancient-meld-support' into maint
2012-02-27 Junio C HamanoMerge branch 'tr/maint-bundle-long-subject'
2012-02-27 Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-02-27 Junio C HamanoMerge branch 'jc/doc-merge-options'
2012-02-27 Junio C HamanoMerge branch 'jk/maint-avoid-streaming-filtered-contents'
2012-02-27 Junio C HamanoMerge branch 'jb/filter-ignore-sigpipe'
2012-02-27 Junio C HamanoMerge branch 'maint'
2012-02-27 Junio C HamanoSync with 1.7.8.5
2012-02-25 Junio C HamanoMerge branches zj/decimal-width, zj/term-columns and...
2012-02-23 Junio C HamanoMerge branch 'ld/git-p4-expanded-keywords'
2012-02-23 Junio C HamanoMerge branch 'jk/config-include'
2012-02-23 Junio C HamanoMerge branch 'jc/add-refresh-unmerged'
2012-02-23 Junio C HamanoMerge branch 'js/configure-libintl'
2012-02-23 Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2012-02-23 Junio C HamanoMerge branch 'maint'
2012-02-23 Junio C HamanoSync with 1.7.9.2
2012-02-21 Junio C HamanoMerge branch 'jn/gitweb-unborn-head'
2012-02-21 Junio C HamanoMerge branch 'maint'
2012-02-21 Junio C HamanoMerge branch 'cb/receive-pack-keep-errors' into maint
2012-02-21 Junio C HamanoMerge branch 'jk/git-dir-lookup' into maint
2012-02-21 Junio C HamanoMerge branch 'jc/diff-stat-scaler' into maint
2012-02-21 Junio C HamanoMerge branch 'zj/term-columns' into maint
2012-02-21 Junio C HamanoMerge branch 'cb/maint-rev-list-verify-object' into...
2012-02-21 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Junio C HamanoMerge branch 'tg/tag-points-at'
2012-02-20 Junio C HamanoMerge branch 'jc/diff-stat-scaler'
2012-02-20 Junio C HamanoMerge branch 'zj/decimal-width'
2012-02-20 Junio C HamanoMerge branch 'zj/term-columns'
2012-02-20 Junio C HamanoMerge branch 'cb/transfer-no-progress'
2012-02-20 Junio C HamanoMerge branch 'cb/receive-pack-keep-errors'
2012-02-20 Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable'
next