Skip to content

Commit bd540ab

Browse files
authored
Merge pull request #782 from td2014/master
Minor cleanup in 10.2 regarding new tree creation and in 5.2 to explain format of return message from push.
2 parents a963c01 + e079ffb commit bd540ab

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

book/05-distributed-git/sections/contributing.asc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,12 @@ To jessica@githost:simplegit.git
143143
1edee6b..fbff5bc master -> master
144144
----
145145

146-
John tries to push his change up, too:
146+
The last line of the output above shows a useful return message from the push operation.
147+
The basic format is `<oldref>..<newref> 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.
148+
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.
149+
More details are available in the documentation for https://git-scm.com/docs/git-push[git-push].
150+
151+
Continuing with the example, John tries to push his change up, too:
147152

148153
[source,console]
149154
----

book/10-git-internals/sections/objects.asc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,8 @@ You'll now create a new tree with the second version of `test.txt` and a new fil
189189
[source,console]
190190
----
191191
$ echo 'new file' > new.txt
192-
$ git update-index --cacheinfo 100644 \
192+
$ git update-index --add --cacheinfo 100644 \
193193
1f7a7a472abf3dd9643fd615f6da379c4acb3e3a test.txt
194-
$ git update-index test.txt
195194
$ git update-index --add new.txt
196195
----
197196

0 commit comments

Comments
 (0)