ia64/xen-unstable

changeset 5660:82d686a6b63e

Extended explanation of 'hg diff'.
author gmilos@localhost.localdomain
date Mon Jul 04 14:47:28 2005 +0000 (2005-07-04)
parents 22ccddf93c40
children e1fbb7fee1d8
files docs/misc/hg-cheatsheet.txt
line diff
     1.1 --- a/docs/misc/hg-cheatsheet.txt	Mon Jul 04 08:21:35 2005 +0000
     1.2 +++ b/docs/misc/hg-cheatsheet.txt	Mon Jul 04 14:47:28 2005 +0000
     1.3 @@ -3,7 +3,7 @@ Mercurial(hg) Cheatsheet for Xen
     1.4  ================================
     1.5  
     1.6  Written by Andrew Warfield, extended by Michael Fetterman and Ian Pratt
     1.7 -June 29, 2005
     1.8 +June 29, 2005, extended by Grzegorz Milos 04 July 2005.
     1.9  
    1.10  Overview
    1.11  --------
    1.12 @@ -121,7 +121,7 @@ without any merging of any kind.  "hg pu
    1.13  the current state of your working directory.  If you weren't already
    1.14  "updated" to your local repository's tip, you might be surprised to
    1.15  find yourself merging the results of the pull with a non-tip node in
    1.16 -your local repository.  
    1.17 +your local repository. 
    1.18  
    1.19  
    1.20  Revision History
    1.21 @@ -258,6 +258,11 @@ Generating a patch is easy,
    1.22  
    1.23  will generate a patch describing the diff between that changeset and 
    1.24  its parent.
    1.25 +    
    1.26 +To generate a patch between two specified revisions use:
    1.27 +   hg diff -r A -r B [files]
    1.28 +NB: BK syntax -rA..B isn't supported by Hg.   
    1.29 +
    1.30  
    1.31  Pushing changesets to a parent repository
    1.32  -----------------------------------------
    1.33 @@ -384,7 +389,7 @@ Additional useful commands
    1.34  Shows the differences between whatever changeset you most recently
    1.35  checked out, and your current working directory:
    1.36  
    1.37 -   hg diff
    1.38 +   hg diff 
    1.39  
    1.40  View an annotated version of a source file:
    1.41