checkout: use --aggressive when running a 3-way merge (-m).
[git.git] / diff.h
2006-04-17 Junio C HamanoMerge branch 'jc/bottomless'
2006-04-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-16 Johannes Schindelindiff-options: add --patch-with-stat
2006-04-15 Junio C HamanoMerge branch 'dl/xdiff'
2006-04-15 Junio C HamanoMerge branch 'js/diffstat'
2006-04-13 Johannes Schindelindiff-options: add --stat (take 2)
2006-04-12 Junio C HamanoMerge branch 'jc/combine' into next
2006-04-11 Junio C HamanoMerge branch 'jc/combine' into next
2006-04-11 Junio C HamanoMerge branch 'jc/diff' into next
2006-04-11 Junio C HamanoMerge branch 'ds/index' into next
2006-04-11 Junio C HamanoMerge branch 'jc/withraw' into next
2006-04-11 Petr BaudisDocument --patch-with-raw
2006-04-11 Junio C HamanoMerge branch 'eb/apply' into next
2006-04-11 Junio C HamanoMerge branch 'jc/withraw' into next
2006-04-11 Junio C Hamanodiff-* --patch-with-raw
2006-04-10 Junio C Hamanotree-diff: do not assume we use only one pathspec
2006-04-10 Junio C HamanoMerge branch 'master' into jc/diff
2006-04-10 Junio C HamanoMerge branch 'lt/rev'
2006-04-10 Junio C HamanoRetire diffcore-pathspec.
2006-04-08 Junio C HamanoMerge branch 'nh/http'
2006-04-08 Junio C HamanoMerge branch 'jc/blame'
2006-04-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Junio C HamanoMerge branch 'maint'
2006-04-07 Junio C HamanoMerge branch 'jc/blame' into next
2006-04-05 Junio C HamanoMerge branch 'jc/blame' into next
2006-04-05 Junio C HamanoMerge branch 'nh/http' into next
2006-04-05 Junio C HamanoMerge branch 'jc/clone'
2006-04-05 Junio C HamanoMerge branch 'pb/regex'
2006-04-05 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Junio C HamanoMerge branch 'jc/combine' into next
2006-04-05 Junio C HamanoMerge branches 'master' and 'jc/combine' into next
2006-04-05 Junio C HamanoMerge branch 'fix'
2006-04-05 Junio C HamanoMerge branch 'nh/http' into next
2006-04-04 Junio C HamanoMerge branch 'jc/combine' into next
2006-04-04 Junio C HamanoMerge branch 'pb/regex' into next
2006-04-04 Petr BaudisSupport for pickaxe matching regular expressions
2006-04-04 Junio C HamanoMerge branch 'lt/fix-sol-pack'
2006-04-04 Junio C HamanoMerge branch 'lt/fix-sol-pack' into next
2006-04-02 Junio C HamanoMerge branch 'lt/fix-sol-pack' into next
2006-03-31 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-30 Junio C Hamanotree/diff header cleanup.
2006-03-26 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Junio C HamanoMerge branch 'jc/nostat'
2006-02-13 Junio C HamanoMerge branch 'jc/nostat'
2006-02-12 Junio C HamanoMerge branch 'jc/nostat'
2006-02-11 Junio C HamanoMerge branch 'lt/diff-tree'
2006-02-10 Junio C HamanoMerge branch 'master'
2006-02-10 Junio C HamanoMerge branch 'lt/diff-tree'
2006-02-10 Junio C Hamanocombine-diff: Record diff status a bit more faithfully
2006-02-10 Junio C HamanoMerge branch 'jc/status'
2006-02-10 Junio C HamanoMerge branch 'master'
2006-02-10 Junio C HamanoMerge branch 'lt/diff-tree'
2006-02-09 Junio C Hamanocombine-diff: move formatting logic to show_combined_diff()
2006-02-09 Linus Torvaldsdiff-tree -c raw output
2006-02-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-06 Junio C Hamanocombine-diff: show mode changes as well.
2006-02-06 Junio C HamanoMerge branch 'jc/diff'
2006-02-06 Junio C Hamanocombine-diff: remove misguided --show-empty hack.
2006-02-01 Linus TorvaldsMake the "struct tree_desc" operations available to...
2006-01-30 Junio C HamanoMerge fixes up to GIT 1.1.6
2006-01-28 Junio C HamanoMerge lt/revlist,jc/diff,jc/revparse,jc/abbrev
2006-01-28 Junio C Hamanoabbrev cleanup: use symbolic constants
2006-01-28 Junio C Hamanodiff-files: -c and --cc options.
2006-01-28 Junio C Hamanodiff-tree --cc: denser combined diff output for a merge...
2006-01-28 Junio C Hamanodiff-tree -c: show a merge commit a bit more sensibly.
2005-12-21 Junio C HamanoGIT 1.0.0 v1.0.0
2005-12-20 Junio C Hamanodiff --abbrev: document --abbrev=<n> form.
2005-12-20 Junio C Hamanodiff: --abbrev option
2005-12-07 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-26 Junio C HamanoGIT 0.99.9k v0.99.9k
2005-11-22 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Junio C HamanoMove diff.renamelimit out of default configuration.
2005-11-20 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-17 Junio C HamanoGIT 0.99.9j aka 1.0rc3 v0.99.9j v1.0rc3
2005-11-17 Junio C Hamanodiff: --full-index
2005-11-07 Junio C HamanoGIT 0.99.9e v0.99.9e
2005-10-31 Junio C HamanoGIT 0.99.9a v0.99.9a
2005-10-28 Chris ShoemakerDocumentation changes to recursive option for git-diff...
2005-10-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Junio C HamanoMerge branch 'fixes'
2005-10-23 Linus TorvaldsSplit up tree diff functions into tree-diff.c library
2005-10-16 Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git
2005-10-05 Junio C HamanoMerge branch 'fixes'
2005-10-05 Junio C HamanoMerge branch 'fixes'
2005-10-05 Junio C HamanoFix diff-filter All-Or-None mark.
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-25 Junio C HamanoDiff: --name-status output format.
2005-09-25 Junio C HamanoDiff: -l<num> to limit rename/copy detection.
2005-09-25 Junio C HamanoDiff clean-up.
2005-09-25 Junio C HamanoMerge branch 'fixes'
2005-09-24 Junio C HamanoMerge 'fixes' branch.
2005-09-23 Junio C HamanoMerge branch 'fixes'
2005-09-22 Junio C HamanoRetire diff-helper.
2005-08-30 Junio C HamanoMerge refs/heads/master from paulus
2005-08-19 Junio C HamanoMerge from gitk
next