{"thread":{"id":"16281","subject":"[PATCH] Doc: Add a simplified help on top of the \"History Simplification\"","startedAt":"2008-11-12T10:51:28Z","lastAt":"2008-11-13T02:16:03Z","messageCount":2,"participants":["Santi Béjar","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"95552","messageId":"1226487088-5308-1-git-send-email-santi@agolina.net","threadId":"16281","inReplyTo":null,"subject":"[PATCH] Doc: Add a simplified help on top of the \"History Simplification\"","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2008-11-12T10:51:28Z","receivedAt":"2008-11-12T10:51:28Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"Signed-off-by: Santi Béjar <santi@agolina.net>\n---\nHi,\n\n  This is conceptually on top of:\n\n  [PATCH 2/2] Document \"git log --simplify-by-decoration\"\n\n  from Nanako. I do not touch the detailed help, I only add a simplified one at the top.\n\n  Santi\n\n Documentation/rev-list-options.txt |   48 ++++++++++++++++++++++++++++++++++-\n 1 files changed, 46 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 68a253f..8adce65 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -285,8 +285,52 @@ See also linkgit:git-reflog[1].\n History Simplification\n ~~~~~~~~~~~~~~~~~~~~~~\n \n-When optional paths are given, 'git rev-list' simplifies commits with\n-various strategies, according to the options you have selected.\n+Sometimes you are only interested in part of the history, for example the\n+commits modifying a particular <paths>. But there are two parts of\n+'History Simplification', one part is selecting the commits and the other\n+is how to do it, as there are various strategies to simplify the history.\n+\n+The following options select the commits to be shown:\n+\n+<paths>::\n+\n+\tCommits modifying the given <paths> are selected.\n+\n+--simplify-by-decoration::\n+\n+\tCommits that are referred by some branch or tag are selected.\n+\n+Note that extra commits can be shown to give a meaningful history.\n+\n+The following options affect the way the simplification is performed:\n+\n+Default mode::\n+\n+\tSimplifies the history to the simplest history explaining the\n+\tfinal state of the tree. Simplest because it prunes some side\n+\tbranches if the end result is the same (i.e. merging branches\n+\twith the same content)\n+\n+--full-history::\n+\n+\tAs the default mode but does not prune some history.\n+\n+--dense::\n+\n+\tOnly the selected commits are shown, plus some to have a\n+\tmeaningful history.\n+\n+--sparse::\n+\n+\tAll commits in the simplified history are shown.\n+\n+--simplify-merges::\n+\n+\tAdditional option to '--full-history' to remove some needless\n+\tmerges from the resulting history, as there are no selected\n+\tcommits contributing to this merge.\n+\n+A more detailed explanation follows.\n \n Suppose you specified `foo` as the <paths>.  We shall call commits\n that modify `foo` !TREESAME, and the rest TREESAME.  (In a diff\n-- \n1.6.0.rc1.27.g9b6bf\n"},{"id":"95656","messageId":"7vej1gjrq4.fsf@gitster.siamese.dyndns.org","threadId":"16281","inReplyTo":"1226487088-5308-1-git-send-email-santi@agolina.net","subject":"Re: [PATCH] Doc: Add a simplified help on top of the \"History Simplification\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-13T02:16:03Z","receivedAt":"2008-11-13T02:16:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, will queue.\n"}]}