]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55ff630 50fb51e)
Merge branch 'jm/diff-context-config'
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:41:57 +0000 (06:41 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 10:41:57 +0000 (06:41 -0400)
commit8de8f9f656696a3c04e5f0a274b57e4a719a66ce
tree181e8f9626ed245aab923a60294085ffd368cc55tree | snapshot
parent55ff63007509d075d32861ff48cc8bb57d445b2acommit | diff
parent50fb51e7e81748182a770d3943ec5730357b27e7commit | diff
Merge branch 'jm/diff-context-config'

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
Unnamed repository; edit this file 'description' to name the repository.