merge: do not add standard message when message is given with -m option
[gitweb.git] / diff.c
2009-11-16 Merge branch 'bs/maint-pre-commit-hook-sample' into...
2009-11-16 Merge branch 'jk/maint-add-p-empty' into maint
2009-11-16 Merge branch 'js/maint-diff-color-words' into maint
2009-11-16 Merge branch 'tz/maint-rpm' into maint
2009-11-16 Merge branch 'jk/maint-format-patch-p-suppress-stat...
2009-11-16 Merge branch 'pb/maint-gitweb-blob-lineno' into maint
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Merge branch 'vl/maint-openssl-signature-change' into...
2009-11-16 Merge branch 'jk/maint-push-config' into maint
2009-11-16 Merge branch 'sr/blame-incomplete' into maint
2009-11-16 Merge branch 'jc/maint-blank-at-eof' into maint
2009-11-16 Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-10-31 diff --color-words: bit of clean-up
2009-10-30 diff --color-words -U0: fix the location of hunk headers
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-25 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-17 Merge branch 'maint-1.6.4' into maint
2009-10-13 Merge branch 'maint-1.6.4' into maint
2009-10-09 Merge branch 'rs/maint-archive-prefix'
2009-10-09 Merge branch 'maint'
2009-10-08 Merge branch 'maint'
2009-10-04 Merge branch 'maint'
2009-10-04 Merge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-16 Merge branch 'jc/maint-unpack-objects-strict' into...
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-16 Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 diff -B: colour whitespace errors
2009-09-15 diff.c: emit_add_line() takes only the rest of the...
2009-09-15 diff.c: split emit_line() from the first char and the...
2009-09-15 diff.c: shuffling code around
2009-09-15 diff --whitespace: fix blank lines at end
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'pk/fast-import-dirs'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'maint'
2009-09-13 Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-07 Merge branch 'maint'
2009-09-07 Merge branch 'jc/mailinfo-scissors'
2009-09-07 Merge branch 'jk/clone-b'
2009-09-07 Merge branch 'jc/upload-pack-hook'
2009-09-07 Merge branch 'tr/reset-checkout-patch'
2009-09-07 Merge branch 'np/maint-1.6.3-deepen'
2009-09-06 Merge branch 'maint'
2009-09-04 diff --color: color blank-at-eof
2009-09-04 diff --whitespace=warn/error: fix blank-at-eof check
2009-09-04 diff --whitespace=warn/error: obey blank-at-eof
2009-09-04 diff.c: the builtin_diff() deals with only two-file...
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Style fixes, add a space after if/for/while.
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-28 Merge branch 'maint-1.6.3' into maint
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-27 Merge branch 'jc/maint-unpack-objects-strict'
2009-08-26 Merge branch 'maint-1.6.3' into maint
2009-08-26 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
2009-08-25 Merge branch 'aj/fix-read-tree-from-scratch'
2009-08-22 Merge branch 'cc/replace'
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-12 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-11 Merge branch 'js/run-command-updates'
2009-08-08 Merge branch 'maint-1.6.3' into maint
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-05 Merge branch 'sb/read-tree'
2009-08-05 Merge branch 'ne/futz-upload-pack'
2009-08-05 Merge branch 'maint-1.6.3' into maint
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-29 Sync with 1.6.3.4
2009-07-26 Merge branch 'gp/maint-rebase-p-onto'
2009-07-26 Merge branch 'en/fast-export'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'maint'
next