git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55ff630 50fb51e)
Merge branch 'jm/diff-context-config'
authorJeff King <redacted>
Thu, 25 Oct 2012 10:41:57 +0000 (06:41 -0400)
committerJeff King <redacted>
Thu, 25 Oct 2012 10:41:57 +0000 (06:41 -0400)
Teaches a new configuration variable to "git diff" Porcelain and
its friends.

* jm/diff-context-config:
  t4055: avoid use of sed 'a' command
  diff: diff.context configuration gives default to -U


Trivial merge
git clone https://git.99rst.org/PROJECT