Merge branch 'jk/config-warn-on-inaccessible-paths'
[gitweb.git] / builtin / merge-file.c
2012-07-05 Merge branch 'nd/clone-single-fix'
2012-07-05 Merge branch 'th/diff-no-index-fixes'
2012-07-05 Merge branch 'hv/remote-end-hung-up'
2012-06-28 Merge branch 'hv/submodule-update-nuke-submodules'
2012-06-28 Merge branch 'mm/verify-filename-fix'
2012-06-28 Merge branch 'jk/diff-no-index-pager'
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-25 Merge branch 'cn/cherry-pick-range-docs'
2012-06-25 Merge branch 'lm/git-blame-el'
2012-06-25 Merge branch 'rs/ipv6-ssh-url'
2012-06-25 Merge branch 'rs/git-blame-mapcar-mapc'
2012-06-25 Merge branch 'rr/doc-commit'
2012-06-21 Merge branch 'jk/maint-t1304-setfacl'
2012-06-21 Merge branch 'jc/ls-files-i-dir'
2012-06-21 Merge branch 'jc/request-pull-match-tagname'
2012-06-17 Sync with 1.7.10.5
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-15 Merge branch 'as/diff-shortstat-ignore-binary'
2012-06-13 Merge branch 'rj/gitweb-test-sans-date-parser'
2012-06-12 Merge branch 'mm/api-credentials-doc'
2012-06-12 Merge branch 'jc/fmt-merge-msg-people'
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-06-08 Merge branch 'mm/api-credentials-doc'
2012-06-07 Merge branch 'mm/api-credentials-doc'
2012-06-07 Merge branch 'rr/maint-t3510-cascade-fix'
2012-06-07 Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'
2012-06-03 Sync with 1.7.10.4
2012-06-01 Merge branch 'ef/maint-rebase-error-message'
2012-06-01 Merge branch 'nh/empty-rebase'
2012-06-01 Sync with maint
2012-05-29 Merge branch 'va/git-p4-test'
2012-05-29 Merge branch 'mh/fetch-pack-constness'
2012-05-29 Merge branch 'mh/ref-api-lazy-loose'
2012-05-29 Merge branch 'maint'
2012-05-25 Merge branch 'sp/sh-windows-pwd'
2012-05-25 Merge branch 'mh/test-keep-prove-cache'
2012-05-25 Merge branch 'ap/checkout-no-progress-for-non-tty'
2012-05-25 Merge branch 'jk/format-person-part-buffer-limit'
2012-05-25 Merge branch 'jk/pretty-commit-header-incomplete-line'
2012-05-25 Merge branch 'jk/ident-split-fix'
2012-05-25 Merge branch 'rs/xdiff-fast-hash-fix'
2012-05-25 Merge branch 'mh/ref-api'
2012-05-25 Merge branch 'rs/maint-grep-F'
2012-05-25 Sync with 1.7.10.3
2012-05-25 Sync with maint
2012-05-23 Merge branch 'rs/archive-tree-in-tip-simplify'
2012-05-23 Merge branch 'js/rev-parse-doc-fix'
2012-05-23 Merge branch 'js/rebase-i-p-test-fix'
2012-05-23 Merge branch 'bp/diff-no-index-strbuf-fix'
2012-05-23 Merge branch 'hv/submodule-alt-odb'
2012-05-20 Merge branch 'maint'
2012-05-17 Merge branch 'ld/git-p4-tags-and-labels'
2012-05-15 Merge branch 'maint' into master
2012-05-14 Merge branch 'maint'
2012-05-14 Merge branch 'fc/simplify-complete-revlist-file'
2012-05-14 Merge branch 'nd/threaded-index-pack'
2012-05-14 Sync with maint
2012-05-12 Merge branch 'maint'
2012-05-11 Merge branch 'ef/checkout-empty'
2012-05-11 Merge branch 'jk/maint-reflog-walk-count-vs-time'
2012-05-11 Sync with 1.7.10.2
2012-05-10 Merge branch 'fa/maint-config-doc'
2012-05-10 Merge branch 'ef/maint-clone-progress-fix'
2012-05-10 Merge branch 'ah/maint-grep-double-init'
2012-05-10 Merge branch 'js/checkout-detach-count'
2012-05-10 Merge branch 'jc/install-no-hardlinks'
2012-05-10 Merge branch 'nd/stream-to-archive'
2012-05-10 Merge branch 'mh/ref-api-lazy-loose'
2012-05-10 Merge branch 'maint'
2012-05-09 Merge branch 'maint' into master
2012-05-08 Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf
2012-05-08 Merge branch 'jk/maint-status-porcelain-z-b' into HEAD
2012-05-08 Merge branch 'maint'
2012-05-07 Merge branch 'nh/empty-rebase'
2012-05-07 Merge branch 'zj/diff-empty-chmod'
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'th/difftool-diffall'
2012-05-07 Sync with maint
2012-05-03 Merge branch 'maint'
2012-05-03 Merge branch 'jk/maint-push-progress'
2012-05-03 Merge branch 'nd/columns'
2012-05-02 Merge branch 'master' of git://git.bogomips.org/git-svn
2012-05-02 Merge branch 'tr/xdiff-fast-hash'
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'pw/message-cleanup'
2012-04-30 remove superfluous newlines in error messages
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-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
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'
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
next