t9001: style modernisation phase #5
[gitweb.git] / ll-merge.c
2014-09-19 Merge branch 'jk/index-pack-threading-races'
2014-09-19 Merge branch 'jk/commit-author-parsing'
2014-09-19 Merge branch 'bb/date-iso-strict'
2014-09-19 Merge branch 'mb/build-contrib-svn-fe'
2014-09-19 Merge branch 'jk/fast-export-anonymize'
2014-09-19 Merge branch 'jk/send-pack-many-refspecs'
2014-09-12 Merge branch 'js/fsck-tag-validation' into HEAD
2014-09-11 Merge branch 'br/imap-send-simplify-tunnel-child-process'
2014-09-11 Merge branch 'jk/name-decoration-alloc'
2014-09-11 Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
2014-09-11 Merge branch 'rs/list-optim'
2014-09-11 Merge branch 'jk/fast-import-fixes'
2014-09-11 Merge branch 'jk/prune-top-level-refs-after-packing'
2014-09-11 Merge branch 'nd/large-blobs'
2014-09-11 Merge branch 'nd/fetch-pass-quiet-to-gc-child-process'
2014-09-11 Merge branch 'dt/cache-tree-repair'
2014-09-11 Merge branch 'rs/ref-transaction-1'
2014-09-11 Merge branch 'nd/mv-code-cleaning'
2014-09-11 Merge branch 'mm/discourage-commit-a-to-finish-conflict...
2014-09-11 Merge branch 'jk/make-simplify-dependencies'
2014-09-11 Merge branch 'et/spell-poll-infinite-with-minus-one...
2014-09-11 Merge branch 'br/http-init-fix'
2014-09-11 Merge branch 'rs/child-process-init'
2014-09-11 Merge branch 'jk/contrib-subtree-make-all'
2014-09-11 Merge branch 'ta/config-set-2'
2014-08-13 ll-merge.c: refactor `read_merge_config()` to use ...
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
2014-02-13 Merge branch 'jc/revision-range-unpeel' into maint
2014-01-27 Merge branch 'jc/revision-range-unpeel'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-12-05 Merge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-07 Merge branch 'jc/revision-range-unpeel' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-11-04 Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-30 Merge branch 'sg/t3600-nul-sha1-fix'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-28 Merge branch 'jc/revision-range-unpeel'
2013-10-28 Merge branch 'jk/diff-algo' into maint
2013-10-17 Merge branch 'jc/cvsserver-perm-bit-fix' into maint
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-10-14 Merge branch 'nv/doc-config-signingkey'
2013-10-14 Merge branch 'jk/diff-algo'
2013-10-08 Merge branch 'tz/credential-netrc'
2013-09-26 Merge branch 'js/xread-in-full' into maint
2013-09-18 Merge branch 'jc/cvsserver-perm-bit-fix'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-04 Merge branch 'tr/fd-gotcha-fixes'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-07-31 Merge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31 Merge branch 'ds/doc-two-kinds-of-tags'
2013-07-30 Merge branch 'jk/capabilities-doc'
2013-07-22 Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Merge branch 'tr/protect-low-3-fds'
2013-07-22 Merge branch 'sb/parse-object-buffer-eaten'
2013-07-22 Merge branch 'tr/fd-gotcha-fixes'
2013-07-22 Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22 Merge branch 'dk/maint-t5150-dirname' into maint
2013-07-22 Merge branch 'dk/version-gen-gitdir' into maint
2013-07-22 Merge branch 'nk/config-local-doc' into maint
2013-07-22 Merge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22 Merge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22 Merge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Merge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19 Merge branch 'ft/diff-rename-default-score-is-half...
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-19 Merge branch 'mm/push-force-is-dangerous' into maint
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15 Merge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-12 Merge branch 'rr/name-rev-stdin-doc'
2013-07-12 Merge branch 'ft/diff-rename-default-score-is-half'
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-07-11 Merge branch 'mh/maint-lockfile-overflow'
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03 Merge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03 Merge branch 'cb/log-follow-with-combined' into maint
next