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. It will not modify your working copy of the files at all.

$ git fetch

A pull will first do a fetch and then a merge.

A diff will show changes made to the local main branch versus the repository main branch using difftool:

$ git difftool origin/main main

To match our local main branch with the remote main 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

To list all local commits we can query the log

$ git log --oneline

To list the repository commits (after a fetch) we also query the log:

$ git log origin/main --oneline

Support further development by purchasing the PDF version of the book.
Other online resources include the Data Science Desktop Survival Guide.
Books available on Amazon include Data Mining with Rattle and Essentials of Data Science.
Popular open source software includes rattle and wajig.
Hosted by Togaware, a pioneer of free and open source software since 1984.
Copyright © 1995-2020 Togaware Pty Ltd. Creative Commons ShareAlike V4.