]> git.ipfire.org Git - thirdparty/git.git/history - git-am.sh
Allow git-merge to select the default strategy.
[thirdparty/git.git] / git-am.sh
2006-12-28  Shawn O. PearceUse GIT_REFLOG_ACTION environment variable instead.
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-12-20  Junio C HamanoMerge branch 'maint'
2006-12-18  Junio C HamanoMerge branch 'jn/web' (early part)
2006-12-14  Junio C HamanoMerge branch 'maint'
2006-12-14  Junio C HamanoMerge branch 'jc/diff--cached'
2006-12-13  Junio C HamanoMerge branch 'jc/read-tree-ignore'
2006-12-13  Junio C HamanoMerge branch 'ew/rerere'
2006-12-09  Eric Wongrerere: record (or avoid misrecording) resolved, skippe...
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-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
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-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-09-28  Junio C HamanoMerge branch 'jc/for-each-ref' into jc/ref-locking
2006-09-21  Junio C HamanoMerge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
2006-09-21  Junio C HamanoMerge branch 'lt/refs' into jc/for-each-ref-with-lt...
2006-09-18  Junio C HamanoFix git-am safety checks
2006-09-18  Junio C HamanoMerge branch 'sk/ftp'
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-18  Junio C HamanoMerge branch 'jc/pack'
2006-09-18  Junio C HamanoMerge branch 'jc/am'
2006-09-16  Junio C HamanoFix git-am safety checks
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-15  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13  Junio C HamanoMerge branch 'jc/racy-delay'
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoMerge branch 'jc/pack-objects'
2006-08-13  Junio C HamanoMerge branch 'js/read-tree'
2006-08-13  Junio C HamanoMerge branch 'js/http-mb'
2006-08-13  Junio C HamanoMerge branch 'js/color-diff'
2006-08-13  Junio C HamanoMerge branch 'jn/web'
2006-08-13  Junio C HamanoMerge branch 'lt/web'
2006-08-13  Junio C HamanoMerge branch 'jn/conf'
2006-08-13  Junio C HamanoMerge branch 'jc/grep'
2006-08-13  Junio C HamanoMerge branch 'mk/rename'
2006-08-13  Junio C HamanoMerge branch 'ml/pager'
2006-08-13  Junio C HamanoMerge branch 'master' into js/c-merge-recursive
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-13  Junio C Hamanogit-am: give better diagnostics when the patch does...
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-31  Junio C HamanoMerge branch 'js/read-tree' into js/c-merge-recursive
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-28  Junio C HamanoMerge branch 'jc/diff'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-25  Junio C HamanoMerge branch 'jc/clone-bind-failure'
2006-07-25  Junio C HamanoMerge branch 'jt/format-patch'
2006-07-25  Junio C HamanoMerge branch 'ew/apply'
2006-07-25  Junio C HamanoMerge branch 'jc/read-tree'
2006-07-25  Junio C HamanoMerge branch 'lt/objformat'
2006-07-24  Lukas Sandströmgit-am: Don't accept an mbox on stdin of we already...
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1
2006-07-14  Shawn PearceRecord rebase changes as 'rebase' in the reflog.
2006-07-13  Junio C HamanoMerge branch 'ml/trace'
2006-07-13  Junio C HamanoMerge branch 'js/merge-base'
2006-07-13  Junio C HamanoMerge branch 'lt/prune'
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree'
2006-07-10  Junio C HamanoMerge branch 'jc/show-merge'
2006-07-10  Pavel RoskinFix more typos, primarily in the code
2006-07-05  Junio C HamanoMerge branch 'jc/sha1'
2006-07-05  Junio C HamanoMerge branch 'jc/diff-test'
2006-07-05  Junio C HamanoMerge branch 'th/diff'
2006-06-29  Junio C HamanoMerge branch 'jc/repack'
2006-06-29  Junio C HamanoMerge branch 'js/patch'
2006-06-27  Dennis StosbergFix expr usage for FreeBSD
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.kernel.org/pub/scm...
2006-06-04  Junio C HamanoMerge branch 'lt/tree-2'
2006-06-04  Junio C HamanoMerge branch 'sp/reflog'
2006-06-03  Junio C HamanoMerge branch 'jc/fmt-patch' into next
2006-06-02  Junio C HamanoMerge branch 'master' into next
2006-06-02  Junio C HamanoMerge branch 'lt/tree-2' into next
2006-06-02  Junio C HamanoMerge branch 'jc/fmt-patch' into next
2006-06-01  Junio C HamanoMerge branch 'master' into next
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-01  Junio C HamanoMerge branch 'master' into next
2006-06-01  Junio C HamanoMerge branch 'nh/http' into next
2006-05-31  Junio C HamanoMerge branch 'jc/fmt-patch' into next
2006-05-31  Junio C HamanoMerge branch 'ff/svnimport' into next
2006-05-31  Junio C HamanoMerge branch 'lt/tree-2' into next
2006-05-30  Junio C HamanoMerge branch 'master' into next
2006-05-30  Junio C HamanoMerge branch 'jc/lt-tree-n-cache-tree' into next
2006-05-29  Junio C HamanoMerge branch 'jc/lt-tree-n-cache-tree' into next
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-28  Junio C HamanoMerge branch 'master' into next
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
next