| commit | f52463a58275c8dd12b26b02bc0388d015547fcc | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sun, 4 Mar 2007 13:26:05 +0000 (4 14:26 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 4 Mar 2007 21:15:09 +0000 (4 13:15 -0800) | ||
| tree | d189ddbeb7c8764033cff419d19592c9ab5fc724 | treesnapshot (tar.gz zip) |
| parent | 9509af686bffdbd7c3f17faf3c07d2034d480ffc | commitdiff |
cherry-pick: Suggest a better method to retain authorship
When a cherry-pick failed, we used to recommend setting environment
variables to retain the authorship. It is much easier, though, to use
the "-c" flag of git-commit.
Print this message also when merge-recursive fails (the code used to
exit(1) in that case, never reaching the proper failure path).
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
When a cherry-pick failed, we used to recommend setting environment
variables to retain the authorship. It is much easier, though, to use
the "-c" flag of git-commit.
Print this message also when merge-recursive fails (the code used to
exit(1) in that case, never reaching the proper failure path).
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| builtin-revert.c | diffblobblamehistory |