Add a test for read-tree -u --reset with a D/F conflict
[git] / git-am.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 'kb/maint-filter-branch-disappear'
2008-03-09  Junio C HamanoMerge branch 'maint' to sync with 1.5.4.4
2008-03-08  Junio C HamanoMerge branch 'aw/maint-shortlog-blank-lines'
2008-03-08  Junio C HamanoMerge branch 'maint'
2008-03-08  Junio C HamanoMerge branch 'js/reflog-delete'
2008-03-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-05  Junio C Hamanoam: --rebasing
2008-03-05  Junio C Hamanoam: remove support for -d .dotest
2008-03-05  Junio C Hamanoam: read from the right mailbox when started from a...
2008-03-04  Junio C HamanoMerge branch 'maint'
2008-03-03  Junio C HamanoMerge branch 'maint'
2008-03-03  Junio C HamanoMerge branch 'np/verify-pack'
2008-03-02  Junio C HamanoMerge branch 'sp/describe-tag'
2008-03-02  Junio C HamanoMerge branch 'pb/cvsimport'
2008-03-02  Junio C HamanoMerge branch 'jc/maint-log-merge-left-right'
2008-03-02  Junio C HamanoMerge branch 'mh/maint-http-proxy-fix'
2008-03-02  Junio C HamanoMerge branch 'cb/http-test'
2008-03-02  Junio C HamanoMerge branch 'jc/remote-multi-url'
2008-03-02  Junio C HamanoMerge branch 'jn/gitweb-grep'
2008-03-02  Junio C HamanoMerge branch 'mk/maint-parse-careful'
2008-03-02  Junio C HamanoMerge branch 'sb/describe-long'
2008-03-02  Junio C HamanoMerge branch 'ew/maint-svn-cert-fileprovider'
2008-03-02  Junio C HamanoMerge branch 'js/maint-daemon'
2008-03-01  Jeff Kingallow git-am to run in a subdirectory
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-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-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-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-02-04  Junio C HamanoMerge branch 'maint'
2008-02-04  Jörg Sommergit-am: fix type in its usage string
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-05  Michael Stefaniucgit-am: Run git gc only once and not for every patch.
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  Junio C HamanoMerge branch 'maint'
2007-12-10  Junio C HamanoMerge branch 'master' into cc/help
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 'mw/cvsserver'
2007-12-07  Junio C HamanoMerge branch 'kh/fetch-optparse'
2007-12-07  Junio C HamanoMerge branch 'jc/git-log-doc'
2007-12-07  Junio C HamanoMerge branch 'jc/docmake-perl'
2007-12-07  Junio C HamanoMerge branch 'maint'
2007-12-06  Junio C HamanoMerge branch 'maint'
2007-12-06  Junio C Hamanogit-am -i: report rewritten title
2007-12-05  Junio C HamanoMerge branch 'nd/maint-work-tree-fix' into maint
2007-12-05  Junio C HamanoRevert "git-am: catch missing author date early."
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-03  Junio C HamanoMerge branch 'js/fast-export'
2007-12-03  Junio C HamanoMerge branch 'js/rebase-i-rerere'
2007-12-03  Junio C HamanoMerge branch 'js/pull-rebase'
2007-12-03  Junio C HamanoMerge branch 'wc/rebase-insn'
2007-12-03  Junio C HamanoMerge branch 'jc/typebreak'
2007-12-03  Junio C HamanoMerge branch 'jc/color'
2007-12-03  Junio C HamanoMerge branch 'dc/gitweb'
2007-12-02  Junio C Hamanogit-am: catch missing author date early.
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  Junio C HamanoMerge branch 'maint'
2007-11-29  Junio C Hamanoscripts: do not get confused with HEAD in work tree
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'
next