First batch for 2.5 cycle
[gitweb.git] / merge.c
2015-05-06 Merge branch 'jk/prune-mtime'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-05-06 Merge branch 'jc/epochtime-wo-tz'
2015-05-06 Merge branch 'nd/t1509-chroot-test'
2015-05-06 Merge branch 'oh/fix-config-default-user-name-section'
2015-05-06 Merge branch 'jk/type-from-string-gently'
2015-05-06 Merge branch 'jk/init-core-worktree-at-root'
2015-05-06 Merge branch 'jc/diff-no-index-d-f'
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-27 Merge branch 'ma/bash-completion-leaking-x' into maint
2015-04-27 Merge branch 'jc/push-cert' into maint
2015-04-21 Merge branch 'jk/colors' into maint
2015-04-21 Merge branch 'pt/enter-repo-comment-fix' into maint
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'jk/cherry-pick-docfix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-04-21 Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
2015-04-20 Merge branch 'ps/grep-help-all-callback-arg'
2015-04-20 Merge branch 'va/fix-git-p4-tests'
2015-04-20 Merge branch 'jc/push-cert'
2015-04-20 Merge branch 'ma/bash-completion-leaking-x'
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'jk/colors'
2015-04-14 Merge branch 'jk/merge-quiet'
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
2015-04-14 Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14 Merge branch 'pt/enter-repo-comment-fix'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-04-14 Merge branch 'jk/cherry-pick-docfix'
2015-04-14 Merge branch 'iu/fix-parse-options-h-comment'
2015-04-14 Merge branch 'jg/cguide-we-cannot-count'
2015-03-31 Merge branch 'ss/pull-rebase-preserve' into maint
2015-03-31 Merge branch 'jc/report-path-error-to-dir' into maint
2015-03-31 Merge branch 'ph/push-doc-cas' into maint
2015-03-28 Merge branch 'ph/push-doc-cas'
2015-03-28 Merge branch 'ss/pull-rebase-preserve'
2015-03-28 Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
2015-03-28 Merge branch 'nd/doc-git-index-version' into maint
2015-03-28 Merge branch 'ct/prompt-untracked-fix' into maint
2015-03-28 Merge branch 'ws/grep-quiet-no-pager' into maint
2015-03-28 Merge branch 'jc/submitting-patches-mention-send-email...
2015-03-28 Merge branch 'jk/cleanup-failed-clone' into maint
2015-03-27 Merge branch 'jk/tag-h-column-is-a-listing-option'...
2015-03-27 Merge branch 'jk/smart-http-hide-refs' into maint
2015-03-27 Merge branch 'js/completion-ctags-pattern-substitution...
2015-03-26 Merge branch 'jc/report-path-error-to-dir'
2015-03-25 Merge branch 'nd/doc-git-index-version'
2015-03-25 Merge branch 'jk/cleanup-failed-clone'
2015-03-25 Merge branch 'jc/submitting-patches-mention-send-email'
2015-03-25 Merge branch 'kd/rev-list-bisect-first-parent'
2015-03-25 Merge branch 'ws/grep-quiet-no-pager'
2015-03-25 Merge branch 'jk/simplify-csum-file-sha1fd-check'
2015-03-25 Merge branch 'ct/prompt-untracked-fix'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-23 Merge branch 'js/completion-ctags-pattern-substitution...
2015-03-23 Merge branch 'jk/smart-http-hide-refs'
2015-03-23 Merge branch 'jk/tag-h-column-is-a-listing-option'
2015-03-23 Merge branch 'rs/use-isxdigit' into maint
2015-03-23 Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-23 Merge branch 'mg/verify-commit' into maint
2015-03-20 Merge branch 'jc/decorate-leaky-separator-color'
2015-03-20 Merge branch 'rs/use-isxdigit'
2015-03-20 Merge branch 'mg/verify-commit'
2015-03-17 Merge branch 'mg/sequencer-commit-messages-always-verbatim'
2015-03-17 Merge branch 'rs/zip-text'
2015-03-17 Merge branch 'rs/deflate-init-cleanup'
2015-03-14 Merge branch 'mr/doc-clean-f-f' into maint
2015-03-14 Merge branch 'ak/t5516-typofix' into maint
2015-03-14 Merge branch 'jc/diff-test-updates' into maint
2015-03-14 Merge branch 'jk/diffcore-rename-duplicate' into maint
2015-03-14 Merge branch 'bw/kwset-use-unsigned' into maint
2015-03-14 Merge branch 'nd/grep-exclude-standard-help-fix' into...
2015-03-14 Merge branch 'mk/diff-shortstat-dirstat-fix' into maint
2015-03-14 Merge branch 'ms/submodule-update-config-doc' into...
2015-03-14 Merge branch 'jc/apply-beyond-symlink' into maint
2015-03-14 Merge branch 'rs/daemon-interpolate' into maint
2015-03-14 Merge branch 'jk/daemon-interpolate' into maint
2015-03-10 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-10 Merge branch 'jk/diffcore-rename-duplicate'
2015-03-06 Merge branch 'bw/kwset-use-unsigned'
2015-03-06 Merge branch 'ak/t5516-typofix'
2015-03-06 Merge branch 'ms/submodule-update-config-doc'
2015-03-06 Merge branch 'ja/clean-confirm-i18n'
2015-03-06 Merge branch 'mk/diff-shortstat-dirstat-fix'
2015-03-06 Merge branch 'nd/grep-exclude-standard-help-fix'
2015-03-06 Merge branch 'mr/doc-clean-f-f'
2015-03-06 Merge branch 'rj/no-xopen-source-for-cygwin' into maint
2015-03-06 Merge branch 'rs/simple-cleanups' into maint
2015-03-06 Merge branch 'mm/am-c-doc' into maint
2015-03-05 Merge branch 'sb/plug-leak-in-make-cache-entry' into...
2015-03-05 Merge branch 'jk/fast-import-die-nicely-fix' into maint
2015-03-05 Merge branch 'es/blame-commit-info-fix' into maint
2015-03-05 Merge branch 'ab/merge-file-prefix' into maint
2015-03-05 Merge branch 'ps/submodule-sanitize-path-upon-add'...
2015-03-05 Merge branch 'jk/prune-mtime' into maint
2015-03-05 Merge branch 'jc/conf-var-doc' into maint
2015-03-05 Merge branch 'jc/remote-set-url-doc' into maint
next