[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: questions about cg-update, cg-pull, and cg-clone.
From:       Zack Brown <zbrown () tumblerings ! org>
Date:       2005-04-30 15:48:08
Message-ID: 20050430154808.GB5408 () tumblerings ! org
[Download RAW message or body]

On Fri, Apr 29, 2005 at 10:37:29PM -0400, David A. Wheeler wrote:
> Zack Brown wrote:
> >Now, if the update is clean, a cg-commit is invoked automatically,
> 
> Correct; cg-merge calls "cg-commit -C" (ignore cache)
> if the merge is clean.
> 
> >and if the
> >update is not clean, I then have to resolve any conflicts and give the 
> >cg-commit
> >command by hand.
> 
> Correct.
> 
> >But: what is the significance of either of these cg-commit
> >commands? Why should I have to write a changelog entry recording this 
> >merge? All
> >I'm doing is updating my tree to be current. Why should I have to 'commit' 
> >that
> >update?
> 
> I can't speak Petr, but I would guess that he's doing that because
> he's trying to avoid data loss.

So, what would be an appropriate comment for that commit? I have no idea
what is changing on my tree in that case, all I know is that I'm merging from
someone else. All I really want is their changes and their commit messages,
not one of my own that is meaningless.

So far I just type ^d when this happens, and leave the commit message blank.

Be well,
Zack

> 
> 
> --- David A. Wheeler
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Zack Brown
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]