diff doc/hg.1.txt @ 509:98a2935c3d6c

[PATCH] replace history with log -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] replace history with log From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Merge hg history into hg log leaving the first as an alias (tweaked by mpm: update docs, tests, use existing alias mechanism) manifest hash: f85001a4373b8b823a6221ba5c506628059d6779 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSr1ywK+sNU5EO8RAmbAAJ9HlFkf8/qLOAQUtj8CWxGRPEyzVgCgtXwP SdnAg1a2q4693+TBiOjrimY= =w9rf -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 02:48:21 -0800
parents dc1f735dfaac
children 003df62ae39f
line wrap: on
line diff
--- a/doc/hg.1.txt	Tue Jun 28 02:38:33 2005 -0800
+++ b/doc/hg.1.txt	Tue Jun 28 02:48:21 2005 -0800
@@ -146,16 +146,6 @@
     changesets. They are where development generally takes place and
     are the usual targets for update and merge operations.
 
-history::
-    Print a log of the revision history of the repository.
-    
-    By default this command outputs: changeset id and hash, tags,
-    parents, user, date and time, and a summary for each commit. The
-    -v switch adds some more detail, such as changed files, manifest
-    hashes or message signatures.
-
-    To display the history of a given file, see the log command.
-
 identify::
     Print a short summary of the current state of the repo.
     
@@ -178,11 +168,15 @@
 init::
     Initialize a new repository in the current directory.
 
-log <file>::
-    Print the revision history of the specified file.
+log [file]::
+    Print the revision history of the specified file or the entire project.
 
-    To display the revision history for the whole repository, use the history
-    command.
+    By default this command outputs: changeset id and hash, tags,
+    parents, user, date and time, and a summary for each commit. The
+    -v switch adds some more detail, such as changed files, manifest
+    hashes or message signatures.
+
+    aliases: history
 
 manifest [revision]::
     Print a list of version controlled files for the given revision.