Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| git_diff [2019/03/01 10:31] – [DESCRIPTION] rpjday | git_diff [2019/03/01 11:58] (current) – rpjday | ||
|---|---|---|---|
| Line 202: | Line 202: | ||
| < | < | ||
| - | $ git show fix_license | + | $ git show fix_readme |
| + | commit 5f1992a4245c301ed5e556f4ef47153981a67820 (fix_readme) | ||
| + | Author: Robert P. J. Day < | ||
| + | Date: Fri Mar 1 05:27:13 2019 -0500 | ||
| + | |||
| + | fix readme | ||
| + | |||
| + | diff --git a/ | ||
| + | index fa40bad..b7f3816 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -1,3 +1,4 @@ | ||
| + | +stuff in README.asc | ||
| + | = Pro Git, Second Edition | ||
| + | |||
| + | | ||
| + | </ | ||
| + | |||
| + | < | ||
| + | $ git show fix_license | ||
| commit 65633ac0f606e70db50460502989a7a74dca8e20 (fix_license) | commit 65633ac0f606e70db50460502989a7a74dca8e20 (fix_license) | ||
| Author: Robert P. J. Day < | Author: Robert P. J. Day < | ||
| 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:// | This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http:// | ||
| - | $ | ||
| </ | </ | ||
| + | ==== The basic comparison ==== | ||
| + | |||
| + | < | ||
| + | $ git diff fix_readme fix_license | ||
| + | diff --git a/ | ||
| + | index 81f2824..19f935b 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -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:// | ||
| + | diff --git a/ | ||
| + | index b7f3816..fa40bad 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -1,4 +1,3 @@ | ||
| + | -stuff in README.asc | ||
| + | = Pro Git, Second Edition | ||
| + | |||
| + | | ||
| </ | </ | ||
| - | $ git show fix_readme | ||
| - | commit 5f1992a4245c301ed5e556f4ef47153981a67820 (fix_readme) | ||
| - | Author: Robert P. J. Day < | ||
| - | Date: Fri Mar 1 05:27:13 2019 -0500 | ||
| - | fix readme | + | Using '' |
| + | |||
| + | < | ||
| + | $ git diff fix_readme..fix_license | ||
| + | diff --git a/ | ||
| + | index 81f2824..19f935b 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -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:// | ||
| + | diff --git a/ | ||
| + | index b7f3816..fa40bad 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -1,4 +1,3 @@ | ||
| + | -stuff in README.asc | ||
| + | = Pro Git, Second Edition | ||
| + | |||
| + | | ||
| + | </ | ||
| + | |||
| + | However, using '' | ||
| + | < | ||
| + | $ git diff fix_license...fix_readme | ||
| diff --git a/ | diff --git a/ | ||
| index fa40bad..b7f3816 100644 | index fa40bad..b7f3816 100644 | ||