diff options
| author |  Stephen P. Smith <ischis2@cox.net> | 2014-05-08 23:08:41 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-28 13:35:43 -0700 |
| commit | 0678b649a19586daa5ec45344376187b91dd7328 (patch) | |
| tree | 5c1f86830e3e0fd5c9ab2ceffb7c66e44b0f8ba9 /Documentation/git-merge-one-file.txt | |
| parent | Git 2.0-rc2 (diff) | |
| download | tgif-0678b649a19586daa5ec45344376187b91dd7328.tar.xz | |
How to keep a project's canonical history correct.
During the mail thread about "Pull is mostly evil" a user asked how
the first parent could become reversed.
This howto explains how the first parent can get reversed when viewed
by the project and then explains a method to keep the history correct.
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions