Skip to content

Minor cleanup in 10.2 regarding new tree creation and in 5.2 to explain format of return message from push. #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 9, 2017
Merged

Minor cleanup in 10.2 regarding new tree creation and in 5.2 to explain format of return message from push. #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d90fc5
Minor cleanup in 10.2 regarding new tree creation
td2014 Aug 21, 2017
edb9c63
Add some information about push return message format
td2014 Oct 9, 2017
72cd478
Minor formatting adjustments
td2014 Oct 9, 2017
06b3501
More cleanup and link to push documentation
td2014 Oct 9, 2017
e079ffb
Add hyphen to git push for man page consistency
td2014 Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion book/05-distributed-git/sections/contributing.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,12 @@ 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 `<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.
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:

[source,console]
----
Expand Down
3 changes: 1 addition & 2 deletions book/10-git-internals/sections/objects.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
----

Expand Down