Add a test for read-tree -u --reset with a D/F conflict
[git] / git-filter-branch.sh
2008-03-09  Junio C HamanoMerge branch 'ph/parseopt'
2008-03-09  Junio C HamanoMerge branch 'dp/clean-fix'
2008-03-09  Junio C HamanoMerge branch 'ml/submodule-add-existing'
2008-03-09  Junio C HamanoMerge branch 'mr/compat-snprintf'
2008-03-09  Junio C HamanoMerge branch 'sp/fetch-optim'
2008-03-09  Junio C HamanoMerge branch 'jc/describe-always'
2008-03-09  Junio C HamanoMerge branch 'jc/am'
2008-03-09  Junio C HamanoMerge branch 'cr/reset-parseopt'
2008-03-09  Junio C HamanoMerge branch 'jn/gitweb-pickaxe'
2008-03-09  Junio C HamanoMerge branch 'kb/maint-filter-branch-disappear'
2008-03-08  Junio C Hamanofilter-branch: handle "disappearing tree" case correctl...
2008-03-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-01  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2008-03-01  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-27  Junio C HamanoMerge branch 'js/branch-track'
2008-02-27  Junio C HamanoMerge branch 'db/checkout'
2008-02-27  Junio C HamanoMerge branch 'jc/diff-relative'
2008-02-27  Junio C HamanoMerge branch 'js/maint-http-push' into maint
2008-02-25  Junio C HamanoMerge branch 'lt/dirstat'
2008-02-25  Junio C HamanoMerge branch 'jc/apply-whitespace'
2008-02-23  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23  Junio C HamanoMerge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-21  Junio C HamanoMerge branch 'js/maint-http-push'
2008-02-21  Junio C HamanoMerge branch 'jk/empty-tree'
2008-02-21  Junio C HamanoMerge branch 'lt/revision-walker'
2008-02-21  Junio C HamanoMerge branch 'mc/prefix'
2008-02-21  Junio C HamanoMerge branch 'bc/fopen'
2008-02-21  Junio C HamanoMerge branch 'jc/setup'
2008-02-18  Junio C HamanoMerge branch 'br/gitweb'
2008-02-17  Junio C HamanoMerge branch 'bd/qsort'
2008-02-17  Junio C HamanoMerge branch 'sp/safecrlf'
2008-02-17  Junio C HamanoMerge branch 'cc/browser'
2008-02-17  Junio C HamanoMerge branch 'jc/gitignore-ends-with-slash'
2008-02-17  Junio C HamanoMerge branch 'pb/prepare-commit-msg'
2008-02-17  Junio C HamanoMerge branch 'jk/noetcconfig'
2008-02-17  Junio C HamanoMerge branch 'jc/submittingpatches'
2008-02-17  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-16  Junio C HamanoMerge branch 'maint'
2008-02-16  Junio C Hamanofilter-branch: handle filenames that need quoting
2008-02-13  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-12  Junio C HamanoMerge branch 'lt/in-core-index'
2008-02-12  Junio C HamanoMerge branch 'ph/describe-match'
2008-01-31  Junio C HamanoRevert "filter-branch docs: remove brackets so not...
2008-01-31  Brandon Caseyfilter-branch: assume HEAD if no revision supplied
2008-01-31  Brandon Caseyfilter-branch docs: remove brackets so not to imply...
2008-01-30  Brandon Caseyfilter-branch.sh: remove temporary directory on failure
2008-01-24  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-11  Junio C HamanoMerge ../gitk
2008-01-09  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2008-01-08  Junio C HamanoMerge in GIT 1.5.3.8
2008-01-07  Junio C Hamanofilter-branch: work correctly with ambiguous refnames
2008-01-05  Junio C HamanoMerge git://repo.or.cz/git-gui
2007-12-31  Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-18  Jim Meyeringgit-filter-branch.sh: more portable tr usage: use ...
2007-12-18  Johannes Sixtfilter-branch: Remove broken and unnecessary summary...
2007-12-18  Junio C HamanoMerge branch 'maint'
2007-12-18  H.Merijn Brandthe use of 'tr' in the test suite isn't really portable
2007-12-09  Junio C HamanoMerge branch 'jc/spht'
2007-12-09  Junio C HamanoMerge branch 'maint'
2007-12-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-12-07  Junio C HamanoMerge branch 'maint'
2007-12-06  Junio C HamanoMerge branch 'maint'
2007-12-05  Junio C HamanoMerge branch 'nd/maint-work-tree-fix' into maint
2007-12-05  Junio C HamanoMerge branch 'wc/add-i'
2007-12-05  Junio C HamanoMerge branch 'kh/commit'
2007-12-05  Junio C HamanoMerge branch 'sp/refspec-match'
2007-12-03  Junio C HamanoMerge branch 'js/prune-expire'
2007-12-03  Junio C HamanoMerge branch 'js/export-with-assignment'
2007-12-02  Junio C HamanoMerge branch 'maint'
2007-12-02  Junio C HamanoMerge branch 'tt/help'
2007-12-01  Junio C HamanoMerge branch 'jc/move-gitk'
2007-12-01  Junio C HamanoMerge branch 'jc/branch-contains'
2007-12-01  Junio C HamanoMerge branch 'cr/tag-options'
2007-12-01  Junio C HamanoMerge 1.5.3.7 in
2007-12-01  Junio C HamanoMerge branch 'maint'
2007-11-30  Junio C HamanoMerge branch 'jk/maint-cvsimport-fix' into maint
2007-11-29  Johannes SchindelinReplace instances of export VAR=VAL with VAR=VAL; expor...
2007-11-29  Junio C HamanoMerge branch 'maint'
2007-11-29  Junio C Hamanoscripts: do not get confused with HEAD in work tree
2007-11-28  Johannes Schindelinfilter-branch: fix dirty way to provide the helpers...
2007-11-26  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'jk/send-pack'
2007-11-25  Junio C HamanoMerge branch 'js/mingw-fallouts'
2007-11-25  Junio C HamanoMerge branch 'mh/rebase-skip-hard'
2007-11-25  Junio C HamanoMerge branch 'cc/bisect'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2007-11-21  Junio C HamanoMerge branch 'maint'
2007-11-19  Junio C HamanoMerge branch 'maint'
2007-11-19  Junio C HamanoMerge branch 'lt/rev-list-gitlink'
2007-11-19  Junio C HamanoMerge branch 'ds/checkout-upper'
2007-11-19  Junio C HamanoMerge branch 'sh/p4'
2007-11-19  Junio C HamanoMerge branch 'lt/rev-list-interactive'
next