git-merge: fail correctly when we cannot fast forward.
[git] / diff.c
2006-10-14  Junio C Hamanodiff --numstat
2006-10-05  Johannes SchindelinTurn on recursive with --summary
2006-10-02  Junio C HamanoMerge branch 'master' into lj/refs
2006-10-02  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'sb/fetch' into jc/refs-and-fetch
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-10-01  Junio C HamanoMerge branch 'jc/diff-stat'
2006-10-01  Junio C HamanoMerge branch 'lt/web'
2006-09-30  Junio C Hamanogit-diff -B output fix. v1.4.2.2
2006-09-29  Junio C Hamanogit-diff -B output fix.
2006-09-29  Johannes Schindelindiff --stat: ensure at least one '-' for deletions...
2006-09-29  Linus Torvaldsdiff --stat=width[,name-width]: allow custom diffstat...
2006-09-28  Junio C HamanoMerge branch 'jl/virtual'
2006-09-28  Junio C HamanoMerge branch 'master' into lj/refs
2006-09-28  Junio C HamanoMerge branch 'cc/branch-test'
2006-09-28  Junio C HamanoMerge branch 'jc/for-each-ref' into jc/ref-locking
2006-09-28  Junio C HamanoMerge branch 'sp/void'
2006-09-28  Junio C HamanoMerge branch 'jc/whitespace'
2006-09-27  Junio C Hamanodiff --stat: color output.
2006-09-27  Junio C Hamanodiff --stat: allow custom diffstat output width.
2006-09-24  Junio C Hamanodiff.c: second war on whitespace.
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 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-18  Junio C HamanoMerge branch 'jk/diff'
2006-09-17  Junio C HamanoMerge branch 'jc/archive'
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-13  Junio C HamanoMerge branch 'jc/unpack'
2006-09-13  Junio C HamanoMerge branch 'jc/binary'
2006-09-08  Jeff KingMove color option parsing out of diff.c and into color...
2006-09-07  Jeff Kingdiff: support custom callbacks for output
2006-09-07  Junio C Hamanodiff --binary generates full index on binary files.
2006-09-07  Junio C HamanoMerge branch 'jc/daemon'
2006-09-03  Junio C HamanoMerge branch 'master' into cc/trace
2006-09-02  Shawn PearceReplace uses of strdup with xstrdup.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28  Junio C HamanoMerge branch 'gl/web'
2006-08-28  Junio C HamanoMerge branch 'gl/cleanup-next'
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive'
2006-08-28  Junio C HamanoMerge branch 'ts/daemon'
2006-08-28  Junio C HamanoMerge branch 'jc/apply'
2006-08-26  Junio C HamanoMerge branch 'master' into gl/web
2006-08-26  Junio C HamanoMerge branch 'gl/cleanup'
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next
2006-08-23  Shawn PearceConvert memcpy(a,b,20) to hashcpy(a,b).
2006-08-21  Junio C HamanoMerge branch 'maint'
2006-08-17  David RientjesDo not use memcmp(sha1_1, sha1_2, 20) with hardcoded...
2006-08-17  Junio C Hamanodiff.c: make binary patch reversible.
2006-08-17  Junio C HamanoMerge branch 'jc/format-patch'
2006-08-16  Junio C HamanoMerge branch 'jc/racy'
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-16  David Rientjesremove unnecessary initializations
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-15  David Rientjesmake inline is_null_sha1 global
2006-08-15  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-08-15  David Rientjesdiff.c cleanup
2006-08-14  Junio C HamanoMerge branch 'maint'
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 '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-12  Junio C HamanoMerge branch 'rj/header'
2006-08-10  Johannes SchindelinAdd the --color-words option to the diff options family
2006-08-10  Junio C HamanoMerge branch 'master' into mk/rename
2006-08-09  Junio C Hamanoallow diff.renamelimit to be set regardless of -M/-C v1.4.2-rc4
2006-08-09  Junio C Hamanomake --find-copies-harder imply -C
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-08-04  Junio C HamanoMerge branch 'jc/c99'
2006-08-03  Junio C HamanoMerge branch 'jc/sideband'
2006-08-03  Junio C Hamanodiff.c: do not use pathname comparison to tell renames
2006-08-01  Junio C HamanoMerge branch 'rs/rebase'
2006-08-01  Junio C HamanoMerge branch 'ml/pager'
2006-07-31  Matthias Lederhoferpager: config variable pager.color
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  Jeff KingColorize 'commit' lines in log ui
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1
2006-07-14  Junio C HamanoMerge branch 'lt/unitype'
2006-07-14  Junio C HamanoMerge branch 'sp/lazy-mkdir'
next