diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2007-11-10 14:49:54 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-11-18 18:15:47 -0500 |
| commit | 3fb00282538409daf4d05ce4631a2c3eae235c69 (patch) | |
| tree | 90c079a15ecaf90ab5fe29311ea39110367b43c8 /hash-object.c | |
| parent | 8391c60b6e08604e7023a8fff74350d6b35974af (diff) | |
| download | git-3fb00282538409daf4d05ce4631a2c3eae235c69.tar.gz git-3fb00282538409daf4d05ce4631a2c3eae235c69.tar.xz | |
user-manual: Add section "Why bisecting merge commits can be harder ..."
This commit adds a discussion of the challenge of bisecting
merge commits to the user manual. The original author is
Junio C Hamano <gitster@pobox.com>, who posted the text to
the mailing list <http://marc.info/?l=git&m=119403257315527&w=2>.
His email was adapted for the manual.
The discussion is added to "Rewriting history and maintainig
patch series". The text added requires good understanding of
merging and rebasing. Therefore it should not be placed too
early in the manual. Right after the section on "Problems with
rewriting history", the discussion of bisect gives another reason
for linearizing as much of the history as possible.
The text includes suggestions and fixes by
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> and
Benoit Sigoure <tsuna@lrde.epita.fr>.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'hash-object.c')
0 files changed, 0 insertions, 0 deletions