[haiku-development] Re: GIT help

  • From: Pete Goodeve <pete.goodeve@xxxxxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Mon, 1 Apr 2013 18:39:11 -0700

On Mon, Apr 01, 2013 at 09:15:14PM -0400, John Scipione wrote:
> On Mon, Apr 1, 2013 at 8:18 PM, Pete Goodeve <pete.goodeve@xxxxxxxxxxxx>wrote:
> >
> > I'll have to do a commit at some point, I guess, but the description of
> > 'git format-patch' didn't sound to be what I wanted
> git format-patch is what you want, it will create a diff with some
> information added such as the author's name and email address so that when
> the patch is applied with git apply the author of the patch will be
> preserved. This works a bit differently than svn where you create a patch
> using svn diff.

Is this what others are using to attach to tickets then?  As I have a correct 
at this point, and the directory is going to have to be moved in the repository
by someone anyway (moved from "tests" to "apps"), I think that'll do for now.

> When you run git add on a file you add it to the staging area to be
> committed, either because it is new to the repo or because it has been
> modified.
> To stage a file to be deleted from the repository run git rm <file>. If you
> have already deleted the file from disk using rm, or if you want to delete
> the file from the repo but leave it on disk run git rm --cache <file>
> instead. Since you said you deleted those files already you should use the
> --cache version in this case.

OK, thanks.  Did that, and it seems to have achieved what I want.

Still confusing to me, though, as I thought 'add' told the 'index' about files,
and 'rm' told it not to care about them.  Oh, well.  I guess I'll learn the 
words eventually. (:-/)

        -- Pete --

Other related posts: