git-merge: fail correctly when we cannot fast forward.
[git] / git-revert.sh
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12  Junio C HamanoMerge git-gui
2007-02-08  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-04  Junio C HamanoMerge branch 'master' into np/dreflog
2007-02-03  Junio C Hamanohonor GIT_REFLOG_ACTION in git-commit
2007-01-31  Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git
2007-01-30  Shawn O. PearceMerge branch 'master' into sp/gfi
2007-01-29  Tom Prince[PATCH] Rename git-repo-config to git-config.
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15  Shawn O. PearceUse nice names in conflict markers during cherry-pick...
2007-01-15  Junio C HamanoUse merge-recursive in git-revert/git-cherry-pick
2007-01-15  J. Bruce FieldsMerge branch 'master' of git://git./git/git
2007-01-14  Junio C HamanoMerge branch 'jc/int'
2007-01-14  Junio C HamanoMerge branch 'sp/merge' (early part)
2007-01-14  Junio C HamanoMerge branch 'jc/subdir'
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import
2007-01-13  Junio C HamanoConsistent message encoding while reusing log from...
2007-01-13  Junio C HamanoAllow whole-tree operations to be started from a subdir...
2007-01-12  Bob Proulxgit-revert: Fix die before git-sh-setup defines it.
2007-01-12  Junio C HamanoMerge branch 'jc/bare'
2007-01-10  Shawn O. PearceDisallow working directory commands in a bare repository.
2007-01-09  Junio C HamanoMerge branch 'maint'
2007-01-05  Junio C HamanoMerge branch 'maint'
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow
2006-12-25  Junio C HamanoMerge branch 'jc/skip-count'
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive'
2006-12-22  Junio C HamanoMerge branch 'master' into jc/fsck-reflog
2006-12-22  Junio C HamanoMerge branch 'maint'
2006-12-22  Shawn O. PearceSuggest 'add' in am/revert/cherry-pick.
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-13  Junio C HamanoMerge branch 'maint'
2006-11-12  Junio C HamanoMerge branch 'maint'
2006-11-11  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge branch 'jc/pickaxe'
2006-11-07  Junio C HamanoMerge branch 'jc/read-tree'
2006-11-07  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'lt/push-config'
2006-11-05  Junio C HamanoMerge branch 'pb/web'
2006-11-04  Junio C HamanoMerge branch 'maint'
2006-11-03  Junio C HamanoMerge branch 'master' into np/index-pack
2006-11-03  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'rs/cherry'
2006-11-01  Junio C HamanoMerge branch 'jc/refs-and-fetch'
2006-11-01  Junio C HamanoMerge branch 'lj/refs'
2006-10-27  Junio C HamanoMerge branch 'jc/reflog' into lj/refs
2006-10-25  Junio C HamanoMerge branch 'aw/cvsimport'
2006-10-25  Junio C HamanoMerge for-each-ref to sync gitweb fully with 'next'
2006-10-25  Junio C HamanoMerge branch 'jc/web-blame'
2006-10-24  Junio C HamanoMerge branch 'master' into jc/web
2006-10-23  Junio C HamanoMerge branch 'np/pack'
2006-10-19  Junio C HamanoMerge branch 'mw/pathinfo'
2006-10-19  Junio C HamanoMerge branch 'js/diff'
2006-10-19  Junio C HamanoMerge branch 'jc/send-email'
2006-10-19  Junio C HamanoMerge branch 'jc/grep'
2006-10-19  Junio C HamanoMerge early part of branch 'jc/diff-apply-patch'
2006-10-19  Junio C HamanoMerge branch 'rs/rebase'
2006-10-19  Junio C HamanoMerge branch 'sb/fetch'
2006-10-19  Junio C HamanoMerge branch 'sk/svn'
2006-10-19  Junio C HamanoMerge branch 'rs/zip'
2006-10-17  Junio C HamanoMerge branch 'maint'
2006-10-16  Luben Tuikovgit-revert with conflicts to behave as git-merge with...
2006-10-15  Junio C HamanoMerge branch 'jc/http' v1.4.3-rc3
2006-10-10  Junio C HamanoFix git-revert
2006-10-06  Junio C Hamanocherry-pick: make -r the default
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1
2006-07-13  Junio C HamanoMerge branch 'ml/trace'
2006-07-13  Junio C HamanoFix grammatical error in git-revert
2006-06-18  Junio C HamanoMerge branch 'jc/rw-prefix'
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04  Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-29  Junio C HamanoMerge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28  Junio C HamanoMerge branch 'jc/cache-tree' into next
2006-05-21  Junio C HamanoMerge branch 'master' into js/fmt-patch
2006-05-20  Junio C HamanoMerge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20  Junio C HamanoMerge branch 'js/fetchconfig'
2006-05-19  Junio C HamanoMerge part of 'js/fmt-patch' for RFC2822 dates into...
next