On Tue, Feb 15, 2011 at 23:59, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > >> I wonder if cherry-pick shouldn't also write MERGE_MSG or similar so >> that gets taken care of automatically? ÂThat would also allow options >> like -x and -m to work better. > > Hm, that probably is a good idea. > >> diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt >> index 749d68a..e8db99b 100644 >> --- a/Documentation/git-cherry-pick.txt >> +++ b/Documentation/git-cherry-pick.txt >> @@ -16,6 +16,25 @@ Given one or more existing commits, apply the change each one >> Âintroduces, recording a new commit for each. ÂThis requires your >> Âworking tree to be clean (no modifications from the HEAD commit). >> >> +When it is not obvious how to apply a change, the following >> +happens: >> + >> +1. The current branch and `HEAD` pointer stay at the last commit >> + Â successfully made. >> +2. The `CHERRY_HEAD` ref is set to point at the commit that >> + Â introduced the change that is difficult to apply. >> +3. Paths in which the change applied cleanly are updated both >> + Â in the index file and in your working tree. >> +4. For conflicting paths, the index file records up to three >> + Â versions, as described in the "TRUE MERGE" section of >> + Â linkgit:git-merge[1]. ÂThe working tree files will include >> + Â a description of the conflict bracketed by the usual >> + Â conflict markers `<<<<<<<` and `>>>>>>>`. > > What happened to the `=======`? ÂI thought you were copying and pasting > from the said section. I think this is clear enough, else you would need to mention the '|||||||' and conflict_marker_size too. Bert -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html