git diff master..
Would give you what's in your current branch since master
git diff ..master
Would show you commits in master that your local branch doesn't have
git diff ...master
Or
git diff master...
Would show you all commits that your branch and master do not share
I only find the 3
git is not the problem your pattern is.
isolate your configuration into as few files as possible.
commit a template for that file(s). (so that new devs can copy it into place
and edit it once)
then add the real file to the .gitignore so that it isn't tracked.
Now if you want to get fancy use
Why do you do this?
First putting all of your work only in one branch called _work_ is extremely
self limiting. What if you have to work on a critical bugfix but are already in
the middle of a new feature. I would ditch that concept and begin using topic
branches. You shouldn't have to care
Fwiw I recommend .gitignore'ing the schema.rb. You don't need it checked in its
regenerated every migration and it's a magnet for useless conflicts.
On Aug 26, 2010, at 7:20 AM, Pito Salas r...@salas.com wrote:
Hmm. But it's a git-users question. Thanks anyway.
On Wed, Aug 25, 2010 at 6:52
The schema.rb is primarily used in the db:test:prepare rake task that
bootstraps your :test database when you run rake spec or rake test. You can
bootstrap a non test database but I don't recall the command because I don't
use it. So if you don't check it in ; and if you clone a project and
Create a new branch all (or some other more descriptive name) based on
daviddoria, then merge the other projects into it.
You have your combined branch, and all of the source branches won't be polluted
by each others commits.
On Aug 12, 2010, at 7:22 AM, David Doria daviddo...@gmail.com
Git log --raw
On Mar 19, 2010, at 3:22 AM, Marcin Krol mrk...@gmail.com wrote:
Hello,
I can list patches using git log -p. But sometimes that's too
detailed and I just would like to display a list of files that were
affected in a given commit.
Is there some way to do it?
--
Regards,
