GNU/Linux Desktop Survival Guide by Graham Williams
Desktop Survival Project Home Preface Advocacy History Distributions Installing GNU/Linux Basic Survival Wajig Applications AI, Machine Learning, Data Science Android - GNU/Linux Devices Audio Backup Booting CD Chinese ChRoot Clock Command Line Databases DIA Directories Disks EcoSysL Emacs Email Evolution Files File Systems Firewalls Floppy Disks FreedomBox Glade GNOME Graphics, Images, Photos Hardware Initialisations on Booting Installation Examples Internet IOT Java KDE Kernels Keyboard Konqueror KVM Switch LATEX Log System Login Magellan MATE Mathematics Memory Modems Mounting Devices MS/Windows Music MySQL Nautilus Networks Nextcloud Network File System NFS NT File System Oracle Packages Partitions Passwords PDF Power Management PPP Presentations Printing Python R Remote Desktops Rsync Samba Scanning Science Screens Security Spreadsheet SSH Swap Teradata Data Warehouse Themes TV Unity USB Version Control Video Virtualization Voice over IP WebCam WordPress Web Sites Word Processing and Printing X XML Troubleshooting Index

CLICK HERE TO VISIT THE UPDATED SURVIVAL GUIDE

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