projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-merge: fail correctly when we cannot fast forward.
[git] / git-am.sh
2007-02-26  Junio C HamanoMerge branch 'jc/merge-symlink' into maint blob | commitdiff | raw
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint blob | commitdiff | raw
2007-02-24  Junio C HamanoReword git-am 3-way fallback failure message. blob | commitdiff | raw
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-12  Junio C HamanoMerge git-gui blob | commitdiff | raw | diff to current
2007-02-12  Junio C HamanoTeach git-am to pass -p option down to git-apply blob | commitdiff | raw | diff to current
2007-02-08  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport blob | commitdiff | raw | diff to current
2007-02-08  Michael S. Tsirkinadd -C[NUM] to git-am blob | commitdiff | raw | diff to current
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-01-15  J. Bruce FieldsMerge branch 'master' of git://git./git/git blob | commitdiff | raw | diff to current
2007-01-14  Junio C HamanoMerge branch 'sp/merge' (early part) blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import blob | commitdiff | raw | diff to current
2007-01-12  Junio C HamanoMerge branch 'jc/bare' blob | commitdiff | raw | diff to current
2007-01-12  Junio C HamanoMerge branch 'jc/detached-head' blob | commitdiff | raw | diff to current
2007-01-10  Shawn O. PearceDisallow working directory commands in a bare repository. blob | commitdiff | raw | diff to current
2007-01-10  Junio C HamanoMerge branch 'js/reflog' blob | commitdiff | raw | diff to current
2007-01-10  Junio C Hamano-u is now default for 'git-mailinfo'. blob | commitdiff | raw | diff to current
2007-01-10  Junio C Hamanogit-am: should work when "--no-utf8 --utf8" is given blob | commitdiff | raw | diff to current
2007-01-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-08  Junio C HamanoMerge branch 'jc/reflog' blob | commitdiff | raw | diff to current
2007-01-08  Junio C Hamano--utf8 is now default for 'git-am' blob | commitdiff | raw | diff to current
2007-01-07  Junio C HamanoMerge branch 'sp/mmap' blob | commitdiff | raw | diff to current
2007-01-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-01  Junio C HamanoMerge branch 'sp/merge' (early part) blob | commitdiff | raw | diff to current
2006-12-29  Junio C HamanoMerge branch 'jc/curl' blob | commitdiff | raw | diff to current
2006-12-29  Shawn O. PearceUse merge-recursive in git-am -3. blob | commitdiff | raw | diff to current
2006-12-29  Junio C HamanoMerge branch 'jc/utf8' blob | commitdiff | raw | diff to current
2006-12-29  Junio C HamanoMerge branch 'jc/make' blob | commitdiff | raw | diff to current
2006-12-28  Junio C HamanoMerge branch 'js/shallow' blob | commitdiff | raw | diff to current
2006-12-28  Shawn O. PearceUse GIT_REFLOG_ACTION environment variable instead. blob | commitdiff | raw | diff to current
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/skip-count' blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive' blob | commitdiff | raw | diff to current
2006-12-22  Junio C HamanoMerge branch 'master' into jc/fsck-reflog blob | commitdiff | raw | diff to current
2006-12-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-22  Shawn O. PearceSuggest 'add' in am/revert/cherry-pick. blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-18  Junio C HamanoMerge branch 'jn/web' (early part) blob | commitdiff | raw | diff to current
2006-12-14  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-14  Junio C HamanoMerge branch 'jc/diff--cached' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'jc/read-tree-ignore' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'ew/rerere' blob | commitdiff | raw | diff to current
2006-12-09  Eric Wongrerere: record (or avoid misrecording) resolved, skippe... blob | commitdiff | raw | diff to current
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-10-25  Junio C HamanoMerge branch 'aw/cvsimport' blob | commitdiff | raw | diff to current
2006-10-25  Junio C HamanoMerge for-each-ref to sync gitweb fully with 'next' blob | commitdiff | raw | diff to current
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm' blob | commitdiff | raw | diff to current
2006-09-28  Junio C HamanoMerge branch 'jc/for-each-ref' into jc/ref-locking blob | commitdiff | raw | diff to current
2006-09-21  Junio C HamanoMerge branch 'lt/refs' into jc/lt-ref2-with-lt-refs blob | commitdiff | raw | diff to current
2006-09-21  Junio C HamanoMerge branch 'lt/refs' into jc/for-each-ref-with-lt... blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoFix git-am safety checks blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoMerge branch 'sk/ftp' blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoMerge branch 'jc/pack' blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoMerge branch 'jc/am' blob | commitdiff | raw | diff to current
2006-09-16  Junio C HamanoFix git-am safety checks blob | commitdiff | raw | diff to current
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-08-15  Junio C HamanoMerge branch 'master' into pb/gitpm blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/racy-delay' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/pack-objects' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'js/read-tree' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'js/http-mb' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'js/color-diff' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jn/web' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'lt/web' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jn/conf' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/grep' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'mk/rename' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'ml/pager' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'master' into js/c-merge-recursive blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2 blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-08-13  Junio C Hamanogit-am: give better diagnostics when the patch does... blob | commitdiff | raw | diff to current
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm blob | commitdiff | raw | diff to current
2006-07-31  Junio C HamanoMerge branch 'js/read-tree' into js/c-merge-recursive blob | commitdiff | raw | diff to current
2006-07-30  Junio C HamanoMerge branch 'jn/make' blob | commitdiff | raw | diff to current
2006-07-28  Junio C HamanoMerge branch 'jc/diff' blob | commitdiff | raw | diff to current
2006-07-26  Junio C HamanoMerge branch 'pb/configure' blob | commitdiff | raw | diff to current
2006-07-25  Junio C HamanoMerge branch 'jc/clone-bind-failure' blob | commitdiff | raw | diff to current
2006-07-25  Junio C HamanoMerge branch 'jt/format-patch' blob | commitdiff | raw | diff to current
2006-07-25  Junio C HamanoMerge branch 'ew/apply' blob | commitdiff | raw | diff to current
2006-07-25  Junio C HamanoMerge branch 'jc/read-tree' blob | commitdiff | raw | diff to current
2006-07-25  Junio C HamanoMerge branch 'lt/objformat' blob | commitdiff | raw | diff to current
2006-07-24  Lukas Sandströmgit-am: Don't accept an mbox on stdin of we already... blob | commitdiff | raw | diff to current
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1 blob | commitdiff | raw | diff to current
2006-07-14  Shawn PearceRecord rebase changes as 'rebase' in the reflog. blob | commitdiff | raw | diff to current
2006-07-13  Junio C HamanoMerge branch 'ml/trace' blob | commitdiff | raw | diff to current
2006-07-13  Junio C HamanoMerge branch 'js/merge-base' blob | commitdiff | raw | diff to current
2006-07-13  Junio C HamanoMerge branch 'lt/prune' blob | commitdiff | raw | diff to current
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree' blob | commitdiff | raw | diff to current
2006-07-10  Junio C HamanoMerge branch 'jc/show-merge' blob | commitdiff | raw | diff to current
2006-07-10  Pavel RoskinFix more typos, primarily in the code blob | commitdiff | raw | diff to current
2006-07-05  Junio C HamanoMerge branch 'jc/sha1' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.