Merge branch 'rh/ishes-doc'
[gitweb.git] / builtin / merge-file.c
2013-09-17 Merge branch 'rh/ishes-doc'
2013-09-17 Merge branch 'dw/diff-no-index-doc'
2013-09-17 Merge branch 'ta/user-manual'
2013-09-17 Merge branch 'fc/trivial'
2013-09-17 Merge branch 'fc/fast-export'
2013-09-17 Merge branch 'ab/gitweb-author-initials'
2013-09-17 Merge branch 'jk/has-sha1-file-retry-packed'
2013-09-17 Merge branch 'jk/write-broken-index-with-nul-sha1'
2013-09-17 Merge branch 'jx/clean-interactive'
2013-09-17 Merge branch 'tb/precompose-autodetect-fix'
2013-09-17 Merge branch 'kk/tests-with-no-perl'
2013-09-17 Merge branch 'ap/commit-author-mailmap'
2013-09-17 Merge branch 'jk/free-tree-buffer'
2013-09-17 Merge branch 'maint'
2013-09-12 Sync with maint for l10n updates
2013-09-12 Merge branch 'jc/pager-configuration-doc'
2013-09-12 Merge branch 'mm/remote-helpers-doc'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-12 Merge branch 'mm/fast-import-feature-doc'
2013-09-12 Merge branch 'mm/mediawiki-dumb-push-fix'
2013-09-12 Merge branch 'jc/commit-is-spelled-with-two-ems'
2013-09-12 Merge branch 'jk/config-int-range-check'
2013-09-11 Merge branch 'jc/ls-files-killed-optim'
2013-09-11 Merge branch 'es/rebase-i-no-abbrev'
2013-09-11 Merge branch 'rt/rebase-p-no-merge-summary'
2013-09-11 Merge branch 'tf/gitweb-ss-tweak'
2013-09-11 Merge branch 'sb/mailmap-freeing-NULL-is-ok'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-11 Merge branch 'es/rebase-i-respect-core-commentchar'
2013-09-11 Merge branch 'jn/post-receive-utf8'
2013-09-11 Merge branch 'sh/pull-rebase-preserve'
2013-09-11 Merge branch 'nd/push-no-thin'
2013-09-09 Merge branch 'nd/magic-pathspec'
2013-09-09 Merge branch 'jk/mailmap-incomplete-line'
2013-09-09 Merge branch 'sp/clip-read-write-to-8mb'
2013-09-09 Merge branch 'tg/index-struct-sizes'
2013-09-09 Merge branch 'jc/transport-do-not-use-connect-twice...
2013-09-09 Merge branch 'es/contacts-blame-L-multi'
2013-09-09 Merge branch 'jc/url-match'
2013-09-09 Merge branch 'jl/submodule-mv'
2013-09-09 Merge branch 'es/blame-L-twice'
2013-09-09 Merge branch 'tr/log-full-diff-keep-true-parents'
2013-09-09 Merge branch 'jk/cat-file-batch-optim'
2013-09-09 Merge branch 'es/blame-L-more'
2013-09-09 Merge branch 'db/http-savecookies'
2013-09-09 Merge branch 'jc/push-cas'
2013-09-09 Merge branch 'nd/clone-connectivity-shortcut'
2013-09-09 Merge branch 'jc/diff-filter-negation'
2013-09-09 Merge branch 'ms/fetch-prune-configuration'
2013-09-05 Sync with maint
2013-09-04 Merge branch 'sb/parseopt-boolean-removal'
2013-08-05 Replace deprecated OPT_BOOLEAN by OPT_BOOL
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-06-26 Merge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-29 Merge branch 'as/check-ignore'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-19 Merge branch 'tr/copy-revisions-from-stdin'
2013-04-12 Merge branch 'sr/log-SG-no-textconv'
2013-04-04 Merge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04 Merge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04 Merge branch 'jk/peel-ref' into maint
2013-04-03 Merge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-04-03 Merge branch 'jk/fully-peeled-packed-ref' into maint...
2013-04-03 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-03 Merge branch 'jc/perl-cat-blob' into maint-1.8.1
2013-04-03 Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
2013-04-03 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-04-02 Merge branch 'sw/safe-create-leading-dir-race'
2013-04-01 Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01 Merge branch 'rr/tests-dedup-test-config' into maint
2013-04-01 Merge branch 'nd/index-pack-threaded-fixes'
2013-04-01 Merge branch 'jk/index-pack-correct-depth-fix'
2013-04-01 Merge branch 'jc/remove-export-from-config-mak-in'
2013-03-28 Merge branch 'rr/tests-dedup-test-config'
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-03-26 Merge branch 'jc/reflog-reverse-walk'
2013-03-26 Merge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26 Merge branch 'jc/perl-cat-blob' into maint
2013-03-26 Merge branch 'ob/imap-send-ssl-verify' into maint
2013-03-26 Merge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-03-25 Merge branch 'jk/fully-peeled-packed-ref'
2013-03-25 Merge branch 'jk/peel-ref'
2013-03-25 Merge branch 'lf/setup-prefix-pathspec'
2013-03-25 Merge branch 'ap/maint-diff-rename-avoid-overlap'
2013-03-25 Merge branch 'lf/bundle-verify-list-prereqs' into maint...
2013-03-25 Merge branch 'tk/doc-filter-branch' into maint-1.8.1
next