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

Typical Workflow

$ git fetch

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

$ git difftool origin/master master

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

$ git rebase

Here we patch our local copy of the repository to be up-to-date with the remote repository.

$ git mergetool

Rather than a hand merge the mergetool will resolve conflicts interactively.

$ 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.