Merge branch 'sp/maint-dumb-http-pack-reidx'
[git] / Documentation / howto / revert-a-faulty-merge.txt
2010-05-21  Junio C HamanoMerge branch 'sp/maint-dumb-http-pack-reidx'
2010-05-21  Junio C HamanoMerge branch 'np/index-pack-memsave'
2010-05-21  Junio C HamanoMerge branch 'jc/am-3-show-corrupted-patch'
2010-05-21  Junio C HamanoMerge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21  Junio C HamanoMerge branch 'cw/maint-exec-defpath'
2010-05-21  Junio C HamanoMerge branch 'tr/word-diff'
2010-05-21  Junio C HamanoMerge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-21  Junio C HamanoMerge branch 'np/malloc-threading'
2010-05-21  Junio C HamanoMerge branch 'sr/remote-helper-export'
2010-05-21  Junio C HamanoMerge branch 'ld/discovery-limit-to-fs' (early part)
2010-05-21  Junio C HamanoMerge branch 'ar/config-from-command-line'
2010-05-21  Junio C HamanoMerge branch 'em/checkout-orphan'
2010-05-09  Junio C HamanoMerge branch 'bg/apply-blank-trailing-context'
2010-05-09  Junio C HamanoMerge branch 'bg/send-email-smtpdomain'
2010-05-09  Junio C HamanoMerge branch 'rc/maint-curl-helper'
2010-05-09  Junio C HamanoMerge branch 'hg/maint-attr-fix'
2010-05-09  Junio C HamanoMerge branch 'jc/maint-reflog-expire-unreachable'
2010-05-09  Junio C HamanoMerge branch 'sd/log-decorate'
2010-05-09  Junio C HamanoMerge branch 'mh/status-optionally-refresh'
2010-05-09  Junio C HamanoMerge branch 'cw/ws-indent-with-tab'
2010-05-09  Junio C HamanoMerge branch 'cc/revert-strategy'
2010-05-09  Junio C HamanoMerge branch 'sc/http-late-auth'
2010-05-09  Junio C HamanoMerge branch 'jk/cached-textconv'
2010-05-09  Junio C HamanoMerge branch 'pc/remove-warn'
2010-05-04  Junio C HamanoMerge branch 'maint-1.7.0' into maint
2010-05-02  Junio C HamanoMerge branch 'maint'
2010-04-24  Junio C HamanoMerge branch 'maint'
2010-04-23  Junio C HamanoSync with 1.7.0.6
2010-04-22  Junio C HamanoMerge branch 'maint'
2010-04-20  Junio C HamanoMerge branch 'maint'
2010-04-19  Junio C HamanoMerge branch 'wp/doc-filter-direction'
2010-04-19  Junio C HamanoMerge branch 'jk/maint-diffstat-overflow'
2010-04-19  Junio C HamanoMerge branch 'maint'
2010-04-19  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-17  Junio C HamanoMerge branch 'maint'
2010-04-14  Junio C HamanoMerge branch 'maint'
2010-04-11  Junio C HamanoMerge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11  Junio C HamanoSync with 1.7.0.5
2010-04-11  Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10  Junio C HamanoMerge branch 'mr/gitweb-jsmin'
2010-04-10  Junio C HamanoMerge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10  Junio C HamanoMerge branch 'maint'
2010-04-10  Junio C HamanoMerge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-09  Junio C HamanoMerge early parts of jk/cached-textconv
2010-04-09  Junio C HamanoMerge branch 'maint'
2010-04-07  Junio C HamanoMerge branch 'mg/notes-reflog'
2010-04-07  Junio C HamanoMerge branch 'jn/mailinfo-scissors'
2010-04-06  Junio C HamanoMerge branch 'da/maint-python-startup'
2010-04-06  Junio C HamanoMerge branch 'ic/bash-completion-rpm'
2010-04-06  Junio C HamanoMerge branch 'sb/fmt-merge-msg'
2010-04-06  Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-04-06  Junio C HamanoMerge branch 'ef/maint-empty-commit-log'
2010-04-06  Junio C HamanoMerge branch 'sg/bash-completion'
2010-04-04  Junio C HamanoMerge branch 'maint'
2010-04-03  Junio C HamanoMerge branch 'mb/rebase-i-no-ff'
2010-03-24  Marc BranchaudTeach rebase the --no-ff option.
2010-03-08  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-07  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat'
2010-03-05  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list'
2010-03-02  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-10  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-08  Junio C HamanoMerge branch 'jc/maint-imap-config-parse' into maint
2010-02-08  Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07  Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31  Junio C HamanoMerge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24  Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-17  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-31  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-27  Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03  Junio C HamanoMerge branch 'jc/maint-am-keep' into maint
2009-11-30  Junio C HamanoMerge branch 'jc/maint-am-keep'
2009-10-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-09-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16  Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-01  Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-21  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-16  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix'
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-07-29  Junio C HamanoMerge branch 'hv/cvsps-tests'
2009-07-02  Junio C HamanoMerge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
next