add_cache_entry(): removal of file foo does not conflict with foo/bar
[gitweb.git] / git-am.sh
2007-04-04 Merge branch 'jc/bisect'
2007-04-04 Merge 1.5.0.7 in
2007-03-30 Merge branch 'maint'
2007-03-28 Merge branch 'maint' to synchronize with 1.5.0.6
2007-03-26 Merge branch 'jc/fpl'
2007-03-25 Merge branch 'maint'
2007-03-25 Merge branch 'js/remote-show-push'
2007-03-25 Merge branch 'maint'
2007-03-25 Use diff* with --exit-code in git-am, git-rebase and...
2007-03-24 Merge branch 'maint'
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 Merge branch 'maint'
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-19 Merge branch 'sp/run-command'
2007-03-18 Merge 1.5.0.5 in from 'maint'
2007-03-17 Merge branch 'maint'
2007-03-14 Merge GIT 1.5.0.4
2007-03-14 Merge branch 'jc/repack'
2007-03-14 Merge branch 'jc/fetch'
2007-03-14 Merge branch 'dz/mailinfo'
2007-03-13 builtin-mailinfo.c infrastrcture changes
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-05 Merge branch 'js/fetch-progress' (early part)
2007-03-02 Merge branch 'js/commit-format'
2007-02-28 Merge branch 'js/bundle'
2007-02-28 Merge branch 'mc/sendmail'
2007-02-27 Merge branch 'np/types' into jc/fetch
2007-02-26 Merge branch 'master' into js/diff-ni
2007-02-26 Merge branch 'jc/merge-symlink' into maint
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-24 Merge branch 'js/apply'
2007-02-24 Merge branch 'js/no-limit-boundary'
2007-02-24 Merge branch 'js/etc-config'
2007-02-24 Merge branch 'maint'
2007-02-24 Reword git-am 3-way fallback failure message.
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-14 Merge branch 'js/reverse'
2007-02-14 Merge branch 'jc/diff-apply-patch'
2007-02-14 Merge branch 'jc/merge-base' (early part)
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui
2007-02-12 Teach git-am to pass -p option down to git-apply
2007-02-08 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-08 add -C[NUM] to git-am
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15 Merge branch 'master' of git://git./git/git
2007-01-14 Merge branch 'sp/merge' (early part)
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-12 Merge branch 'jc/bare'
2007-01-12 Merge branch 'jc/detached-head'
2007-01-10 Disallow working directory commands in a bare repository.
2007-01-10 Merge branch 'js/reflog'
2007-01-10 -u is now default for 'git-mailinfo'.
2007-01-10 git-am: should work when "--no-utf8 --utf8" is given
2007-01-09 Merge branch 'maint'
2007-01-08 Merge branch 'jc/reflog'
2007-01-08 --utf8 is now default for 'git-am'
2007-01-07 Merge branch 'sp/mmap'
2007-01-05 Merge branch 'maint'
2007-01-01 Merge branch 'sp/merge' (early part)
2006-12-29 Merge branch 'jc/curl'
2006-12-29 Use merge-recursive in git-am -3.
2006-12-29 Merge branch 'jc/utf8'
2006-12-29 Merge branch 'jc/make'
2006-12-28 Merge branch 'js/shallow'
2006-12-28 Use GIT_REFLOG_ACTION environment variable instead.
2006-12-27 Merge branch 'master' into js/shallow
2006-12-25 Merge branch 'jc/skip-count'
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-22 Merge branch 'master' into jc/fsck-reflog
2006-12-22 Merge branch 'maint'
2006-12-22 Suggest 'add' in am/revert/cherry-pick.
2006-12-20 Merge branch 'maint'
2006-12-18 Merge branch 'jn/web' (early part)
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
2006-12-13 Merge branch 'ew/rerere'
2006-12-09 rerere: record (or avoid misrecording) resolved, skippe...
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-01 Merge branch 'jc/gitpm'
2006-09-28 Merge branch 'jc/for-each-ref' into jc/ref-locking
2006-09-21 Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
2006-09-21 Merge branch 'lt/refs' into jc/for-each-ref-with-lt...
2006-09-18 Fix git-am safety checks
2006-09-18 Merge branch 'sk/ftp'
2006-09-18 Merge part of branch 'jc/upload-pack'
2006-09-18 Merge branch 'jc/pack'
2006-09-18 Merge branch 'jc/am'
2006-09-16 Fix git-am safety checks
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-15 Merge branch 'master' into pb/gitpm
next