git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef6b43a 6999c54)
Merge branch 'mg/diff-uiconfig-doc'
authorJunio C Hamano <redacted>
Fri, 6 May 2011 17:49:53 +0000 (10:49 -0700)
committerJunio C Hamano <redacted>
Fri, 6 May 2011 17:49:53 +0000 (10:49 -0700)
* mg/diff-uiconfig-doc:
  config.txt,diff-options.txt: porcelain vs. plumbing for color.diff

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
Documentation/diff-options.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
diff --cc Documentation/diff-options.txt
Simple merge
git clone https://git.99rst.org/PROJECT