]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b73f3d2 6999c54)
Merge branch 'mg/diff-uiconfig-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:41:11 +0000 (09:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:41:11 +0000 (09:41 -0700)
commit5f8937db39c4eb495a48931172348200a91821a3
tree7c34918c45f02e8543c910c16dbf51d69913727ctree | snapshot
parentb73f3d2c7db2e4d9f02ff9d24852685bcb6fa38acommit | diff
parent6999c54029b42ea996c2fff4fa37303f79b9d8c2commit | diff
Merge branch 'mg/diff-uiconfig-doc' into maint

* mg/diff-uiconfig-doc:
  config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/diff-options.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.