Allow the user to control the verbosity of merge-recursive.
[gitweb.git] / xdiff /
2007-01-09 Merge branch 'maint'
2007-01-05 Merge branch 'maint'
2007-01-01 Merge branch 'sp/merge' (early part)
2006-12-31 Merge branch 'jc/send-pack-pipeline'
2006-12-31 Merge branch 'master' into sp/mmap
2006-12-31 Fix yet another subtle xdl_merge() bug
2006-12-29 Merge branch 'jc/curl'
2006-12-29 Merge branch 'jc/utf8'
2006-12-29 Merge branch 'jc/make'
2006-12-28 xdl_merge(): fix a segmentation fault when refining...
2006-12-27 Merge branch 'master' into js/shallow
2006-12-22 Merge branch 'maint'
2006-12-20 Merge branch 'maint'
2006-12-18 Merge branch 'jn/web' (early part)
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
2006-12-13 Merge branch 'ew/rerere'
2006-12-13 Merge branch 'np/addcommit'
2006-12-13 Merge branch 'lh/branch-rename'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'ap/clone-origin'
2006-12-13 Merge branch 'jc/numstat'
2006-12-13 Merge branch 'rr/cvsexportcommit'
2006-12-13 Merge branch 'ap/branch'
2006-12-13 Merge branch 'js/merge'
2006-12-13 Merge branch 'maint'
2006-12-13 Merge branch 'master' into js/merge
2006-12-13 Merge branch 'maint'
2006-12-11 Merge branch 'maint'
2006-12-07 Merge branch 'maint'
2006-12-06 Merge
2006-12-06 Merge branch 'maint'
2006-12-05 xdl_merge(): fix and simplify conflict handling
2006-12-05 diff -b: ignore whitespace at end of line
2006-12-03 xdl_merge(): fix thinko
2006-12-03 xdl_merge(): fix an off-by-one bug
2006-12-03 xmerge: make return value from xdl_merge() more usable.
2006-12-03 xdiff: add xdl_merge()
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-27 Merge branch 'js/shortlog'
2006-11-27 Merge branch 'jc/merge'
2006-11-27 Merge branch 'jc/pack-peeled'
2006-11-25 Merge branch 'master' into jc/globfetch
2006-11-24 Merge branch 'jn/web'
2006-11-24 Merge branch 'jc/pack-heuristics'
2006-11-24 Merge branch 'jc/numstat'
2006-11-24 Merge branch 'ap/branch-ref-display'
2006-11-24 Merge branch 'ap/prune'
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-24 Increase length of function name buffer
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08 Merge branch 'jc/pickaxe'
2006-11-01 Merge branch 'rs/cherry'
2006-11-01 Merge branch 'jc/refs-and-fetch'
2006-11-01 Merge branch 'lj/refs'
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge branch 'jc/web'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-25 Merge branch 'jc/web-blame'
2006-10-25 Merge branch 'maint'
2006-10-25 xdiff: Match GNU diff behaviour when deciding hunk...
2006-10-24 Merge branch 'master' into jc/web
2006-10-24 Merge branch 'maint'
2006-10-23 xdiff/xemit.c (xdl_find_func): Elide trailing white...
2006-10-23 Merge branch 'np/pack'
2006-10-19 Merge branch 'mw/pathinfo'
2006-10-19 Merge branch 'js/diff'
2006-10-19 Merge branch 'jc/send-email'
2006-10-19 Merge branch 'jc/grep'
2006-10-19 Merge early part of branch 'jc/diff-apply-patch'
2006-10-19 Merge branch 'jc/diff-numstat'
2006-10-19 Merge branch 'mw/send-email'
2006-10-19 Merge branch 'rs/rebase'
2006-10-19 Merge branch 'sb/fetch'
2006-10-19 Merge branch 'sk/svn'
2006-10-19 Merge branch 'rs/zip'
2006-10-17 Merge branch 'maint'
2006-10-17 Fix hash function in xdiff library v1.4.2.4
2006-10-15 Merge branch 'jc/http' v1.4.3-rc3
2006-10-12 diff: fix 2 whitespace issues
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13 Merge branch 'jc/upload-pack'
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08 Merge branch 'master' into pb/gitpm
2006-07-30 Merge branch 'jn/make'
2006-07-26 Merge branch 'pb/configure'
2006-07-17 Merge branch 'sp/reflog' v1.4.2-rc1
2006-07-13 Merge branch 'ml/trace'
2006-07-13 Merge branch 'js/merge-base'
2006-07-13 Merge branch 'lt/prune'
2006-07-13 Merge branch 'lt/merge-tree'
2006-07-10 Merge branch 'jc/show-merge'
2006-07-10 Fix more typos, primarily in the code
2006-07-05 Merge branch 'jc/sha1'
2006-06-29 Merge branch 'jc/repack'
2006-06-29 xdiff: generate "anti-diffs" aka what is common to...
2006-06-26 Merge branch 'jc/squash'
next