I hate to cross post, but I can no longer see my message to the same effect
at the Git mailing list, where I got no reply, so here we go:
First, some background. I have one hard disk separated into two partitions:
one for the version of Windows 7 that shipped on this rather new Thinkpad
(Window
From: "Dale R. Worley"
Sent: Tuesday, January 29, 2013 7:40 PM
From: ryez
1. we use the master branch to reflect what we have in production
2. for every patch, a separate patch branch is created from master
3. when a patch is ready to release/deploy, we first check if the
patch
branch can merg
> From: ryez
>
> 1. we use the master branch to reflect what we have in production
> 2. for every patch, a separate patch branch is created from master
> 3. when a patch is ready to release/deploy, we first check if the patch
> branch can merge to master without conflict, if yes, the patch is th
Thank you for all the great information! It was very helpful.
The reason I thought this was an issue
is because I've got several files in my repository that seem to have gone
missing during certain commits
but then they appear again. This sounds crazy and I've been using git for 2
1/2 years and
we have a project, with 100+ maintainers, (yes, I'd say maintainers because
most of the time we're working on small patches instead of big new features)
The way we've come to manage our work is
1. we use the master branch to reflect what we have in production
2. for every patch, a separate patch
On Mon, Jan 28, 2013 at 10:46:06PM -0800, rridp...@transydian.com wrote:
> I would think that when I run a git diff on two specific SHA's it
> would have the same output as a git log with the same two SHA's when
> run with the --name-status.
> How did the file get changed if it wasn't done as par
