Merge branch 'as/check-ignore'
[gitweb.git] / merge-blobs.h
2013-01-24 Merge branch 'as/check-ignore'
2013-01-24 Merge branch 'rs/clarify-entry-cmp-sslice'
2013-01-24 Merge branch 'jk/suppress-clang-warning'
2013-01-24 Merge branch 'cr/push-force-tag-update'
2013-01-24 Merge branch 'mh/imap-send-shrinkage'
2013-01-24 Merge branch 'mo/cvs-server-updates'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-22 Merge branch 'mz/reset-misc'
2013-01-22 Merge branch 'nd/fix-directory-attrs-off-by-one'
2013-01-22 Merge branch 'pw/p4-branch-fixes'
2013-01-22 Merge branch 'zk/clean-report-failure'
2013-01-22 Merge branch 'ph/rebase-preserve-all-merges'
2013-01-22 Merge branch 'nd/clone-no-separate-git-dir-with-bare'
2013-01-22 Merge branch 'maint'
2013-01-21 Merge branch 'maint'
2013-01-21 Merge branch 'rt/commit-cleanup-config'
2013-01-21 Merge branch 'ap/log-mailmap'
2013-01-18 Merge branch 'ss/help-htmlpath-config-doc'
2013-01-18 Merge branch 'nd/fix-perf-parameters-in-tests'
2013-01-18 Merge branch 'nd/attr-debug-fix'
2013-01-18 Merge branch 'rs/pretty-use-prefixcmp'
2013-01-18 Merge branch 'ds/completion-silence-in-tree-path-probe'
2013-01-18 Merge branch 'jn/maint-trim-vim-contrib'
2013-01-18 Merge branch 'pe/doc-email-env-is-trumped-by-config'
2013-01-18 Merge branch 'mk/complete-tcsh'
2013-01-14 Sync with 1.8.1.1
2013-01-14 Merge branch 'jc/blame-no-follow'
2013-01-14 Merge branch 'fc/remote-testgit-feature-done'
2013-01-14 Merge branch 'nd/upload-pack-shallow-must-be-commit'
2013-01-14 Merge branch 'ap/status-ignored-in-ignored-directory'
2013-01-14 Merge branch 'nz/send-email-headers-are-case-insensitive'
2013-01-12 Merge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-12 Merge branch 'rs/zip-with-uncompressed-size-in-the...
2013-01-12 Merge branch 'rs/zip-tests'
2013-01-12 Merge branch 'jn/xml-depends-on-asciidoc-conf'
2013-01-12 Merge branch 'jk/unify-exit-code-by-receiving-signal'
2013-01-12 Merge branch 'jc/merge-blobs'
2012-12-10 Which merge_file() function do you mean?