Sometimes, when you've removed files without using the git rm and git will warn you the message "Changed but not updated.."

To fix this, you can use the command

# git ls-files --deleted -z | xargs -0 git rm

Answer:

"git log" will not show the changed file in the output, to show it, use

# git log --stat

Answer:

Just remember one command:

# git push --all origin

Answer:

Sometimes, when you regret your last commit and before it is pushed to remote, it is easy with the following commands:

git add file1.txt file2.txt
git commit -m 'Add some files'

# Now you regret to include file2.txt
git rm file2.txt
git commit --amend # Edit the commit message in the editor

Answer:

You have two branches, develop and master. The develop branch contains a lot of commits but you only want to merge a particular commit (of two files), what would you do?

You can use git cherry-pick but the easiest way to do and most people need is the following:

# git checkout master
# git checkout develop /path/to/file1
# git checkout develop /path/to/file2
..
git commit -m 'Merge changes from develop for file1 and file2'

Answer:

In your current git repository, type

# git config core.filemode false

That's it.

Answer:

When you experienced when your git repository might return the following error when you perform the status command, e.g.

# git status
error: bad index file sha1 signature
fatal: index file corrupt

To fix it, simply type

# rm -f .git/index

Then

# git reset

That's it.

Answer:

Someone has just committed their changes to the svn and you want to find what have changed, just use the command:

# svn diff -rPREV

Answer:

svn will store your credentials information at "~/.subversion/auth/svn.simple/" for caching to help you from typing password on every svn commands. In order to clean this cache, you can

# rm -f ~/.subversion/auth/svn.simple/*

Answer:

Usually when you have not staged your changes, git diff is what you all need. But when you have staged the changes, then you need to use

git diff --cached