mergetool: Provide an empty file when needed
[gitweb.git] / sha1_name.c
2011-10-10 Merge branch 'jm/mergetool-pathspec'
2011-10-10 Merge branch 'jc/maint-diffstat-numstat-context'
2011-10-10 Merge branch 'mz/remote-rename'
2011-10-10 Merge branch 'cb/common-prefix-unification'
2011-10-10 Merge branch 'jn/maint-http-error-message'
2011-10-10 Merge branch 'hv/submodule-update-none'
2011-10-10 Merge branch 'fg/submodule-git-file-git-dir'
2011-10-09 Makefile: fix permissions of mergetools/ checked out...
2011-10-05 Merge branch 'mm/mediawiki-as-a-remote'
2011-10-05 Merge branch 'js/check-attr-cached'
2011-10-05 Merge branch 'rj/maint-t9159-svn-rev-notation'
2011-10-05 Merge branch 'cn/eradicate-working-copy'
2011-10-05 Merge branch 'jn/gitweb-highlite-sanitise'
2011-10-05 Merge branch 'jc/ls-remote-short-help'
2011-10-05 Merge branch 'sn/doc-update-index-assume-unchanged'
2011-10-05 Merge branch 'mg/maint-doc-sparse-checkout'
2011-10-05 Merge branch 'jk/argv-array'
2011-10-05 Merge branch 'tr/doc-note-rewrite'
2011-10-05 Merge branch 'mg/branch-list'
2011-10-05 Merge branch 'cb/send-email-help'
2011-10-05 Merge branch 'fk/use-kwset-pickaxe-grep-f'
2011-10-05 Merge branch 'jk/for-each-ref'
2011-10-05 Merge branch 'wh/normalize-alt-odb-path'
2011-10-05 Merge branch 'jc/run-receive-hook-cleanup'
2011-10-05 Merge branch 'hl/iso8601-more-zone-formats'
2011-10-05 Merge branch 'rj/quietly-create-dep-dir'
2011-10-05 Merge branch 'jc/receive-verify'
2011-10-05 Merge branch 'jc/fetch-verify'
2011-10-05 Merge branch 'jc/fetch-pack-fsck-objects'
2011-10-05 Merge branch 'jc/traverse-commit-list'
2011-10-05 Merge branch 'rr/revert-cherry-pick-continue'
2011-10-05 Merge branch 'da/make-auto-header-dependencies'
2011-10-05 Merge branch 'gb/am-hg-patch'
2011-10-05 Merge branch 'bc/unstash-clean-crufts'
2011-10-05 Merge branch 'fk/make-auto-header-dependencies'
2011-10-05 Merge branch 'ms/patch-id-with-overlong-line'
2011-10-05 Merge branch 'jc/maint-bundle-too-quiet'
2011-10-05 Merge branch 'jk/filter-branch-require-clean-work-tree'
2011-10-05 Merge branch 'jc/want-commit'
2011-10-05 Merge branch 'bk/ancestry-path'
2011-10-05 Merge branch 'nm/grep-object-sha1-lock'
2011-09-23 Merge branch 'mh/check-ref-format-print-normalize'...
2011-09-23 Merge branch 'gb/maint-am-patch-format-error-message...
2011-09-15 Allow git merge ":/<pattern>"
2011-09-12 Merge branch 'jk/tag-contains-ab' (early part) into...
2011-09-12 Merge branch 'jk/maint-config-param' into maint
2011-09-12 Merge branch 'jk/maint-1.7.2-status-ignored' into maint
2011-09-06 Merge branch 'mh/check-ref-format-print-normalize'
2011-09-02 Merge branch 'tr/maint-t3903-misquoted-command'
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
2011-09-02 Merge branch 'bg/t5540-osx-grep'
2011-09-02 Merge branch 'en/merge-recursive-2'
2011-08-25 Merge branch 'jn/plug-empty-tree-leak'
2011-08-23 Merge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-18 Merge branch 'jc/maint-combined-diff-work-tree'
2011-08-16 Merge branch 'jk/tag-list-multiple-patterns' into maint
2011-08-16 Merge branch 'jl/submodule-add-relurl-wo-upstream'...
2011-08-16 Merge branch 'jk/fast-export-quote-path' into maint
2011-08-16 Merge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-08-16 Merge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16 Merge branch 'jc/zlib-wrap' into maint
2011-08-16 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-16 Merge branch 'jc/diff-index-quick-exit-early' into...
2011-08-16 Merge branch 'jk/combine-diff-binary-etc' into maint
2011-08-11 Merge branch 'jk/fast-export-quote-path'
2011-08-11 Merge branch 'rc/maint-http-wrong-free'
2011-08-01 Merge branch 'jk/clone-detached'
2011-08-01 Merge branch 'jc/streaming-filter'
2011-08-01 Merge branch 'nk/ref-doc' into maint
2011-08-01 Merge branch 'jl/maint-fetch-recursive-fix' into maint
2011-08-01 Merge branch 'jc/maint-cygwin-trust-executable-bit...
2011-08-01 Merge branch 'jc/legacy-loose-object' into maint
2011-08-01 Merge branch 'an/shallow-doc' into maint
2011-08-01 Merge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-22 Merge branch 'dc/stash-con-untracked'
2011-07-22 Merge branch 'jk/tag-contains-ab'
2011-07-22 Merge branch 'bw/log-all-ref-updates-doc'
2011-07-22 Merge branch 'js/maint-add-path-stat-pwd'
2011-07-22 Merge branch 'jn/gitweb-search'
2011-07-22 Merge branch 'jl/submodule-add-relurl-wo-upstream'
2011-07-19 Merge branch 'jc/index-pack'
2011-07-19 Merge branch 'jn/mime-type-with-params'
2011-07-19 Merge branch 'jc/submodule-sync-no-auto-vivify'
2011-07-19 Merge branch 'jk/clone-cmdline-config'
2011-07-19 Merge branch 'jk/maint-config-param'
2011-07-19 Merge branch 'jk/tag-list-multiple-patterns'
2011-07-19 Merge branch 'jc/zlib-wrap'
2011-07-13 Merge branch 'js/rebase-typo-branch-squelch-usage'
2011-07-13 Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
2011-07-13 Merge branch 'nk/ref-doc'
2011-07-13 Merge branch 'jl/maint-fetch-recursive-fix'
2011-07-13 Merge branch 'jc/maint-cygwin-trust-executable-bit...
2011-07-13 Merge branch 'ln/gitweb-mime-types-split-at-blank'
2011-07-13 Merge branch 'jc/legacy-loose-object'
2011-07-13 Merge branch 'an/shallow-doc'
2011-07-06 Merge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-07-06 Merge commit 'v1.7.0' into jc/checkout-reflog-fix
next