git-merge: fail correctly when we cannot fast forward.
[git] / diff.c
2007-02-26  Junio C HamanoMerge branch 'jc/merge-symlink' into maint
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-24  Junio C Hamanodiff-patch: Avoid emitting double-slashes in textual...
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13  Linus TorvaldsMark places that need blob munging later for CRLF conve...
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12  Junio C HamanoMerge git-gui
2007-02-12  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-11  Alexandre Julliarddiff.c: More logical file name quoting for renames...
2007-02-11  Alexandre Julliarddiff.c: Properly quote file names in diff --summary...
2007-02-11  Alexandre Julliarddiff.c: Reuse the pprint_rename function for diff ...
2007-02-10  Junio C Hamanodiff_flush_name(): take struct diff_options parameter.
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15  J. Bruce FieldsMerge branch 'master' of git://git./git/git
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import
2007-01-12  Junio C HamanoMerge branch 'jc/bare'
2007-01-12  Junio C HamanoMerge branch 'jc/detached-head'
2007-01-09  Junio C HamanoMerge branch 'maint'
2007-01-08  Junio C HamanoMerge branch 'jc/reflog'
2007-01-08  Andy Whitcroftshort i/o: fix calls to write to use xwrite or write_in...
2007-01-07  Junio C HamanoMerge branch 'sp/mmap'
2007-01-07  Junio C HamanoMerge branch 'jr/status'
2007-01-07  Junio C HamanoMerge branch 'jc/remote'
2007-01-07  Junio C Hamanodiff-index --cached --raw: show tree entry on the LHS...
2007-01-05  Junio C HamanoMerge branch 'maint'
2006-12-31  Junio C HamanoMerge branch 'master' into sp/mmap
2006-12-29  Shawn O. PearceReplace mmap with xmmap, better handling MAP_FAILED.
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow
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  Johannes Schindelindiff --check: fix off by one error
2006-12-21  Junio C HamanoMerge branch 'ew/svn-pm'
2006-12-20  Junio C HamanoMerge branch 'jc/leftright'
2006-12-20  Junio C HamanoMerge branch 'jc/blame'
2006-12-20  Junio C HamanoMerge branch 'jc/branch-remove-remote'
2006-12-20  Junio C HamanoMerge branch 'jc/clone'
2006-12-20  Junio C HamanoMerge branch 'maint'
2006-12-20  Junio C Hamanosimplify inclusion of system header files.
2006-12-20  Junio C Hamanofix populate-filespec
2006-12-18  Junio C HamanoMerge branch 'jc/blame-boundary'
2006-12-18  Junio C HamanoMerge branch 'jn/web' (early part)
2006-12-16  Nicolas Pitremake commit message a little more consistent and conforting
2006-12-16  Shawn O. PearceAvoid accessing a slow working copy during diffcore...
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-13  Junio C HamanoMerge branch 'np/addcommit'
2006-12-13  Junio C HamanoMerge branch 'lh/branch-rename'
2006-12-13  Junio C HamanoMerge branch 'jc/commit-careful'
2006-12-13  Junio C HamanoMerge branch 'ap/clone-origin'
2006-12-13  Junio C HamanoMerge branch 'jc/numstat'
2006-12-13  Junio C HamanoMerge branch 'rr/cvsexportcommit'
2006-12-13  Junio C HamanoMerge branch 'ap/branch'
2006-12-13  Junio C HamanoMerge branch 'js/merge'
2006-12-13  Junio C HamanoMerge branch 'maint'
2006-12-13  Andy ParkinsAllow subcommand.color and color.subcommand color confi...
2006-12-11  Junio C Hamanodiff --numstat: show binary with '-' to match "apply...
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-13  Junio C HamanoMerge branch 'maint'
2006-11-12  Junio C HamanoMerge branch 'maint'
2006-11-11  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08  Junio C HamanoMerge branch 'maint'
2006-11-07  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'maint'
2006-11-04  Junio C HamanoMerge branch 'maint'
2006-11-03  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'jc/refs-and-fetch'
2006-11-01  Junio C HamanoMerge branch 'lj/refs'
2006-10-31  Junio C HamanoMerge branch 'maint'
2006-10-27  Junio C HamanoMerge branch 'maint'
2006-10-26  Junio C HamanoMerge branch 'jc/combined'
2006-10-26  Junio C HamanoMerge branch 'jc/combined'
2006-10-25  Junio C HamanoMerge branch 'maint'
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-25  Junio C HamanoMerge branch 'jc/web-blame'
2006-10-25  Junio C HamanoMerge branch 'maint'
2006-10-24  Junio C HamanoMerge branch 'master' into jc/web
2006-10-24  Junio C HamanoMerge branch 'maint'
2006-10-23  Junio C HamanoMerge branch 'np/pack'
2006-10-23  Junio C HamanoMerge branch 'maint'
2006-10-20  Junio C HamanoMerge branch 'maint'
2006-10-20  Junio C HamanoMerge branch 'maint'
2006-10-19  Junio C HamanoMerge branch 'mw/pathinfo'
2006-10-19  Junio C HamanoMerge branch 'js/diff'
2006-10-19  Junio C HamanoMerge branch 'jc/send-email'
2006-10-19  Junio C HamanoMerge branch 'jc/grep'
2006-10-19  Junio C HamanoMerge early part of branch 'jc/diff-apply-patch'
2006-10-19  Junio C HamanoMerge branch 'jc/diff-numstat'
2006-10-17  Junio C HamanoMerge branch 'maint'
next