emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: What a modern collaboration toolkit looks like


From: Miles Bader
Subject: Re: What a modern collaboration toolkit looks like
Date: Wed, 09 Jan 2008 04:50:05 +0900

Richard Stallman <address@hidden> writes:
>     The URL identifies the repository. When you do a "pull", you obtain the
>     _set_ of all revisions that exist on the remote but don't exist in your
>     local tree (remember that in a distributed context every repository has
>     a complete history).
>
> What command do you use to get "the current development version"
> sources out of that local copy of the repository?

[The following is about git]

When you originally create a working directory + local-repository (the
"local repository" is in the WD's ".git" subdirectory), you use the
"clone" command:

   git clone git://git.sv.gnu.org/emacs.git

The resulting working directory will contain "the current development
version"; in git that is called "master" branch.

You can subsequently use the "git pull" command to update that, getting
any changes from the remote repository:

    cd emacs
    git pull

Technically, what is happening when you give "git pull" above is that it:

  (1) Fetches updates to the "remote master branch"

  (2) Merges those updates into the "local master branch"; this merge is
  usually trivial but if there are conflicts, may require the user to
  resolve them.  The working directory will be updated in the process.

Giving "git push" essentially does the opposite -- transfers any updates
to the "local master branch" to the remote master branch.

"git commit" commits your W.D. changes to the "local master branch", 

-Miles

-- 
"Suppose we've chosen the wrong god. Every time we go to church we're
just making him madder and madder." -- Homer Simpson




reply via email to

[Prev in Thread] Current Thread [Next in Thread]