Andrew's git / gitweb.git / diff
?
Merge branch 'mg/doc-status-color-slot'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2015 23:01:34 +0000 (16:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2015 23:01:34 +0000 (16:01 -0700)
Documentation fixes.

* mg/doc-status-color-slot:
config,completion: add color.status.unmerged

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history
diff --cc Documentation/config.txt
Simple merge
diff --cc contrib/completion/git-completion.bash
Simple merge