builtin/merge.c: drop a parameter that is never used
[gitweb.git] / thread-utils.c
2013-06-24 Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
2013-06-24 Merge branch 'mm/rm-coalesce-errors'
2013-06-24 Merge branch 'jh/libify-note-handling'
2013-06-24 Merge branch 'fc/sequencer-plug-leak'
2013-06-23 Merge branch 'mz/rebase-tests'
2013-06-23 Merge branch 'jk/unpack-entry-fallback-to-another'
2013-06-23 Merge branch 'jk/apache-test-for-2.4'
2013-06-23 Merge branch 'rr/rebase-autostash'
2013-06-23 Merge branch 'jg/status-config'
2013-06-21 Sync with maint
2013-06-20 Merge branch 'cm/remote-mediawiki'
2013-06-20 Merge branch 'rs/match-trees-refactor'
2013-06-20 Merge branch 'rs/logical-vs-binary-or'
2013-06-20 Merge branch 'mm/color-auto-default'
2013-06-20 Merge branch 'rs/discard-index-discard-array'
2013-06-20 Merge branch 'nd/traces'
2013-06-20 Merge branch 'fc/show-non-empty-errors-in-test'
2013-06-20 Merge branch 'fc/makefile'
2013-06-20 Merge branch 'js/test-ln-s-add'
2013-06-20 Merge branch 'nd/make-wildmatch-default'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-14 Merge branch 'rr/complete-difftool-fixup'
2013-06-14 Merge branch 'mt/send-email-cc-match-fix'
2013-06-14 Merge branch 'bp/mediawiki-credential'
2013-06-14 Merge branch 'mh/reflife'
2013-06-14 Merge branch 'kb/full-history-compute-treesame-carefully-2'
2013-06-14 Merge branch 'rr/remove-contrib-some'
2013-06-11 Merge branch 'maint'
2013-06-11 Merge branch 'cm/gitweb-project-list-persistent-cgi...
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11 Merge branch 'rr/rebase-autostash'
2013-06-11 Merge branch 'jk/test-exit-code-by-signal'
2013-06-11 Merge branch 'fc/at-head'
2013-06-11 Merge branch 'ar/wildmatch-foldcase'
2013-06-11 Merge branch 'tr/sha1-file-silence-loose-object-info...
2013-06-11 Merge branch 'nd/warn-ambiguous-object-name'
2013-06-11 Merge branch 'rr/diffcore-pickaxe-doc'
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11 Merge branch 'mm/mediawiki-https-fail-message'
2013-06-11 Merge branch 'cb/log-follow-with-combined'
2013-06-11 Merge branch 'xq/credential-osxkeychain'
2013-06-11 Merge branch 'fc/do-not-use-the-index-in-add-to-index'
2013-06-11 Merge branch 'fc/remote-bzr'
2013-06-11 Merge branch 'fc/remote-hg'
2013-06-11 Merge branch 'rj/mingw-cygwin'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-08 mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-10 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06 Merge branch 'jn/block-sha1' into maint
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-08-06 Merge branch 'lm/git-blame-el' into maint
2012-07-24 Merge branch 'jn/block-sha1'
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11 Merge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-25 Merge branch 'lm/git-blame-el'
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-06-03 Merge branch 'ef/maint-rebase-error-message' into maint
2012-06-01 Merge branch 'ef/maint-rebase-error-message'
2012-05-23 Merge branch 'js/rev-parse-doc-fix'
2012-05-23 Merge branch 'js/rebase-i-p-test-fix'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
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-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
next