Re: [RFC] Stgit - patch history / add extra parents

On Fri, 2005-08-19 at 21:48 +0200, Jan Veldeman wrote: > I've quickly reread the threads about stg commit. Am I right to assume that > _all_ history was being recorded? Because this is not what I want. The > person controlling the archive should specify when to record the history. True, I was talk

Re: gitweb "tag" display

Paul Mackerras <[EMAIL PROTECTED]> writes: > I did something a little easier - if you click on the tag, it now > displays the contents of the tag in the details pane. Is that good > enough? Looks very nice, and a lot more sensible than those unsolicited popups I hate very much. > I implemented

Re: Multi-head pulling series

Josef Weidendorfer <[EMAIL PROTECTED]> writes: >> $ cat $GIT_DIR/remotes/www >> URL: http://www.kernel.org/pub/scm/git/git.git/ >> Pull: master:ko-master pu:ko-pu >> Push: master:master pu:pu foo:bar > > Isn't this mixing two kinds of information: > 1) Some default/persistent m

[PATCH] Make "git pull" and "git fetch" default to origin

Amos Waterland sent in a patch for the pre-multi-head aware version of "git pull" to do this, but the code changed quite a bit since then. If there is no argument given to pull from, and if "origin" makes sense, default to fetch/pull from "origin" instead of barfing. [jc: besides, the patch by Am

[PATCH] Infamous 'octopus merge'

This script uses the list of heads and their origin multi-head "git fetch" left in the $GIT_DIR/FETCH_HEAD file, and makes an octopus merge on top of the current HEAD using them. The implementation tries to be strict for the sake of safety. It insists that your working tree is clean (no local cha

[PATCH] Use .git/remote/origin, not .git/branches/origin.

Now multi-head fetch is complete, let's migrate the default configuration for new repositories created with the "git clone" command. The original $GIT_DIR/branches is not deprecated yet, but create remotes directory by default from the templates as well. Signed-off-by: Junio C Hamano <[EMAIL PROT

[PATCH] Multi-head fetch.

Traditionally, fetch takes these forms: $ git fetch $ git fetch $ git fetch tag This patch updates it to take $ git fetch ... where: - A of form ":" is to fetch the objects needed for the remote ref that matches , and if is not empty, store it as a local

[PATCH] Retire git-parse-remote.

Update git-pull to match updated git-fetch and allow pull to fetch from multiple remote references. There is no support for resolving more than two heads, which will be done with "git octopus". Update "git ls-remote" to use git-parse-remote-script. Signed-off-by: Junio C Hamano <[EMAIL PROTECTED

[PATCH] Start adding the $GIT_DIR/remotes/ support.

All the necessary parsing code is in git-parse-remote-script; update git-push-script to use it. Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]> --- ** sorry I made a mistake of letting git send-email to ** send nonsense messages ... Makefile|2 - git-parse-remote-

Updated multi-head downloads and $GIT_DIR/remotes/ support

Now I think all the pieces are glued together. I'll send the following patches, which are already in the proposed updates branch. I sent an early WIP for some of them, but the patches are reorganized for easier review and applies on top of the current "master" branch. This series consists of the

Re: "Publishing your work" questions?

Linus Torvalds <[EMAIL PROTECTED]> writes: > /* >* Go look for quoted single-ticks. They are always >* quoted as '\'', we don't accept anything else >*/ Oh, I am extremely glad to see that somebody else understands exactly why I do things in the "seemingly very unopt

Re: "Publishing your work" questions?

On Sat, 20 Aug 2005, Linus Torvalds wrote: > > But yes, you _should_ be able to do it with that ultra-simplistic login > shell. Probably just a 5-liner main() function or something. This is entirely untested, and a lot more than five lines of code. Edit until it works. Linus

Subject: [PATCH] Fix git-commit-script to output on stderr when -v fails

From: Marco Costalba <[EMAIL PROTECTED]> Date: 1124553736 +0200 When git-commit-script is called with -v option and verify test fails result is print on stdout instead of stderr. Signed-off-by: Marco Costalba <[EMAIL PROTECTED]> --- git-commit-script | 10 +- 1 files changed, 5 inser

Re: "Publishing your work" questions?

On Sat, 20 Aug 2005, Alan Chandler wrote: > > If I switch over to git, I assume I run git-daemon from inetd. Yes. Use the "--inetd" flag, and open port 9418 instead. > a) Is this what the git://my.domain.com/path/to/repository url refers to > (neither get-pull-script nor git-fetch-script man

Re: My GIT Day

Hi, On Fri, 19 Aug 2005, Junio C Hamano wrote: > $ git checkout pu > $ git reset master > > This checks out the head of "pu" branch, and then resets the > index file to match "master" and updates .git/refs/heads/pu. > > What it does _not_ do is to update my working tree to match the > i