1. What is GIT?

Git is software for tracking changes in any set of files, usually used for coordinating work among programmers collaboratively developing source code during software development. Its goals include speed, data integrity, and support for distributed non-linear workflows.

GIT Download URL: https://git-scm.com/downloads

‍

Explaining Git Operations and Functionality

‍

2. Git Initialize

Git Initialize is used in Git to start tracking changes made to a project. It creates a repository where all changes and updates to the codebase are stored and managed.

‍

2.1. To initialize git for a project

- git init

‍

2.2. To add files to git / staged changes

- git add <file name> (to add a specific file)

- git add. (to add all the files)

‍

3. Git Commit

Git Commit is used in Git to save changes made to a project’s files. It creates a snapshot of the current state of the codebase, allowing developers to track and manage the evolution of their code over time.

‍

3.1. To Commit code

- git commit -m “Commit Message”

- Example: git commit -m “Feat: Completed bulk transfer Apis”

‍

3.2. Commit Flags

The flags available for commit: -m, -am

- [- m]: message for the commit

- [am]: stage changes then commit (no need for git add)

‍

3.3. Good Commits are Important

Good commits help preserve the history of a code base.

They help with the following:

1. debugging & troubleshooting
2. creating release notes
3. code reviews
4. rolling back
5. associating the code with an issue or ticket

‍

3.4. Commit Type

1. feat: a new feature is introduced with the changes
2. fix: a bug fix has occurred
3. chore: changes that do not relate to a fix or feature and don’t modify src or test files (for example updating dependencies)
4. refactor: refactored code that neither fixes a bug nor adds a feature
5. docs: updates to documentation such as a README or other markdown files
6. style: changes that do not affect the meaning of the code, likely related to code formatting such as white space, missing semi-colons, and so on.
7. test: including new or correcting previous tests
8. perf: performance improvements
9. ci: continuous integration related
10. build: changes that affect the build system or external dependencies
11. revert: reverts a last commit

‍

3.5. Good Commit vs. Bad Commit

‍

3.6. When Project Drags Commit Message Get Less Informative

‍

4. Git Branching

Git Branching is a powerful feature in Git that allows developers to create multiple “branches” or separate lines of development within a project. This enables them to work on different features or fixes simultaneously without interfering with each other’s work, and merge them back together when ready.

‍

4.1. To create a new branch and switch to that branch

- git checkout -b <branch-name>

‍

4.2. To create a new branch

- git branch <branch-name>

‍

4.3. To switch to a new branch

- git checkout <branch-name>

‍

4.4. To List all the branches

- git branch

‍

4.5. To Rename the existing branch

- git branch -m <new-branch-name>

- git branch -m <old-branch-name> <new-branch-name>

‍

4.6. To Delete a Branch on your local system

- git branch -d <branch-name>

‍

4.7. To Force Delete Branch (Code Not Pushed or Merged)

- git branch -D <branch-name>

‍

4.8. To Delete a Branch Remotely

- git push origin -d <branch-name>

‍

4.9. Types of Branches: Topic and Long-Lived

1. Topic: A feature, a bug fix, a hotfix, a configuration change, etc.
2. Long-lived: master, develop, release, etc.

‍

4.10. Benefits of Branching

1. Fast and easy to create
2. Enable experimentation
3. Enable team development
4. Support multiple project versions

‍

5. Git Stash

Git Stash is used in Git to temporarily save changes made to a project’s files without committing them. This allows developers to switch to a different branch or work on a different feature without losing their current progress. The changes can later be retrieved and applied to the codebase as needed.

‍

5.1. Stash Basic Usage

5.1.1. Stash changes

- git stash

5.1.2. List changes

- git stash list

5.1.3. Show the contents

- git stash show stash@{0}

5.1.4. Apply the last stash

- git stash apply

5.1.5. Apply a specific stash

- git stash apply stash@{0}

‍

5.2. Advance Stashing: Operations

5.2.1. Name stashes for easy reference

- git stash save “WIP: making progress on foo”

5.2.2. Start a new branch from a stash

- git stash branch ‹optional stash name›

5.2.3. Grab a single file from a stash

- git checkout ‹stash name› — ‹filename›

‍

5.3. Advanced Stashing: Cleaning The Stash

5.3.1. Remove the last stash and apply changes:

- git stash pop (tip: doesn’t remove if there’s a merge conflict)

5.3.2. Remove the last stash

- git stash drop

5.3.3. Remove the nth stash

- git stash drop stash@{n}

5.3.4. Remove all stashes

- git stash clear

‍

6. Git Logs

Git Logs is used in Git to display a recorded history of all the commits made to a project. It shows information such as the commit message, author, date, and unique identifier for each commit, enabling developers to track changes made to the codebase and identify when and by whom they were made.

‍

6.1. Limit the number of commits by <limit>.

- git log — <limit>

‍

6.2. Condense each commit to a single line.

- git log — — oneline

‍

6.3. Display the full diff of each commit.

- git log -p

‍

6.4. Include which files were altered and the relative number of lines that were added or deleted from each of them.

- git log — — stat

‍

6.5. Search for commits with a commit message that matches <pattern>

- git log — — grep=“‹pattern>”

‍

6.6. Fetch commits using the since.

- git log — — since=“yesterday” || git log — since=“2 weeks ago”

‍

‍

7. Git Remote (Cloud to Manage Git Repositories)

Git Remote is used in Git to manage connections to remote repositories, typically hosted on services like GitHub or GitLab. It allows developers to push and pull changes from a remote repository, collaborate with other developers, and share their code with the wider community.

‍

7.1. Some of the popular Git Cloud to manage git repositories.

1. GitHub (https://github.com/)
2. Gitlab (https://about.gitlab.com/)
3. Bitbucket (https://bitbucket.org/)

Purpose: To create repositories so that multiple developers can work on them simultaneously.

‍

7.2. Git repository approach

1. Monolithic (One repo to contain multiple services of the same project)
2. Multi-repo

For More Details Visit this Link: https://kinsta.com/blog/monorepo-vs-multi-repo/

‍

7.3. Git Remote Commands

7.3.1. To view the existing remotes

- git remote -v

7.3.2. Create a new connection to a remote repo. After adding a remote, you can use <name> as a shortcut for <url> in other commands.

- git remote add <name> <URL>

7.3.3. To remove a remote. The <name> is the name of the remote server URL.

- git remote remove <name>

7.3.4. Push the branch to <remote>, along with necessary commits and objects.

- git push <remote> <branch>

7.3.5. Fetch the specified remote’s copy of the current branch and immediately merge it into the local copy.

- git pull <remote>

‍

‍

8. Git Tools

Some of the popular Git Gui Tools

1. GitHub Desktop (https://desktop.github.com/)
2. Tortoise Git (https://tortoisegit.org/)
3. Source Tree (https://www.sourcetreeapp.com/)

‍

9. Git Cheat Sheet

‍