1. Concepts

2. Resources and Tools

3. Initial Setup

4. Actions

5. Find Changes

6. Resolving Conflicts

7. Workflows

8. Others

• What is Git?

  • Command Console (Enginering)

  • Local Repository (Local version control repository)

  • Unity Project

• What is a Git Client?

  • GUI for Git (source Tree, GitHub Desktop, others)

• What is a Cloud Service for Git?

  • Server - Client

  • Hosting Definition (Bitbucket, GitHub)

  • Remote Repository (Remote version control repository)

• Git Applications or Uses

• Gitignore file (Ignore files)

• Gitattributes file (LFS - choose special files)

• Install Git

• Install Git LFS

• Setup Hosting Account (Bitbucket, GitHub, GitLab, other)

• Install Source Tree

• Install Diffmerge (Resolve Conflicts)(Only Engineering)

• Config, Authentication (Enginering)

• SSH paswords (Enginering)

• Config User Data (Enginering)

• Clone a repository (repository URL, others ways) (Enginering)

Main Actions

• Fetch (Refresh Server Changes Status)

• Pull (Download Changes)

• Push (Upload Changes)

Commits

• • Workspace

    • File Status

      • Stage change

      • Unstage change

      • Remove File

      • Discard File

      • Discard Lines (Only Code)

      • Stage Lines (Only Code)

      • Amend latest commit (Only Code)

    • History

    • Search

Branches (Create from other branch, Delete)

• • Create

  • Upload branch (Push)

  • Branch Navigation

  • Download (Pull)

  • Delete (Delete and keep commit nodes)

  • Tracking (Enginering)

  • Stop Tracking (Enginering)

  • Change Tracking (Enginering)

Merge

• • From BranchA to BranchB

  • Pull and merge changes in the same branch

  • Pull and merge changes from the other branch

Advanced Actions

• Stash

  • Create

  • Apply

  • Delete

• Pull Request (Important)

• Tag (Commit)

• Reverse commit...

• Reset to current branch to this commit

• Cherry Pick (Merge specific commit)

• Rebase

• Fast Forward

• Log Selected (File history)

• Annotate Selected (Auhtor data of the each line in a file)

• Search

  • Comments

  • File Names

  • Author

• Merge solved by git (automatically)

• Resolve using "theirs"

• Resolve using "mine"

• Launch External Merge Tool

  • DiffMerge

    • Config Tool:

• • • • • Tools/Options/Diff/External Diff Tool

        • Tools/Options/Diff/Merge Tool

• Only one branch (Beginers)

• Branch per task (Beginers)

• Fork (Open Source Projects, Only Read Access, 2 Project Copies)

• GitFlow (Common)

  • Develop (Branch) [Features / SDK / Experiments / Bug Fixing / LiveOps]

  • Releases (Branches)

  • Master (Branch)

  • HotFix (Branches)

• History

• Repository Details

• Repository Settings

• Create a project

  • .gitignore

  • .gitattributes

  • readme

  • configure git flow

• Command Line

  • Commands (git status, among others)

• Fork a repository (Open source projects) [Read more]