git basics

Short intro

This guide is intended to give an introduction to basic concepts and commands in the git world. Also, it can be used as a guide to becoming proficient in git, in some parts, we will dive a bit deeper and explain how git is doing his job behind the scene, so if you're a beginner or you're working with git for some time but still you feel that there are some concepts like git three trees, changing commit history, basic merge strategies..., that you would like to understand a bit more, this guide will help you to learn all basic concepts in git which will make you become confident using it in your everyday work.

Who should read this book?

This book is targeted at readers who just entered in the software development world and who want to learn the basics of git in order to gain enough knowledge to be able to work in teams and to easily work with git, as well as software developers who may have some knowledge gaps when it comes to some git basics.

Table of Contents

1. Introduction

1.1 Who Should Read this book

1.2 Conventions Used in This Book

2. Getting started

2.1 Installing on Linux

2.2 Installing on macOS

2.3 Installing on Windows

3. Setting your Identity

3.1 Other configuration variables

4. Git Basic Three Trees Workflow

5. Initializing git repository

6. Cloning an existing repository

7. Tracking new changes

8. Git Status

9. Git Commit

9.1 Changing commit message

9.2 Rules of the good commit message

10. Inspecting changes with Git Diff

11. Ignoring files in git

12. Cleaning untracked files

13. Git Branch

14. Git Checkout

15. Git Fetch

16. Git Pull

17. Git Merge

17.1 Fast Forward

17.2 Recursive merge

18. Resolving Merge Conflicts

19. Git Push

20. Git Pull Requests

21. Saving your changes temporarily with Git Stash

22. Git Log

23. Searching Commit History logs

24. Git Reset

24.1 Mixed

24.2 Soft

24.3 Hard

25. Git Revert

26. Git Reflog

27. Git Aliases

28. Useful Resources to learn Git

29. Git Cheatsheet

30. Conclusion