projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0584326 6440d34)
Merge branch 'tr/maint-word-diff-regex-sticky' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:34:43 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:34:44 +0000 (10:34 -0700)
commit7b90ed59fab1b288b4a9ac888d1c5a194a66c812
treef64d4a88e69cc3c65ee0dc2c57ad532a4c25a05etree | snapshot
parent058432635bba2e0b282725865437fbd57ddfa02ecommit | diff
parent6440d3417c1d51a20014d4b6fc6c59bacfa87dabcommit | diff
Merge branch 'tr/maint-word-diff-regex-sticky' into maint

The regexp configured with diff.wordregex was incorrectly reused
across files.

By Thomas Rast (2) and Johannes Sixt (1)
* tr/maint-word-diff-regex-sticky:
  diff: tweak a _copy_ of diff_options with word-diff
  diff: refactor the word-diff setup from builtin_diff_cmd
  t4034: diff.*.wordregex should not be "sticky" in --word-diff
diff.c diff1 | diff2 | blob | history
Git—the stupid content tracker