Code

cherry-pick/revert: more compact user direction message
authorNicolas Pitre <nico@cam.org>
Tue, 30 Oct 2007 19:59:24 +0000 (15:59 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 23:49:27 +0000 (16:49 -0700)
commit04bd8e5fea48a00816b461b0fb934627cfd2c45f
treeebc278188354368360f4adef67bef5dcd92c35c3
parentba17892ddc85c0ffe8fecd600c29cb38ec7e5587
cherry-pick/revert: more compact user direction message

A failed cherry-pick (and friend) currently says:

|Automatic cherry-pick failed.  After resolving the conflicts,
|mark the corrected paths with 'git-add <paths>'
|and commit the result.

This can obviously be displayed on two lines only.
While at it, change "git-add" to "git add".

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-revert.c