threads / patch / 16281

patchDoc: Add a simplified help on top of the "History Simplification"

Subject: [PATCH] Doc: Add a simplified help on top of the "History Simplification"

## tl;dr

2 messages between Nov 12, 2008 and Nov 13, 2008. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Santi Béjar· Nov 12, 2008, 10:51 UTC · lore
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Hi,
  This is conceptually on top of:
  [PATCH 2/2] Document "git log --simplify-by-decoration"
  from Nanako. I do not touch the detailed help, I only add a simplified one at the top.
  Santi
 Documentation/rev-list-options.txt |   48 ++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 2 deletions(-)
Show changes to Documentation/rev-list-options.txt +46 −2
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 68a253f..8adce65 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -285,8 +285,52 @@ See also linkgit:git-reflog[1].
 History Simplification
 ~~~~~~~~~~~~~~~~~~~~~~
 
-When optional paths are given, 'git rev-list' simplifies commits with
-various strategies, according to the options you have selected.
+Sometimes you are only interested in part of the history, for example the
+commits modifying a particular <paths>. But there are two parts of
+'History Simplification', one part is selecting the commits and the other
+is how to do it, as there are various strategies to simplify the history.
+
+The following options select the commits to be shown:
+
+<paths>::
+
+	Commits modifying the given <paths> are selected.
+
+--simplify-by-decoration::
+
+	Commits that are referred by some branch or tag are selected.
+
+Note that extra commits can be shown to give a meaningful history.
+
+The following options affect the way the simplification is performed:
+
+Default mode::
+
+	Simplifies the history to the simplest history explaining the
+	final state of the tree. Simplest because it prunes some side
+	branches if the end result is the same (i.e. merging branches
+	with the same content)
+
+--full-history::
+
+	As the default mode but does not prune some history.
+
+--dense::
+
+	Only the selected commits are shown, plus some to have a
+	meaningful history.
+
+--sparse::
+
+	All commits in the simplified history are shown.
+
+--simplify-merges::
+
+	Additional option to '--full-history' to remove some needless
+	merges from the resulting history, as there are no selected
+	commits contributing to this merge.
+
+A more detailed explanation follows.
 
 Suppose you specified `foo` as the <paths>.  We shall call commits
 that modify `foo` !TREESAME, and the rest TREESAME.  (In a diff
-- 
1.6.0.rc1.27.g9b6bf

← back to recent threads