Merge branch 'hv/t5526-andand-chain-fix'
[gitweb.git] / builtin / merge-tree.c
2017-08-23 Merge branch 'hv/t5526-andand-chain-fix'
2017-08-23 Merge branch 'as/grep-quiet-no-match-exit-code-fix'
2017-08-23 Merge branch 'kw/commit-keep-index-when-pre-commit...
2017-08-23 Merge branch 'sb/sha1-file-cleanup'
2017-08-23 Merge branch 'rs/t1002-do-not-use-sum'
2017-08-23 Merge branch 'kd/stash-with-bash-4.4'
2017-08-23 Merge branch 'ah/doc-empty-string-is-false'
2017-08-23 Merge branch 'kw/rebase-progress'
2017-08-23 Merge branch 'ks/prepare-commit-msg-sample-fix'
2017-08-23 Merge branch 'nm/stash-untracked'
2017-08-23 Merge branch 'jt/sha1-file-cleanup'
2017-08-22 Merge branch 'mh/packed-ref-store'
2017-08-22 Merge branch 'sb/retire-t1200'
2017-08-22 Merge branch 'rs/win32-syslog-leakfix'
2017-08-22 Merge branch 'rs/unpack-entry-leakfix'
2017-08-22 Merge branch 'rs/strbuf-getwholeline-fix'
2017-08-22 Merge branch 'rs/merge-microcleanup'
2017-08-22 Merge branch 'rs/fsck-obj-leakfix'
2017-08-22 Merge branch 'rs/t4062-obsd'
2017-08-22 Merge branch 'rs/find-pack-entry-bisection'
2017-08-22 Merge branch 'rs/apply-lose-prefix-length'
2017-08-22 Merge branch 'rj/add-chmod-error-message'
2017-08-22 Merge branch 'jk/hashcmp-memcmp'
2017-08-22 Merge branch 'jk/drop-sha1-entry-pos'
2017-08-22 Merge branch 'ur/svn-local-zone'
2017-08-22 Merge branch 'pw/am-signoff'
2017-08-22 Merge branch 'rs/t3700-clean-leftover'
2017-08-22 Merge branch 'jc/perl-git-comment-typofix'
2017-08-22 Merge branch 'rs/in-obsd-basename-dirname-take-const'
2017-08-22 Merge branch 'rs/obsd-getcwd-workaround'
2017-08-22 Merge branch 'mf/no-dashed-subcommands'
2017-08-22 Merge branch 'ma/parse-maybe-bool'
2017-08-22 Merge branch 'ab/ref-filter-no-contains'
2017-08-22 Merge branch 'bw/clone-recursive-quiet'
2017-08-22 Merge branch 'bw/grep-recurse-submodules'
2017-08-22 Merge branch 'pw/sequence-rerere-autoupdate'
2017-08-22 Merge branch 'bw/push-options-recursively-to-submodules'
2017-08-11 Merge branch 'ma/pager-per-subcommand-action'
2017-08-11 Merge branch 'jk/rev-list-empty-input'
2017-08-11 Merge branch 'jt/t1450-fsck-corrupt-packfile'
2017-08-11 Merge branch 'js/git-gui-msgfmt-on-windows'
2017-08-11 Merge branch 'eb/contacts-reported-by'
2017-08-11 Merge branch 'dl/credential-cache-socket-in-xdg-cache'
2017-08-11 Merge branch 'rg/rerere-train-overwrite'
2017-08-11 Merge branch 'jb/t8008-cleanup'
2017-08-11 Merge branch 'jt/subprocess-handshake'
2017-08-11 Merge branch 'dc/fmt-merge-msg-microcleanup'
2017-08-11 Merge branch 'ah/doc-wserrorhighlight'
2017-08-11 Merge branch 'cc/ref-is-hidden-microcleanup'
2017-08-11 Merge branch 'js/run-process-parallel-api-fix'
2017-08-11 Merge branch 'hb/gitweb-project-list'
2017-08-11 Merge branch 'ks/commit-abort-on-empty-message-fix'
2017-08-11 Merge branch 'sb/hashmap-cleanup'
2017-08-11 Merge branch 'jk/reflog-walk'
2017-08-11 Merge branch 'ls/filter-process-delayed'
2017-08-11 Merge branch 'st/lib-gpg-kill-stray-agent'
2017-08-11 Merge branch 'rs/pack-objects-pbase-cleanup'
2017-08-11 Merge branch 'jt/fsck-code-cleanup'
2017-08-11 Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths'
2017-08-11 Merge branch 'jk/c99'
2017-08-11 Merge branch 'jk/ref-filter-colors'
2017-08-11 Merge branch 'wd/rebase-conflict-guide'
2017-08-11 Merge branch 'rs/stat-data-unaligned-reads-fix'
2017-08-11 Merge branch 'rs/move-array'
2017-08-11 Merge branch 'rs/bswap-ubsan-fix'
2017-08-11 Merge branch 'ks/prepare-commit-msg-sample'
2017-08-11 Merge branch 'bw/object-id'
2017-08-11 Merge branch 'bc/object-id'
2017-08-04 Merge tag 'v2.13.5' into maint
2017-08-04 Merge branch 'ah/patch-id-doc'
2017-08-04 Merge branch 'as/diff-options-grammofix'
2017-08-01 Sync with v2.13.4
2017-07-31 Sync with maint
2017-07-31 Merge branch 'js/blame-lib'
2017-07-30 Merge tag 'v2.8.6' into maint-2.9
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-21 Sync with maint
2017-07-21 Merge branch 'ks/doc-fixes'
2017-07-20 Merge branch 'ew/fd-cloexec-fix'
2017-07-20 Merge branch 'jk/build-with-asan'
2017-07-20 Merge branch 'jk/test-copy-bytes-fix'
2017-07-20 Merge branch 'js/alias-case-sensitivity'
2017-07-18 Merge branch 'jk/gc-pre-detach-under-hook'
2017-07-18 Merge branch 'jn/hooks-pre-rebase-sample-fix'
2017-07-18 Merge branch 'rs/progress-overall-throughput-at-the...
2017-07-18 Merge branch 'tb/push-to-cygwin-unc-path'
2017-07-17 builtin/merge-tree: convert remaining caller of get_sha...
2017-07-15 Merge branch 'maint' of git://github.com/git-l10n/git-po
2017-07-13 Merge branch 'jk/build-with-asan'
2017-07-12 Sync with v2.13.3
2017-07-12 Merge branch 'ks/fix-rebase-doc-picture'
2017-07-12 Merge branch 'rs/wt-status-cleanup'
2017-07-12 Merge branch 'rs/use-div-round-up'
2017-07-12 Merge branch 'kn/ref-filter-branch-list'
2017-07-12 Merge branch 'rs/urlmatch-cleanup'
2017-07-12 Merge branch 'rs/apply-avoid-over-reading'
2017-07-10 Sync with maint
2017-07-10 Merge branch 'jk/reflog-walk-maint'
2017-07-10 Merge branch 'bb/unicode-10.0'
2017-07-10 Merge branch 'ks/typofix-commit-c-comment'
next