On Fri, Dec 12, 2008 at 06:28:27PM +0000, David Howells <dhowells@xxxxxxxxxx> wrote: > + (1) File objects. > + > + A file object contains the contents of a source file and the attributes of > + that file (such as file mode). This is incorrect, a 'blob' contains only the contents of the blob, the file mode is stored in the 'tree' object. > + (2) Directory objects. > + > + A directory object contains the attributes of that directory plus a list > + of file and directory objects that are members of this directory. The > + list includes the names of the entries within that directory and the > + object ID of each object. > + > + (3) Commit objects. > + > + A commit object contains the attribute of that commit (the author and the > + date for instance), a textual description of the change imposed by that > + commit as provided by the committer, a list of object IDs for the commits > + on which this commit is based, and the object ID of the root directory > + object representing the result of this commit. > + > + Note that a commit does not literally describe the changes that have been > + made in the way that, say, a diff file does; it merely carries the current > + state of the sources after that change, and points to the commits that > + describe the state of the sources before that change. GIT's tools then > + infer the changes when asked. > + > + A commit object will typically refer to one base commit when someone has > + merely committed some changes on top of the current state, and two base > + commits when a couple of trees have been merged. Is there any reason you hide the tag object? > +where %HOUR is the hour you want it to go off every day. For my local mirror > +of Linus's upstream kernel, I use: > + > + #!/bin/sh > + cd /warthog/git/linux-2.6 || exit $? > + exec git pull >/tmp/git-pull.log > + > +and: > + > + 0 6 * * * /home/dhowells/bin/do-git-pull.sh > + > +which will do the update every day at 6am. Using git clone --mirror would be much efficient, I think. > +The "-l" tells git clone that the source (mirror) repository is on the local > +machine, that it shouldn't go over the internet for it, and that it should > +hardlink GIT objects from the source repository rather than copying them where > +possible. Here and later below, IIRC -l is the default for local clones. > + cd /my/git/trees > + git clone -n --bare %UPSTREAM_REPO %MY_DIR --bare implies -n. > +If you haven't yet committed your changes, you'll have to siphon them off into > +a file: > + > + git diff >a.diff > + > +and deapply them: > + > + patch -p1 -R <a.diff > + > +You can then update your tree from the upstream tree with no fear of a conflict > +(assuming you don't also have changes that you have committed). Once you've > +updated your tree, you can reapply your changes: > + > + patch -p1 <a.diff Why not using git stash and git stash pop? Or at least git apply and git checkout - leaving out patch(1) from the game.
Attachment:
pgptg6q9oaKS9.pgp
Description: PGP signature
