Merge branch 'rs/more-uses-of-skip-prefix'
[gitweb.git] / builtin / merge-tree.c
2014-10-14 Merge branch 'rs/mailsplit'
2014-10-14 Merge branch 'rs/sha1-array-test'
2014-10-14 Merge branch 'sk/tag-contains-wo-recursion'
2014-10-14 Merge branch 'rs/daemon-fixes'
2014-10-14 Merge branch 'dt/cache-tree-repair'
2014-10-14 Merge branch 'so/rebase-doc-fork-point'
2014-10-14 Merge branch 'da/include-compat-util-first-in-c'
2014-10-08 Merge branch 'sp/stream-clean-filter'
2014-10-08 Merge branch 'bw/use-write-script-in-tests'
2014-10-08 Merge branch 'nd/archive-pathspec'
2014-10-08 Merge branch 'jc/push-cert'
2014-10-07 Sync with maint
2014-09-30 Sync with 2.1.2
2014-09-30 Merge branch 'jt/itimer-autoconf'
2014-09-30 Merge branch 'jc/test-lazy-prereq'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-30 Merge branch 'pr/use-default-sigpipe-setting'
2014-09-29 Merge branch 'jk/mbox-from-line'
2014-09-29 Merge branch 'sb/t6031-typofix'
2014-09-29 Merge branch 'sb/t9300-typofix'
2014-09-29 Merge branch 'da/rev-parse-verify-quiet'
2014-09-29 Merge branch 'hj/pretty-naked-decoration'
2014-09-28 Merge branch 'maint'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-09-26 Merge branch 'jk/branch-verbose-merged'
2014-09-26 Merge branch 'rs/realloc-array'
2014-09-26 Merge branch 'jk/close-stderr-of-credential-cache-deamon'
2014-09-26 Merge branch 'jc/ignore-sigpipe-while-running-hooks'
2014-09-26 Merge branch 'jk/prune-packed-server-info'
2014-09-26 Merge branch 'jc/hash-object-fsck-tag'
2014-09-26 Merge branch 'jc/hash-object'
2014-09-26 Merge branch 'js/fsck-tag-validation'
2014-09-26 Merge branch 'jk/faster-name-conflicts'
2014-09-26 Merge branch 'jk/write-packed-refs-via-stdio'
2014-09-19 Sync with Git 2.1.1
2014-09-19 Merge branch 'jk/fsck-exit-code-fix'
2014-09-19 Merge branch 'so/rebase-doc'
2014-09-19 Merge branch 'ir/makefile-typofix'
2014-09-19 Merge branch 'wk/pre-push-sample-hook'
2014-09-19 Merge branch 'ss/compat-default-source-for-newer-gnu'
2014-09-19 Merge branch 'mr/mark-i18n-log-rerere'
2014-09-19 Merge branch 'js/no-test-cmp-for-binaries'
2014-09-19 Merge branch 'ta/config-add-to-empty-or-true-fix'
2014-09-19 Merge branch 'sp/doc-update-index-cacheinfo'
2014-09-19 Merge branch 'rs/export-strbuf-addchars'
2014-09-19 Merge branch 'kb/perf-trace'
2014-09-19 Merge branch 'jc/parseopt-verify-short-name'
2014-09-19 Merge branch 'mk/reachable-protect-detached-head'
2014-09-19 Merge branch 'tb/complete-diff-ignore-blank-lines'
2014-09-19 Merge branch 'as/calloc-takes-nmemb-then-size'
2014-09-19 Merge branch 'tb/crlf-tests'
2014-09-19 Merge branch 'rs/simplify-http-walker'
2014-09-19 Merge branch 'rs/simplify-config-include'
2014-09-19 Merge branch 'rs/merge-tree-simplify'
2014-09-02 merge-tree: remove unused df_conflict arguments
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-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
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-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07 Merge branch 'jc/core-checkstat-2.0'
2014-03-07 Merge branch 'jc/add-2.0-ignore-removal'
2014-03-07 Merge branch 'jn/add-2.0-u-A-sans-pathspec'
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-02-05 Merge branch 'jc/maint-pull-docfix' into maint
2014-01-27 Merge branch 'jc/revision-range-unpeel'
2014-01-27 Merge branch 'jc/maint-pull-docfix'
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...
2014-01-13 Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
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-12-05 Merge branch 'jk/replace-perl-in-built-scripts'
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-07 Merge branch 'hn/log-graph-color-octopus' 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 'nd/gc-lock-against-each-other'
next