Re: merge command - GSoC progress

On Wednesday 04 August 2010 14:09:51 Heikki Linnakangas wrote:
> Yep. I believe Boxuan is using git in a simplistic way, doing just "git 
> diff" to create patches. For adding new files, you need to do "git add 
> <filename>", but note that this adds the new file to "staging area". To 
> view all changes in the staging area, use "git diff --cached", but that 
> won't show any modifications to existing files that you haven't also 
> "git add"ed. So to generate a patch you need to "git add" all modified 
> and added files ("git add -u" will add all modified files 
> automatically), and then use "git diff --cached" to generate the diff.
Or use git add --intent--to-add (or -N). That adds the file but not the actual 
changes.

Andres