rogerxu/git-tips

Tips for Git

git-tips's Issues

Git LFS

Bypass Git Proxy

We want to bypass some domains for git proxy.

Git Merge Squash

What is merge squash?

How Git Works

Git from the inside out

Line Endings in Git

Dealing with line endings - User Documentation

GitHub Releases

GitHub Help - Releases

Diff/Merge Tool in Git Bash Command Line

Is there any good tool in Git bash command line when resolving merge conflicts?

Add executable sh file in Git

How to make sh file executable after pull from Git repository?

Check if a branch is fully merged

How to check if a branch is fully merged into another one?

Partial Clone

Git - git-clone Documentation

How to manage big Git repositories

Partial clone with Git and Mercurial - Stack Overflow

git reset --hard HEAD leaves untracked files behind

When I run git reset --hard HEAD, it's supposed to reset to a pristine version of what you pulled, as I understand it. Unfortunately, it leaves files lying around, as a git status shows a big list of untracked files.

How do you tell git "Just bring it back to EXACTLY what was in the last pull, nothing more, nothing less"?

Log

Git - git-log Documentation

Ten Useful Git Log Tricks | Hacker Noon

Git Config

Git - git-config Documentation

Remote

Make an existing Git branch track a remote branch? - Stack Overflow

GitHub Training Learning Resources

• GitHub Workflow
  • GitHub Flow in the Browser - User Documentation
  • GitHub Flow – Scott Chacon
• GitLab Workflow
  • GitLab Documentation
  • GitLab Flow - GitLab Flow的使用 - 十五言
• Git Workflow
  • git-flow cheatsheet
  • Git team workflows: merge or rebase? | Atlassian Git Tutorial
  • Commit Often, Perfect Later, Publish Once—Git Best Practices
  • Our Git Workflow - Forks With Feature Branches | X-Team
  • Git and Github: keeping a feature branch updated with upstream? | Ginsys
• GitHub new features
• Git Training Materials
  • GitHub Training
  • Git Tutorials and Training | Atlassian Git Tutorial
  • How to Teach Git | The Recompiler
  • https://try.github.io
• Git Concepts
  • Git - About Version Control

Diff

Git - git-diff Documentation

What's New in GitHub Enterprise

The GitHub Blog Enterprise

SSL Certificate

version control - How can I make git accept a self signed certificate? - Stack Overflow

Delete Remote Branch

How to delete remote branch?

Protect Branches on GitHub

• Prevent force push?
• Prevent direct push?
• Only allow some people to merge pull request?

Git windows consumes CPU and memory

In the process monitor it shows

Image path

C:\Program Files\Git\mingw64\bin\git.exe

Command line

git ls-files -o -i --exclude-standard

How to ignore changes on tracked files

There is something to change on the local configuration files but don't want to commit.

Credential

必知必会之Git Windows credential.helper - 知乎 (zhihu.com)

Git clone from another directory

How to clone the repo from folder1 to folder2?

Delete multiple tags

How to delete multiple tags?

CI on GitHub

How to do CI on GitHub?

• Jenkins
  • Pull Request build for specific branch
  • CI build
• Travis-CI
• Circle-CI

How Git Works

Git from the inside out

Code Review on GitHub

How to do code review on GitHub?

• ReviewNinja
• Inline comment?

SSH Key

Generating a new SSH key and adding it to the ssh-agent - GitHub Docs

Custom git colors

Git-Config Colors and Include - Tyler Cipriani

Git tip: Beautiful colored and readable output - LeaseWeb labs

Feature Branch on Gerrit

How to work with feature branches on Gerrit?

• How to create feature branch
• How to verify feature branch
• How to merge feature branch
• How to avoid massive changes in code review when merging into master branch

ToDo list:

• Remove .gitreview on master to avoid merge conflicts

Reset

Fork & Pull Workflow

What is the Fork & Pull workflow?

Patch

Patches — GitExtensions 2.49.03 documentation

How to download a specific commit from a Git repository

Sometimes we need to download a specific version of a project from a Git repository to do some work like build from source code. If clone the entire repository it will be very slow because we don't need the entire commit history.

GitHub provides a download as zip service for a specific version which meets our needs. But how about a Git repository accessed via SSH?

Pull Request on GitHub

• Deal with large changes in a pull request
• Force push
• Rebase
• Cherry-pick
• Squash
• Backend + frontend code in same feature branch or separate ones?
• Resolve merge conflicts

Commit Message

Conventional Commits

Understanding Semantic Commit Messages Using Git and Angular

Git Checkout

• check out a branch
• check out a file

Attachment in issues

Try to figure out if support upload attachments in issues.

JIRA integration with GitHub

How to integrate JIRA with GitHub?

Branch

Relative links in README

How to add relative links and render in README.md?