Merge branch 'jk/status-read-branch-name-fix' into maint
[git] / merge.c
2015-02-25  Junio C HamanoMerge branch 'jk/status-read-branch-name-fix' into...
2015-02-25  Junio C HamanoMerge branch 'mg/push-repo-option-doc' into maint
2015-02-25  Junio C HamanoMerge branch 'jn/rerere-fail-on-auto-update-failure...
2015-02-25  Junio C HamanoMerge branch 'jk/blame-commit-label' into maint
2015-01-21  Junio C HamanoMerge branch 'jk/http-push-symref-fix'
2015-01-21  Junio C HamanoMerge branch 'ak/show-branch-usage-string'
2015-01-20  Junio C HamanoMerge branch 'jk/colors'
2015-01-14  Junio C HamanoMerge branch 'rc/for-each-ref-tracking'
2015-01-14  Junio C HamanoMerge branch 'ak/show-branch-usage-string'
2015-01-14  Junio C HamanoMerge branch 'mm/complete-rebase-autostash'
2015-01-14  Junio C HamanoMerge branch 'aw/doc-smtp-ssl-cert-path'
2015-01-14  Junio C HamanoMerge branch 'km/log-usage-string-i18n'
2015-01-14  Junio C HamanoMerge branch 'jk/prune-packed-server-info'
2015-01-12  Junio C HamanoMerge branch 'jk/read-packed-refs-without-path-max...
2015-01-12  Junio C HamanoMerge branch 'mh/find-uniq-abbrev' into maint
2015-01-12  Junio C HamanoMerge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-12  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse' into...
2015-01-12  Junio C HamanoMerge branch 'es/checkout-index-temp'
2015-01-07  Junio C HamanoMerge branch 'maint-2.1' into maint
2015-01-07  Junio C HamanoMerge branch 'maint-2.0' into maint-2.1
2015-01-07  Junio C HamanoMerge branch 'sb/t5400-remove-unused'
2015-01-07  Junio C HamanoMerge branch 'lh/send-email-hide-x-mailer'
2015-01-07  Junio C HamanoMerge branch 'rd/send-email-2047-fix'
2015-01-07  Junio C HamanoMerge branch 'pd/completion-filenames-fix'
2015-01-07  Junio C HamanoMerge branch 'jk/add-i-read-error'
2015-01-07  Junio C HamanoMerge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-07  Junio C HamanoMerge branch 'jc/merge-bases'
2015-01-07  Junio C HamanoMerge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
2015-01-07  Junio C HamanoMerge branch 'jc/diff-b-m'
2015-01-07  Junio C HamanoMerge branch 'jc/clone-borrow'
2015-01-07  Junio C HamanoMerge branch 'jc/checkout-local-track-report'
2014-12-22  Junio C HamanoMerge branch 'rs/use-strbuf-complete-line'
2014-12-22  Junio C HamanoMerge branch 'jg/prompt-localize-temporary'
2014-12-22  Junio C HamanoMerge branch 'jk/commit-date-approxidate'
2014-12-22  Junio C HamanoMerge branch 'nd/split-index'
2014-12-22  Junio C HamanoMerge branch 'jk/read-packed-refs-without-path-max'
2014-12-22  Junio C HamanoMerge branch 'jk/colors'
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22  Junio C HamanoMerge branch 'js/test-hashmap-squelch-gcc'
2014-12-22  Junio C HamanoMerge branch 'js/fsck-tag-validation'
2014-12-22  Junio C HamanoMerge branch 'po/doc-assume-unchanged'
2014-12-22  Junio C HamanoMerge branch 'mg/branch-d-m-f'
2014-12-22  Junio C HamanoMerge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22  Junio C HamanoMerge branch 'sv/doc-stripspace'
2014-12-22  Junio C HamanoMerge branch 'rt/completion-tag'
2014-12-22  Junio C HamanoMerge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
2014-12-22  Junio C HamanoMerge branch 'jk/credential-quit'
2014-12-22  Junio C HamanoMerge branch 'dm/compat-s-ifmt-for-zos'
2014-12-22  Junio C HamanoMerge branch 'jc/hook-cleanup'
2014-12-22  Junio C HamanoMerge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
2014-12-22  Junio C HamanoMerge branch 'rj/t0050-passes'
2014-12-22  Junio C HamanoMerge branch 'jc/exec-cmd-system-path-leak-fix'
2014-12-22  Junio C HamanoMerge branch 'mh/find-uniq-abbrev'
2014-12-22  Junio C HamanoMerge branch 'dw/shell-basename-dashdash-before-strippi...
2014-12-22  Junio C HamanoMerge branch 'rj/no-xopen-source-for-cygwin'
2014-12-22  Junio C HamanoMerge branch 'js/t5000-dont-copy-bin-sh'
2014-12-22  Junio C HamanoMerge branch 'jc/refer-to-t-readme-from-submitting...
2014-12-22  Junio C HamanoMerge branch 'tb/config-core-filemode-check-on-broken-fs'
2014-12-22  Junio C HamanoMerge branch 'cc/interpret-trailers-more'
2014-12-22  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-22  Junio C HamanoMerge branch 'po/everyday-doc' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/push-simple' into maint
2014-12-22  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking...
2014-12-22  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param...
2014-12-22  Junio C HamanoMerge branch 'rs/receive-pack-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'rs/maint-config-use-labs' into maint
2014-12-22  Junio C HamanoMerge branch 'js/windows-open-eisdir-error' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/colors-fix' into maint
2014-12-22  Junio C HamanoMerge branch 'jk/checkout-from-tree' into maint
2014-12-17  Junio C HamanoSync with v2.1.4
2014-12-17  Junio C HamanoSync with v2.0.5
2014-12-12  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-12-12  Junio C HamanoMerge branch 'jk/push-simple'
2014-12-12  Junio C HamanoMerge branch 'jk/colors-fix'
2014-12-12  Junio C HamanoMerge branch 'rt/push-recurse-submodule-usage-string'
2014-12-12  Junio C HamanoMerge branch 'jk/rebuild-perl-scripts-with-no-perl...
2014-12-12  Junio C HamanoMerge branch 'sv/typofix-apply-error-message'
2014-12-12  Junio C HamanoMerge branch 'po/everyday-doc'
2014-12-12  Junio C HamanoMerge branch 'jc/unpack-trees-plug-leak'
2014-12-05  Junio C HamanoMerge branch 'mh/config-flip-xbit-back-after-checking'
2014-12-05  Junio C HamanoMerge branch 'jk/gitweb-with-newer-cgi-multi-param'
2014-12-05  Junio C HamanoMerge branch 'rs/receive-pack-use-labs'
2014-12-05  Junio C HamanoMerge branch 'rs/maint-config-use-labs'
2014-12-05  Junio C HamanoMerge branch 'js/windows-open-eisdir-error'
2014-12-05  Junio C HamanoMerge branch 'sv/get-builtin'
2014-12-05  Junio C HamanoMerge branch 'jk/checkout-from-tree'
2014-11-19  Junio C HamanoMerge branch 'sv/submitting-final-patch'
2014-11-19  Junio C HamanoMerge branch 'sn/tutorial-status-output-example'
2014-11-19  Junio C HamanoMerge branch 'mh/doc-remote-helper-xref'
2014-11-19  Junio C HamanoMerge branch 'tb/no-relative-file-url'
2014-11-19  Junio C HamanoMerge branch 'cc/interpret-trailers'
2014-11-18  Junio C HamanoMerge branch 'jc/doc-commit-only'
2014-11-18  Junio C HamanoMerge branch 'da/difftool'
2014-11-12  Junio C HamanoSync with 'maint'
2014-11-12  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace' into...
2014-11-12  Junio C HamanoMerge branch 'jk/fetch-reflog-df-conflict'
2014-11-11  Junio C HamanoSync with maint
2014-11-11  Junio C HamanoMerge branch 'rs/clean-menu-item-defn' into maint
2014-11-10  Junio C HamanoSync with maint
next