summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorStephen P. Smith <ischis2@cox.net>2014-05-08 23:08:41 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-28 13:35:43 -0700
commit0678b649a19586daa5ec45344376187b91dd7328 (patch)
tree5c1f86830e3e0fd5c9ab2ceffb7c66e44b0f8ba9 /Documentation/Makefile
parentb4f86a4ce85e4e370a67455de6586a02f158a789 (diff)
downloadgit-0678b649a19586daa5ec45344376187b91dd7328.tar.gz
How to keep a project's canonical history correct.ss/howto-manage-trunk
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/Makefile')
-rw-r--r--Documentation/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index fc6b2cf9ec..cea0e7ae3d 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -59,6 +59,7 @@ SP_ARTICLES += howto/recover-corrupted-blob-object
SP_ARTICLES += howto/recover-corrupted-object-harder
SP_ARTICLES += howto/rebuild-from-update-hook
SP_ARTICLES += howto/rebase-from-internal-branch
+SP_ARTICLES += howto/keep-canonical-history-correct
SP_ARTICLES += howto/maintain-git
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
SP_ARTICLES += $(API_DOCS)