diff options
| author |  Sebastian Schuberth <sschuberth@gmail.com> | 2015-03-30 11:29:46 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-03-30 13:44:29 -0700 |
| commit | d50d31e8808261eccfa6bde826e5e63368e29573 (patch) | |
| tree | e4c8d61c5e333a8bbb010313688aaa239c46d3c8 /test-prio-queue.c | |
| parent | docs: clarify "preserve" option wording for git-pull (diff) | |
| download | tgif-d50d31e8808261eccfa6bde826e5e63368e29573.tar.xz | |
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
Ignoring a merge can be read as ignoring the changes a merge commit
introduces altogether, as if the entire side branch the merge commit
merged was removed from the history. But that is not what happens
if "-p" is not specified. What happens is that the individual
commits a merge commit introduces are replayed in order, and only
any possible merge conflict resolutions or manual amendments to the
merge commit are ignored.
Get this straight in the docs.
Also, do not say that merge commits are *tried* to be recreated. As that is
true almost everywhere it is better left unsaid.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-prio-queue.c')
0 files changed, 0 insertions, 0 deletions