| From: | Andres Freund <andres(at)anarazel(dot)de> |
|---|---|
| To: | pgsql-hackers(at)postgresql(dot)org |
| Cc: | Heikki Linnakangas <heikki(dot)linnakangas(at)enterprisedb(dot)com>, Boxuan Zhai <bxzhai2010(at)gmail(dot)com>, Greg Smith <greg(at)2ndquadrant(dot)com>, Robert Haas <robertmhaas(at)gmail(dot)com> |
| Subject: | Re: merge command - GSoC progress |
| Date: | 2010-08-04 13:02:39 |
| Message-ID: | 201008041502.43810.andres@anarazel.de |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
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
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Robert Haas | 2010-08-04 13:04:49 | Re: string_agg delimiter having no effect with order by |
| Previous Message | Robert Haas | 2010-08-04 13:00:19 | Re: Review of Synchronous Replication patches |