[
Purpose of this repo is to collect all the git tips and tricks. You can suggest more if you know anything useful that can be listed here.
Set configuration values for user name,email etc
$ git config --global user.name "Damodar Bashyal"
$ git config --global user.email "git@dltr.org"Makes a Git repository copy from a remote source. Also adds the original location as a remote so you can fetch from it again. If you have permissions you can push your changes to it too.
$ git clone git@github.com:dbashyal/Git-tips-and-tricks.git masterTakes all of the changes written in the index, creates a new commit object pointing to it and sets the branch to point to that new commit.
$ git commit -m "added commit command on readme file"
// or to add and commit at once
$ git commit -a -m "added commit command on readme file"Edit/Amend last git commit message
$ git commit --amend -m "New commit message"Steps to merge develop to master.
$ git checkout develop && git pull
$ git checkout master && git pull
$ git merge -X theirs develop$ git config --global merge.tool meld
$ git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"This will ignore files that don't have content change.
$ git config core.filemode falseIf that doesn't work, you can run below command if you see files modified but with not content difference.
git add -uvgit fetch --all
git reset --hard origin/<current_branch>git reset <file>
// or
git reset <HEAD | commit> <file>
// Overwrite local changes with last commit from HEAD
git checkout -- <file>
// remove previously committed file from git repository
git rm --cached <added_file_to_undo>git reset commit_hash
// or
git reset --soft HEAD~1
// --soft option will delete the commit
// but it will leave all your changed files
// "Changes to be committed", as git status would put it.Shows status of files in the index versus the working directory. It will list out files that are untracked (only in your working directory), modified (tracked but not yet updated in your index), and staged (added to your index and ready for committing).
$ git statusLists existing branches, including remote branches if '-a' is provided. Creates a new branch if a branch name is provided.
$ git branch
$ git branch -a
// create branch
$ git branch <name_of_your_new_branch>
// push to remote
$ git push origin <name_of_your_new_branch>
// delete local branch
$ git branch -D <name_of_your_branch>
// delete remote branch
$ git push origin :<name_of_your_branch>This will delete all remote branches that do not exist locally. To delete selected branch from remote use above code.
$ git push --prune origin
// effectively make the remote look like the local copy of the repo (local heads, remotes and tags are mirrored on remote)
$ git push --mirror
// As of Git v1.7.0, you can delete a remote branch using
$ git push origin --delete feature/scroll
// you can also delete remote branch like this
$ git push origin :feature/scrollfor b in `git branch --no-color --merged | grep -v \*`; do git branch -D $b; donegit branch --no-color --merged | grep -v master | grep -v develop | xargs git branch -dgit diff --name-only --diff-filter=Ugit diff <-option> <filename>
// Options:
// --ignore-space-at-eol
// => Ignore changes in whitespace at EOL.
// -b (--ignore-space-change)
// => Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.
// -w (--ignore-all-space)
// => Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.
// --ignore-blank-lines
// => Ignore changes whose lines are all blank.// Create new tag
git tag -a 1.3.4 -m 'Tagged as version 1.3.4'
// Push new tag to repository
git push origin 1.3.4
// Delete tag
git tag -d 1.3.4
git push origin :refs/tags/1.3.4git checkout HEAD deleted-file.php// store
git config credential.helper store
// unset
// current repo
git config credential.helper store
// global
git config --global credential.helper store
// or use cache, where timeout is in seconds
git config --global credential.helper 'cache --timeout=xx'
// open you git bash terminal and run
$ eval `ssh-agent -s`
$ ssh-add
// or, open your ~/.bash_profile (or, ~/.bashrc) and add those lines and open new bash window, you will have to enter pass phrase only once.
eval `ssh-agent -s`
ssh-add
// for windows CMD, alternative method that worked is:
// Run:
FOR /F "delims=;" %G IN ('ssh-agent') DO @Echo SET %G
// and save output to .bat and modify as below and run that bat file.
@echo off
set SSH_AUTH_SOCK=/tmp/ssh-840uhYyWibks/agent.11372
set SSH_AGENT_PID=4820
ssh-add
// or just download sshlogin.bat file and run it. check root of this repo for the file.
// UPDATE :: found a bat file in latest git that you can run
// C:\Program Files\Git\cmd\start-ssh-agent.bat
start-ssh-agent