Merge branch 'nd/commit-editor-cleanup'
commit46c0f913a49218a8a94d30c5a2df792a16aab827
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:07:47 +0000 (25 11:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:07:48 +0000 (25 11:07 -0700)
treeefc504f849bced5dd3c5b155ab5c4fce4fcbcf14
parentd4c6e9fb6f0db328a40905a3555f8f41d37aaec5
parent75df1f434f8cfdac1c8eeacae259ab375c01385b
Merge branch 'nd/commit-editor-cleanup'

"git commit --cleanup=<mode>" learned a new mode, scissors.

* nd/commit-editor-cleanup:
  commit: add --cleanup=scissors
  wt-status.c: move cut-line print code out to wt_status_add_cut_line
  wt-status.c: make cut_line[] const to shrink .data section a bit
Documentation/git-commit.txt
builtin/commit.c
wt-status.c