git config --global user.name \"Your Name\"\ngit config --global user.email \"your.email@example.com\"<\/code><\/pre>\nReplace “Your Name” and “your.email@example.com” with your actual name and email address.<\/p>\n
Basic Git Concepts<\/h2>\n
Before we start using Git commands, let’s familiarize ourselves with some basic concepts:<\/p>\n
Repository (Repo)<\/h3>\n
A repository is a directory where Git tracks changes to your files. It contains all of your project’s files and each file’s revision history.<\/p>\n
Commit<\/h3>\n
A commit represents a specific point in your project’s history. It’s like a snapshot of your repository at a particular time.<\/p>\n
Branch<\/h3>\n
A branch is a parallel version of your repository. It allows you to work on different features or experiments without affecting the main project.<\/p>\n
Remote<\/h3>\n
A remote is a common repository that all team members use to exchange their changes. It’s typically hosted on a code hosting service like GitHub, GitLab, or Bitbucket.<\/p>\n
Basic Git Workflow<\/h2>\n
Now that we understand the basic concepts, let’s go through a typical Git workflow:<\/p>\n
1. Creating a New Repository<\/h3>\n
To create a new Git repository, navigate to your project directory in the terminal and run:<\/p>\n
git init<\/code><\/pre>\nThis initializes a new Git repository in your current directory.<\/p>\n
2. Checking the Status<\/h3>\n
To see which files have been changed and which are staged for commit, use:<\/p>\n
git status<\/code><\/pre>\n3. Adding Files to the Staging Area<\/h3>\n
Before you can commit changes, you need to add them to the staging area. To add a specific file:<\/p>\n
git add filename.txt<\/code><\/pre>\nTo add all changed files:<\/p>\n
git add .<\/code><\/pre>\n4. Committing Changes<\/h3>\n
Once you’ve added files to the staging area, you can commit them:<\/p>\n
git commit -m \"Your commit message here\"<\/code><\/pre>\nAlways write clear and descriptive commit messages to make it easier to understand the changes later.<\/p>\n
5. Viewing Commit History<\/h3>\n
To see a log of all commits:<\/p>\n
git log<\/code><\/pre>\nFor a more concise view:<\/p>\n
git log --oneline<\/code><\/pre>\nWorking with Branches<\/h2>\n
Branches are an essential feature of Git that allow you to work on different versions of your project simultaneously.<\/p>\n
1. Creating a New Branch<\/h3>\n
To create a new branch:<\/p>\n
git branch branch-name<\/code><\/pre>\n2. Switching Branches<\/h3>\n
To switch to a different branch:<\/p>\n
git checkout branch-name<\/code><\/pre>\nYou can also create and switch to a new branch in one command:<\/p>\n
git checkout -b new-branch-name<\/code><\/pre>\n3. Merging Branches<\/h3>\n
To merge changes from one branch into another, first switch to the branch you want to merge into, then run:<\/p>\n
git merge branch-to-merge<\/code><\/pre>\n4. Deleting a Branch<\/h3>\n
Once you’ve merged a branch and no longer need it, you can delete it:<\/p>\n
git branch -d branch-name<\/code><\/pre>\nWorking with Remotes<\/h2>\n
Remotes allow you to collaborate with other developers and share your code.<\/p>\n
1. Adding a Remote<\/h3>\n
To add a remote repository:<\/p>\n
git remote add origin https:\/\/github.com\/username\/repository.git<\/code><\/pre>\n2. Pushing Changes to a Remote<\/h3>\n
To push your local commits to a remote repository:<\/p>\n
git push origin branch-name<\/code><\/pre>\n3. Pulling Changes from a Remote<\/h3>\n
To fetch and merge changes from a remote repository:<\/p>\n
git pull origin branch-name<\/code><\/pre>\n4. Cloning a Repository<\/h3>\n
To create a local copy of a remote repository:<\/p>\n
git clone https:\/\/github.com\/username\/repository.git<\/code><\/pre>\nAdvanced Git Techniques<\/h2>\n
As you become more comfortable with Git, you might want to explore some advanced techniques:<\/p>\n
1. Rebasing<\/h3>\n
Rebasing is an alternative to merging that can create a cleaner project history. To rebase your current branch onto another:<\/p>\n
git rebase branch-name<\/code><\/pre>\n2. Cherry-picking<\/h3>\n
Cherry-picking allows you to apply specific commits from one branch to another:<\/p>\n
git cherry-pick commit-hash<\/code><\/pre>\n3. Interactive Rebase<\/h3>\n
Interactive rebase lets you modify commits in various ways, such as squashing, editing, or reordering:<\/p>\n
git rebase -i HEAD~n<\/code><\/pre>\nWhere ‘n’ is the number of commits you want to interact with.<\/p>\n
4. Git Hooks<\/h3>\n
Git hooks are scripts that Git executes before or after events such as commit, push, and receive. They can be used to enforce certain workflows or coding standards.<\/p>\n
Best Practices for Using Git<\/h2>\n
To make the most of Git and maintain a clean, efficient workflow, consider these best practices:<\/p>\n
1. Commit Often<\/h3>\n
Make small, frequent commits rather than large, infrequent ones. This makes it easier to track changes and revert if necessary.<\/p>\n
2. Write Clear Commit Messages<\/h3>\n
Use clear, concise commit messages that explain what changes were made and why. A common format is:<\/p>\n
Short (50 chars or less) summary of changes\n\nMore detailed explanatory text, if necessary. Wrap it to about 72\ncharacters or so. The blank line separating the summary from the body\nis critical (unless you omit the body entirely).\n\nFurther paragraphs come after blank lines.\n\n- Bullet points are okay, too\n- Typically a hyphen or asterisk is used for the bullet, preceded\n by a single space, with blank lines in between<\/code><\/pre>\n3. Use Branches<\/h3>\n
Create a new branch for each feature or bug fix. This keeps your main branch clean and makes it easier to manage multiple features simultaneously.<\/p>\n
4. Pull Before You Push<\/h3>\n
Always pull the latest changes from the remote repository before pushing your own changes. This helps avoid conflicts and keeps your local repository up-to-date.<\/p>\n
5. Review Your Changes<\/h3>\n
Before committing, use git diff<\/code> to review your changes. This helps catch unintended modifications and ensures you’re only committing what you mean to.<\/p>\n6. Use .gitignore<\/h3>\n
Create a .gitignore file to specify which files or directories Git should ignore. This is useful for excluding build artifacts, temporary files, and sensitive information.<\/p>\n
Git Tools and Integrations<\/h2>\n
While the command line is powerful, there are many tools and integrations that can enhance your Git experience:<\/p>\n
1. GUI Clients<\/h3>\n
Git GUI clients provide a visual interface for Git operations. Some popular options include:<\/p>\n