From 6d90fc59e76e49c7e7d613eae16648c160b7dfef Mon Sep 17 00:00:00 2001 From: td2014 Date: Mon, 21 Aug 2017 07:37:35 -0700 Subject: [PATCH 1/5] Minor cleanup in 10.2 regarding new tree creation --- book/10-git-internals/sections/objects.asc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/book/10-git-internals/sections/objects.asc b/book/10-git-internals/sections/objects.asc index 8c7e5b373..a063d616c 100644 --- a/book/10-git-internals/sections/objects.asc +++ b/book/10-git-internals/sections/objects.asc @@ -188,9 +188,8 @@ You'll now create a new tree with the second version of `test.txt` and a new fil [source,console] ---- $ echo 'new file' > new.txt -$ git update-index --cacheinfo 100644 \ +$ git update-index --add --cacheinfo 100644 \ 1f7a7a472abf3dd9643fd615f6da379c4acb3e3a test.txt -$ git update-index test.txt $ git update-index --add new.txt ---- From edb9c63da4ee9b49a71450dda56f6bd65e4b3595 Mon Sep 17 00:00:00 2001 From: td2014 Date: Mon, 9 Oct 2017 09:14:40 -0700 Subject: [PATCH 2/5] Add some information about push return message format --- book/05-distributed-git/sections/contributing.asc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index 2019ff3eb..422126295 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -143,7 +143,9 @@ To jessica@githost:simplegit.git 1edee6b..fbff5bc master -> master ---- -John tries to push his change up, too: +The last line of the output above shows a useful return message from the push operation. The basic format is `.. fromref -> toref`, where oldref means the old reference, newref means the new reference, fromref is the name of the local reference being pushed, and toref is the name of the remote reference being updated. You'll see similar output like this below in the discussions, so having a basic idea of the meaning will help in understanding the various states of the repositories. More details are available in the documentation for git push. + +Continuing with the example, John tries to push his change up, too: [source,console] ---- From 72cd47897eb81bfa47f068e53c1609f8685f23cc Mon Sep 17 00:00:00 2001 From: td2014 Date: Mon, 9 Oct 2017 09:21:48 -0700 Subject: [PATCH 3/5] Minor formatting adjustments --- book/05-distributed-git/sections/contributing.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index 422126295..467fa9a7f 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -143,7 +143,7 @@ To jessica@githost:simplegit.git 1edee6b..fbff5bc master -> master ---- -The last line of the output above shows a useful return message from the push operation. The basic format is `.. fromref -> toref`, where oldref means the old reference, newref means the new reference, fromref is the name of the local reference being pushed, and toref is the name of the remote reference being updated. You'll see similar output like this below in the discussions, so having a basic idea of the meaning will help in understanding the various states of the repositories. More details are available in the documentation for git push. +The last line of the output above shows a useful return message from the push operation. The basic format is `.. fromref \-> toref`, where `oldref` means the old reference, `newref` means the new reference, `fromref` is the name of the local reference being pushed, and `toref` is the name of the remote reference being updated. You'll see similar output like this below in the discussions, so having a basic idea of the meaning will help in understanding the various states of the repositories. More details are available in the documentation for git push. Continuing with the example, John tries to push his change up, too: From 06b350173d8432f7ebc3241dabaa3ef4572e848d Mon Sep 17 00:00:00 2001 From: td2014 Date: Mon, 9 Oct 2017 09:32:14 -0700 Subject: [PATCH 4/5] More cleanup and link to push documentation --- book/05-distributed-git/sections/contributing.asc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index 467fa9a7f..e4ffb2cdb 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -143,7 +143,10 @@ To jessica@githost:simplegit.git 1edee6b..fbff5bc master -> master ---- -The last line of the output above shows a useful return message from the push operation. The basic format is `.. fromref \-> toref`, where `oldref` means the old reference, `newref` means the new reference, `fromref` is the name of the local reference being pushed, and `toref` is the name of the remote reference being updated. You'll see similar output like this below in the discussions, so having a basic idea of the meaning will help in understanding the various states of the repositories. More details are available in the documentation for git push. +The last line of the output above shows a useful return message from the push operation. +The basic format is `.. fromref \-> toref`, where `oldref` means the old reference, `newref` means the new reference, `fromref` is the name of the local reference being pushed, and `toref` is the name of the remote reference being updated. +You'll see similar output like this below in the discussions, so having a basic idea of the meaning will help in understanding the various states of the repositories. +More details are available in the documentation for https://git-scm.com/docs/git-push[git push]. Continuing with the example, John tries to push his change up, too: From e079ffb2af9acc4825551aa1900e3ffcfb16bb72 Mon Sep 17 00:00:00 2001 From: td2014 Date: Mon, 9 Oct 2017 11:59:50 -0700 Subject: [PATCH 5/5] Add hyphen to git push for man page consistency --- book/05-distributed-git/sections/contributing.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index e4ffb2cdb..f30799000 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -146,7 +146,7 @@ To jessica@githost:simplegit.git The last line of the output above shows a useful return message from the push operation. The basic format is `.. fromref \-> toref`, where `oldref` means the old reference, `newref` means the new reference, `fromref` is the name of the local reference being pushed, and `toref` is the name of the remote reference being updated. You'll see similar output like this below in the discussions, so having a basic idea of the meaning will help in understanding the various states of the repositories. -More details are available in the documentation for https://git-scm.com/docs/git-push[git push]. +More details are available in the documentation for https://git-scm.com/docs/git-push[git-push]. Continuing with the example, John tries to push his change up, too: