Merge branch 'jm/maint-strncpy-diff-no-index'
[gitweb.git] / builtin / fmt-merge-msg.c
2012-04-26 Merge branch 'jm/maint-strncpy-diff-no-index'
2012-04-26 Merge bundle error message fix in
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26 Sync with 1.7.8.6
2012-04-24 Merge branch 'fc/completion-tests'
2012-04-24 Merge branch 'cc/fix-missing-va-end-in-revert'
2012-04-24 Merge branch 'zj/upstream-error-message'
2012-04-24 Merge branch 'mk/gitweb-diff-hl'
2012-04-24 Merge branch 'it/fetch-pack-many-refs'
2012-04-24 Merge branch 'pw/fast-import-dataref-parsing'
2012-04-24 Merge branch 'mh/ref-api'
2012-04-24 Merge branch 'hv/submodule-recurse-push'
2012-04-23 Merge branch 'bw/test-fix-grep-gnuism'
2012-04-23 Merge branch 'rj/submodule-mswin-path'
2012-04-23 Merge branch 'rj/sh-setup-mswin-pwd'
2012-04-23 Merge branch 'rj/mingw-isguid'
2012-04-23 Merge branch 'jn/fast-import-doc'
2012-04-23 Merge branch 'jn/more-i18ncmp'
2012-04-23 Merge branch 'jl/maint-submodule-recurse-fetch'
2012-04-23 Merge branch 'jc/maint-blame-minimal'
2012-04-23 Merge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-23 Merge branch 'rs/commit-list-sort-in-batch'
2012-04-23 Merge branch 'jh/apply-free-patch'
2012-04-23 Merge branch 'sl/test-wc-l-line-count'
2012-04-23 Merge branch 'jn/debian-customizes-default-editor'
2012-04-23 Merge branch 'rl/show-empty-prefix'
2012-04-23 Merge branch 'pw/git-p4'
2012-04-23 Merge branch 'ms/remote-usage-string'
2012-04-23 Merge branch 'jk/rebase-i-submodule-conflict-only'
2012-04-20 Merge branch 'js/spawn-via-shell-path-fix'
2012-04-20 Merge branch 'ct/advise-push-default'
2012-04-20 Merge branch 'bw/submodule-sed-solaris'
2012-04-20 Merge branch 'jk/run-command-eacces'
2012-04-20 Merge branch 'jc/push-upstream-sanity'
2012-04-20 Merge branch 'jc/am-report-3way'
2012-04-20 Merge branch 'jb/am-include'
2012-04-20 Merge branch 'jc/fmt-merge-msg-people'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'jc/diff-algo-cleanup'
2012-04-10 Merge branch 'maint-1.7.8' into maint-1.7.9
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-26 Merge branch 'ph/rerere-doc' into maint
2012-03-26 Merge branch 'ms/maint-config-error-at-eol-linecount...
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-23 Merge branch 'dw/gitweb-doc-grammo'
2012-03-20 Merge branch 'maint-1.7.8' into maint
2012-03-16 Merge branch 'jc/maint-verify-objects-remove-pessimism'
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-14 fmt-merge-msg: show those involved in a merged series
2012-03-13 Merge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-13 Merge branch 'ph/rerere-doc'
2012-03-12 Merge branch 'tr/maint-bundle-boundary' into maint
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-12 Merge branch 'jc/am-3-nonstandard-popt' into maint
2012-03-08 Merge branch 'jl/maint-submodule-relative'
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-07 Merge branch 'jc/pickaxe-ignore-case'
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-06 Merge branch 'tr/maint-bundle-boundary'
2012-03-06 Merge branch 'maint-1.7.8' into maint
2012-03-05 Merge branch 'jc/doc-merge-options' into maint
2012-03-05 Merge branch 'cn/maint-rev-list-doc' into maint
2012-03-05 Merge branch 'jc/am-3-nonstandard-popt'
2012-03-05 Merge branch 'cn/maint-branch-with-bad' into maint
2012-03-05 Merge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Merge branch 'nd/maint-verify-objects' into maint
2012-03-05 Merge branch 'jk/maint-avoid-streaming-filtered-content...
2012-03-05 Merge branch 'jb/filter-ignore-sigpipe' into maint
2012-03-05 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-03-05 Merge branch 'tr/maint-bundle-long-subject' into maint
2012-03-02 Merge branch 'rs/no-no-no-parseopt'
2012-03-01 Merge branch 'nd/maint-verify-objects'
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-03-01 Merge branch 'cn/maint-rev-list-doc'
2012-03-01 Merge branch 'cn/maint-branch-with-bad'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'jn/ancient-meld-support' into maint
2012-02-27 Merge branch 'tr/maint-bundle-long-subject'
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-27 Merge branch 'jc/doc-merge-options'
2012-02-27 Merge branch 'jk/maint-avoid-streaming-filtered-contents'
2012-02-27 Merge branch 'jb/filter-ignore-sigpipe'
2012-02-27 Sync with 1.7.8.5
2012-02-25 Merge branches zj/decimal-width, zj/term-columns and...
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Merge branch 'cb/receive-pack-keep-errors' into maint
2012-02-21 Merge branch 'jk/git-dir-lookup' into maint
2012-02-21 Merge branch 'jc/diff-stat-scaler' into maint
2012-02-21 Merge branch 'zj/term-columns' into maint
2012-02-21 Merge branch 'cb/maint-rev-list-verify-object' into...
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Merge branch 'jc/diff-stat-scaler'
2012-02-20 Merge branch 'zj/term-columns'
next