Merge branch 'ot/pretty'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:29 +0000 (11:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:29 +0000 (11:16 -0800)
Code clean-up.

* ot/pretty:
  format: create docs for pretty.h
  format: create pretty.h file

1  2 
builtin/notes.c
builtin/reset.c
builtin/show-branch.c

diff --cc builtin/notes.c
Simple merge
diff --cc builtin/reset.c
Simple merge
Simple merge