mergetool: Don't keep temporary merge files unless told to
[gitweb.git] / diff.c
2008-11-14 Merge git://git.bogomips.org/git-svn
2008-11-14 Merge branch 'maint'
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'ds/uintmax-config' (early part)
2008-11-13 Merge branch 'jk/maint-commit-v-strip'
2008-11-13 Merge branch 'np/pack-safer'
2008-11-13 Merge branch 'mk/maint-cg-push'
2008-11-13 Merge branch 'bc/maint-keep-pack'
2008-11-13 Merge branch 'mv/remote-rename'
2008-11-13 Merge branch 'jk/deny-push-to-current'
2008-11-13 Merge branch 'dl/xdiff'
2008-11-13 Merge branch 'lt/decorate'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'jk/diff-convfilter-test-fix'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-12 Merge branch 'maint'
2008-11-11 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'ds/autoconf'
2008-11-09 Merge branch 'rs/blame'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-05 Merge branch 'mv/parseopt-checkout-index'
2008-11-04 Merge branch 'maint'
2008-11-03 Merge branch 'maint'
2008-11-03 Merge branch 'np/index-pack'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'ag/blame-encoding'
2008-11-03 Merge branch 'gb/gitweb-pathinfo'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'maint'
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-31 Merge branch 'maint'
2008-10-31 Merge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-27 Merge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Merge branch 'maint'
2008-10-26 only textconv regular files
2008-10-26 userdiff: require explicitly allowing textconv
2008-10-26 refactor userdiff textconv code
2008-10-26 diff: add missing static declaration
2008-10-25 Always initialize xpparam_t to 0
2008-10-22 Merge branch 'jk/diff-convfilter'
2008-10-22 Merge branch 'js/maint-fetch-update-head'
2008-10-22 Merge branch 'jc/maint-co-track'
2008-10-21 Merge branch 'jc/maint-reset-remove-unmerged-new'
2008-10-21 Merge branch 'maint'
2008-10-21 Merge branch 'maint'
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-19 Merge branch 'sh/maint-rebase3'
2008-10-19 Merge branch 'tr/workflow-doc'
2008-10-19 Merge branch 'mv/clonev'
2008-10-19 Merge branch 'ae/preservemerge'
2008-10-19 Merge branch 'mv/merge-noff'
2008-10-19 Merge branch 'ns/rebase-noverify'
2008-10-19 Merge branch 'maint'
2008-10-18 Merge branch 'maint'
2008-10-18 Merge branch 'db/maint-checkout-b' into maint
2008-10-18 diff: add filter for converting binary to text
2008-10-18 diff: introduce diff.<driver>.binary
2008-10-18 diff: unify external diff and funcname parsing code
2008-10-18 Merge branch 'pb/commit-where'
2008-10-17 Merge branch 'jk/maint-ls-files-other' into jk/fix...
2008-10-17 Merge branch 'maint'
2008-10-13 Merge branch 'maint'
2008-10-12 Merge branch 'maint'
2008-10-12 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT...
2008-10-10 Merge branch 'maint'
2008-10-09 Merge branch 'js/objc-funchdr'
2008-10-09 Merge branch 'pb/gitweb'
2008-10-09 Merge branch 'bc/xdiffnl'
2008-10-09 Merge branch 'dp/cywginstat'
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Merge branch 'jc/add-ita'
2008-10-09 Merge branch 'mw/sendemail'
2008-10-09 Merge branch 'mv/merge-refresh'
2008-10-09 Merge branch 'ph/parseopt'
2008-10-09 Merge branch 'rz/grepz'
2008-10-09 Merge branch 'mg/verboseprune'
2008-10-09 Merge branch 'maint'
2008-10-09 Merge branch 'sg/maint-intrebase-msghook' into maint
2008-10-09 Merge branch 'jk/maint-soliconv' into maint
2008-10-08 Merge branch 'maint'
2008-10-06 Teach git diff about Objective-C syntax
2008-10-06 Merge branch 'maint'
2008-10-06 fix bogus "diff --git" header from "diff --no-index"
2008-10-03 Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
2008-10-03 Merge branch 'maint'
2008-10-03 fix openssl headers conflicting with custom SHA1 implem...
2008-10-01 Merge branch 'maint'
2008-09-30 Merge branch 'maint'
2008-09-30 diff.c: remove duplicate bibtex pattern introduced...
2008-09-29 Merge branch 'bc/master-diff-hunk-header-fix'
2008-09-29 Merge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-29 Merge branch 'bc/maint-diff-hunk-header-fix' into maint
next