git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ba17892)
cherry-pick/revert: more compact user direction message
authorNicolas Pitre <redacted>
Tue, 30 Oct 2007 19:59:24 +0000 (15:59 -0400)
committerJunio C Hamano <redacted>
Tue, 30 Oct 2007 23:49:27 +0000 (16:49 -0700)
commit04bd8e5fea48a00816b461b0fb934627cfd2c45f
treeebc278188354368360f4adef67bef5dcd92c35c3tree | snapshot
parentba17892ddc85c0ffe8fecd600c29cb38ec7e5587commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin-revert.c diff | blob | history
git clone https://git.99rst.org/PROJECT