User Tools

Site Tools


git_diff

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Last revision Both sides next revision
git_diff [2019/03/01 10:31]
rpjday [DESCRIPTION]
git_diff [2019/03/01 10:39]
rpjday [The basic comparison]
Line 202: Line 202:
  
 <​code>​ <​code>​
-$ git show fix_license+$ git show fix_readme 
 +commit 5f1992a4245c301ed5e556f4ef47153981a67820 (fix_readme) 
 +Author: Robert P. J. Day <​rpjday@crashcourse.ca>​ 
 +Date:   Fri Mar 1 05:27:13 2019 -0500 
 + 
 +    fix readme 
 + 
 +diff --git a/​README.asc b/​README.asc 
 +index fa40bad..b7f3816 100644 
 +--- a/​README.asc 
 ++++ b/​README.asc 
 +@@ -1,3 +1,4 @@ 
 ++stuff in README.asc 
 + = Pro Git, Second Edition 
 +  
 + ​Welcome to the second edition of the Pro Git book. 
 +</​code>​ 
 + 
 +<​code>​ 
 +$ git show fix_license ​
 commit 65633ac0f606e70db50460502989a7a74dca8e20 (fix_license) commit 65633ac0f606e70db50460502989a7a74dca8e20 (fix_license)
 Author: Robert P. J. Day <​rpjday@crashcourse.ca>​ Author: Robert P. J. Day <​rpjday@crashcourse.ca>​
Line 216: Line 235:
 +stuff in LICENSE.asc +stuff in LICENSE.asc
  This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://​creativecommons.org/​licenses/​by-nc-sa/​3.0/​ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.  This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://​creativecommons.org/​licenses/​by-nc-sa/​3.0/​ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-$ 
 </​code>​ </​code>​
  
 +==== The basic comparison ====
 +
 +<​code>​
 +$ git diff fix_readme fix_license
 +diff --git a/​LICENSE.asc b/​LICENSE.asc
 +index 81f2824..19f935b 100644
 +--- a/​LICENSE.asc
 ++++ b/​LICENSE.asc
 +@@ -1 +1,2 @@
 ++stuff in LICENSE.asc
 + This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://​creativecommons.org/​licenses/​by-nc-sa/​3.0/​ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 +diff --git a/​README.asc b/​README.asc
 +index b7f3816..fa40bad 100644
 +--- a/​README.asc
 ++++ b/​README.asc
 +@@ -1,4 +1,3 @@
 +-stuff in README.asc
 + = Pro Git, Second Edition
 + 
 + ​Welcome to the second edition of the Pro Git book.
 </​code>​ </​code>​
-$ git show fix_readme 
-commit 5f1992a4245c301ed5e556f4ef47153981a67820 (fix_readme) 
-Author: Robert P. J. Day <​rpjday@crashcourse.ca>​ 
-Date:   Fri Mar 1 05:27:13 2019 -0500 
  
-    fix readme+Using ''​..''​ means exactly the same thing:
  
 +<​code>​
 +$ git diff fix_readme..fix_license
 +diff --git a/​LICENSE.asc b/​LICENSE.asc
 +index 81f2824..19f935b 100644
 +--- a/​LICENSE.asc
 ++++ b/​LICENSE.asc
 +@@ -1 +1,2 @@
 ++stuff in LICENSE.asc
 + This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://​creativecommons.org/​licenses/​by-nc-sa/​3.0/​ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 +diff --git a/​README.asc b/​README.asc
 +index b7f3816..fa40bad 100644
 +--- a/​README.asc
 ++++ b/​README.asc
 +@@ -1,4 +1,3 @@
 +-stuff in README.asc
 + = Pro Git, Second Edition
 + 
 + ​Welcome to the second edition of the Pro Git book.
 +</​code>​
 +
 +However, using ''​%%...%%''​ means something different:
 +
 +<​code>​
 +$ git diff fix_license...fix_readme
 diff --git a/​README.asc b/​README.asc diff --git a/​README.asc b/​README.asc
 index fa40bad..b7f3816 100644 index fa40bad..b7f3816 100644
Line 233: Line 291:
 @@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
 +stuff in README.asc +stuff in README.asc
 + = Pro Git, Second Edition
 + 
 + ​Welcome to the second edition of the Pro Git book.
 +</​code>​
 +
 +
  = Pro Git, Second Edition  = Pro Git, Second Edition
    
git_diff.txt · Last modified: 2019/03/01 11:58 by rpjday