Go to TogaWare.com Home Page. GNU/Linux Desktop Survival Guide
by Graham Williams
Duck Duck Go

Git Workflow

20190415 A fetch updates the local copy of the repository to match the remote repository.

$ git fetch

A diff will show changes made to the local master branch versus the repository master branch.

$ git difftool origin/master master

To match out local master branch with the remote master branch we rebase our repository:

$ git rebase

We can hand merge or use the mergetool to interactively resolve any conflicts between local changes and remote changes:

$ git mergetool

$ git log --oneline

This will list all local commits.

$ git log origin/master --oneline

This will list the repository commits (after a fetch).

Copyright © 1995-2019 Togaware Pty Ltd
Support further development through the purchase of the PDF version of the book.
Brought to you by Togaware and the author of open source software including Rattle and wajig.
Also the author of Data Mining with Rattle and Essentials of Data Science.