rebase: allow --merge option to handle patches merged upstream
[git] / .gitignore
2006-06-22  Matthias Kestenholzadd GIT-CFLAGS to .gitignore
2006-06-22  Junio C HamanoMerge branch 'js/lsfix'
2006-06-22  Junio C HamanoMerge branch 'ew/rebase'
2006-06-22  Junio C HamanoMerge branch 'jn/web'
2006-06-22  Junio C HamanoMerge early parts of branch 'js/diff'
2006-06-22  Junio C HamanoMerge branch 'jc/upload-corrupt'
2006-06-22  Junio C HamanoMerge branch 'ew/rebase' into next
2006-06-22  Junio C HamanoMerge branch 'jn/web' into next
2006-06-22  Junio C HamanoMerge branch 'master' into next
2006-06-21  Junio C HamanoMerge branch 'jn/web' into next
2006-06-21  Junio C HamanoMerge branch 'ew/rebase' into next
2006-06-21  Junio C HamanoMerge branch 'ff/c99' into next
2006-06-21  Junio C HamanoMerge branch 'jc/upload-corrupt' into next
2006-06-21  Junio C HamanoRetire git-clone-pack
2006-06-18  Junio C HamanoMerge early part of branch 'jc/fetchupload'
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-04  Junio C HamanoMerge branch 'sp/reflog'
2006-06-02  Junio C HamanoMerge branch 'nh/http'
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-01  Junio C HamanoMerge branch 'nh/http' into next
2006-05-31  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-30  Junio C HamanoMerge branch 'ew/tests'
2006-05-29  Junio C HamanoMerge branch 'lt/apply'
2006-05-29  Junio C HamanoMerge branch 'jc/cache-tree'
2006-05-29  Junio C HamanoMerge branch 'lt/tree' into jc/lt-tree-n-cache-tree
2006-05-28  Junio C HamanoMerge branch 'jc/cache-tree' into next
2006-05-28  Junio C HamanoMerge branch 'master' into next
2006-05-28  Junio C HamanoMerge branch 'jc/mailinfo'
2006-05-28  Junio C HamanoMerge branch 'eb/mailinfo'
2006-05-26  Junio C HamanoMerge branch 'master' into next
2006-05-26  Junio C HamanoMerge branch 'eb/mailinfo' into next
2006-05-26  Junio C HamanoMerge branch 'ew/tests' into next
2006-05-25  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-25  Junio C HamanoMerge branch 'jc/fetchupload' into next
2006-05-25  Shawn PearceBuilt git-upload-tar should be ignored.
2006-05-24  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-24  Junio C HamanoMerge branch 'master' into sp/reflog
2006-05-24  Junio C HamanoMerge branch 'lt/apply' into next
2006-05-24  Junio C HamanoMerge branch 'jc/fmt-patch'
2006-05-24  Junio C HamanoMerge branch 'js/fmt-patch'
2006-05-24  Junio C HamanoMerge branch 'jc/fetch-sorted'
2006-05-24  Junio C HamanoMerge branch 'lt/dirwalk'
2006-05-24  Junio C HamanoMerge branch 'master' into next
2006-05-23  Junio C HamanoMerge branch 'master' into next
2006-05-23  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-23  Junio C HamanoMerge branch 'eb/mailinfo' into next
2006-05-23  Junio C HamanoMerge branch 'be/tag' into next
2006-05-23  Junio C HamanoMerge branch 'jc/builtin-n-tar-tree' into next
2006-05-23  Junio C HamanoMerge branch 'jc/tartree' into jc/builtin-n-tar-tree
2006-05-23  Junio C HamanoMerge branch 'jc/dirwalk-n-cache-tree' into next
2006-05-23  Junio C HamanoMerge branch 'master' into next
2006-05-23  Peter EriksenAdd git-quiltimport to .gitignore.
2006-05-23  Junio C HamanoMerge branch 'se/http' into next
2006-05-23  Junio C HamanoMerge branch 'jc/fmt-patch' into next
2006-05-22  Junio C HamanoMerge branch 'jc/fetch-sorted' into next
2006-05-22  Junio C HamanoMerge branch 'master' into next
2006-05-22  Junio C HamanoMerge branch 'jc/mailinfo' into next
2006-05-21  Junio C HamanoMerge branch 'js/fmt-patch' into next
2006-05-21  Junio C HamanoMerge branch 'js/fmt-patch' into next
2006-05-20  Junio C HamanoMerge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
2006-05-20  Junio C HamanoMerge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20  Junio C HamanoMerge branch 'jc/tartree' into next
2006-05-20  Junio C HamanoMerge branch 'master' into next
2006-05-20  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-19  Junio C HamanoMerge branch 'eb/quilt' into next
2006-05-19  Junio C HamanoMerge branch 'ts/doctar' into next
2006-05-19  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18  Junio C HamanoMerge branch 'master' into next
2006-05-18  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18  Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-17  Junio C HamanoMerge branch 'jc/apply' into next
2006-05-17  Junio C HamanoMerge branch 'jc/read-tree-safety' into next
2006-05-17  Junio C HamanoMerge branch 'lt/grep' into next
2006-05-17  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-17  Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-17  Junio C HamanoMerge branch 'ew/pretty-fmt' into next
2006-05-17  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-17  Junio C HamanoMerge branch 'master' into next
2006-05-16  Junio C HamanoMerge branch 'np/pack' into next
2006-05-16  Junio C HamanoMerge branch 'jc/diff' into next
2006-05-16  Junio C HamanoMerge branch 'master' into next
2006-05-16  Junio C HamanoMerge branch 'jc/apply' into next
2006-05-15  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-15  Junio C HamanoMerge branch 'ew/send-email' into next
2006-05-15  Junio C HamanoMerge branch 'np/pack' into next
2006-05-15  Junio C HamanoMerge branch 'lt/oneway' into next
2006-05-15  Junio C HamanoMerge branch 'se/tag' into next
2006-05-15  Junio C HamanoMerge branch 'jc/grep' into next
2006-05-15  Junio C HamanoMerge branch 'jc/apply' into next
2006-05-15  Junio C HamanoMerge branch 'lt/oneway' into next
2006-05-15  Junio C HamanoMerge branch 'se/diff' into next
2006-05-15  Junio C HamanoMerge branch 'se/rebase' into next
2006-05-14  Junio C HamanoMerge branch 'se/rev-parse' into next
2006-05-14  Junio C HamanoMerge branch 'lt/oneway' into next
2006-05-14  Junio C HamanoMerge branch 'lt/diff' into next
next