Merge branch 'bc/object-id'
[gitweb.git] / builtin / merge-index.c
2015-02-25 Merge branch 'ak/git-pm-typofix'
2015-02-25 Merge branch 'sb/plug-leak-in-make-cache-entry'
2015-02-25 Merge branch 'mh/transport-capabilities'
2015-02-25 Merge branch 'jc/send-email-sensible-encoding'
2015-02-25 Merge branch 'jk/sanity'
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jk/fast-import-die-nicely-fix'
2015-02-25 Merge branch 'dp/remove-duplicated-header-inclusion'
2015-02-25 Merge branch 'jc/max-io-size-and-ssize-max'
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/strbuf-doc-to-header'
2015-02-25 Merge branch 'nd/attr-optim'
2015-02-25 Merge branch 'jn/doc-api-errors'
2015-02-25 Sync with 2.3.1
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-02-22 Merge branch 'jc/conf-var-doc'
2015-02-22 Merge branch 'es/squelch-openssl-warnings-on-macosx'
2015-02-22 Merge branch 'tc/curl-vernum-output-broken-in-7.11'
2015-02-22 Merge branch 'jk/prune-mtime'
2015-02-22 Merge branch 'jc/diff-files-ita'
2015-02-22 Merge branch 'ps/submodule-sanitize-path-upon-add'
2015-02-22 Merge branch 'ab/merge-file-prefix'
2015-02-22 Merge branch 'es/blame-commit-info-fix'
2015-02-22 Merge branch 'ss/check-builtins-on-windows'
2015-02-18 Merge branch 'jc/push-cert'
2015-02-18 Merge branch 'jk/decimal-width-for-uintmax'
2015-02-18 Merge branch 'jk/config-no-ungetc-eof'
2015-02-18 Merge branch 'jk/pack-bitmap'
2015-02-18 Merge branch 'jc/remote-set-url-doc'
2015-02-18 Merge branch 'ch/new-gpg-drops-rfc-1991'
2015-02-18 Merge branch 'ye/http-accept-language'
2015-02-18 Merge branch 'av/wincred-with-at-in-username-fix'
2015-02-17 Merge branch 'mg/push-repo-option-doc'
2015-02-17 Merge branch 'jc/t4122-use-test-write-lines'
2015-02-17 Merge branch 'jk/status-read-branch-name-fix'
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17 Merge branch 'jc/diff-format-doc'
2015-02-17 Merge branch 'jk/dumb-http-idx-fetch-fix'
2015-02-17 Merge branch 'mg/commit-author-no-match-malformed-message'
2015-02-17 Merge branch 'jc/doc-log-rev-list-options'
2015-02-17 Merge branch 'jc/apply-ws-fix-expands'
2015-02-17 Merge branch 'ak/add-i-empty-candidates'
2015-02-17 Merge branch 'ks/rebase-i-abbrev'
2015-02-17 Merge branch 'mh/deref-symref-over-helper-transport'
2015-02-11 Merge branch 'ah/usage-strings'
2015-01-14 standardize usage info string format
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-09-09 Merge branch 'rs/clean-menu-item-defn'
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 'mh/attr-macro-doc'
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 'rs/doc-submitting-patches' into maint
2013-12-17 Merge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-17 Merge branch 'nd/magic-pathspec' into maint
2013-12-12 Merge branch 'rs/doc-submitting-patches'
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-12-06 Merge branch 'nd/magic-pathspec'
2013-12-05 Merge branch 'jn/mediawiki-makefile-updates'
next