All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] git-reflog.txt: order options alphabetically
@ 2010-12-01 20:53 jari.aalto
  0 siblings, 0 replies; only message in thread
From: jari.aalto @ 2010-12-01 20:53 UTC (permalink / raw)
  To: git; +Cc: Jari Aalto

From: Jari Aalto <jari.aalto@cante.net>


Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-reflog.txt |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index e50bd9b..d45e3fe 100644
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -50,18 +50,8 @@ and specify the _exact_ entry (e.g. "`git reflog delete master@\{2\}`").
 OPTIONS
 -------
 
---stale-fix::
-	This revamps the logic -- the definition of "broken commit"
-	becomes: a commit that is not reachable from any of the refs and
-	there is a missing object among the commit, tree, or blob
-	objects reachable from it that is not reachable from any of the
-	refs.
-+
-This computation involves traversing all the reachable objects, i.e. it
-has the same cost as 'git prune'.  Fortunately, once this is run, we
-should not have to ever worry about missing objects, because the current
-prune and pack-objects know about reflogs and protect objects referred by
-them.
+--all::
+	Instead of listing <refs> explicitly, prune all refs.
 
 --expire=<time>::
 	Entries older than this time are pruned.  Without the
@@ -75,18 +65,28 @@ them.
 	`gc.reflogExpireUnreachable`, which in turn defaults to
 	30 days.
 
---all::
-	Instead of listing <refs> explicitly, prune all refs.
-
---updateref::
-	Update the ref with the sha1 of the top reflog entry (i.e.
-	<ref>@\{0\}) after expiring or deleting.
-
 --rewrite::
 	While expiring or deleting, adjust each reflog entry to ensure
 	that the `old` sha1 field points to the `new` sha1 field of the
 	previous entry.
 
+--stale-fix::
+	This revamps the logic -- the definition of "broken commit"
+	becomes: a commit that is not reachable from any of the refs and
+	there is a missing object among the commit, tree, or blob
+	objects reachable from it that is not reachable from any of the
+	refs.
++
+This computation involves traversing all the reachable objects, i.e. it
+has the same cost as 'git prune'.  Fortunately, once this is run, we
+should not have to ever worry about missing objects, because the current
+prune and pack-objects know about reflogs and protect objects referred by
+them.
+
+--updateref::
+	Update the ref with the sha1 of the top reflog entry (i.e.
+	<ref>@\{0\}) after expiring or deleting.
+
 --verbose::
 	Print extra information on screen.
 
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-12-01 20:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-01 20:53 [PATCH] git-reflog.txt: order options alphabetically jari.aalto

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.