Re: Tool renames? was Re: First stab at glossary

On Fri, 2 Sep 2005, Junio C Hamano wrote: > I said: > > > I'll draw up a strawman tonight unless somebody else > > does it first. > > 1. Say 'index' when you are tempted to say 'cache'. > > git-checkout-cache git-checkout-index > git-convert-cache git-convert-

Re: [PROBLEM] Checkout from cloned repository does not work

Hi Junio, On Fri, 2005-09-02 at 11:13 -0700, Junio C Hamano wrote: > You would need 'chmod +x git-test.git/hooks/post-update' here if > you are allowing people to pull over http from this repository. Aah, thanks! That fixed it for me. On Fri, 2005-09-02 at 11:13 -0700, Junio C Hamano wrote: > Th

Re: Tool renames? was Re: First stab at glossary

I said: > I'll draw up a strawman tonight unless somebody else > does it first. 1. Say 'index' when you are tempted to say 'cache'. git-checkout-cache git-checkout-index git-convert-cache git-convert-index git-diff-cache git-diff-index

Re: Replay on arbitrary branches

Agreed on the impossibility of 3-way merges with binary files. In the branch I want to replay, though, I have commits that add and change binary files. > About 'unrelated' trees, if you know of a good tree you can use > $ git-read-tree -m -u c master b > $ git-merge-cache -o git-merge-o

Re: Replay on arbitrary branches

Martin Langhoff <[EMAIL PROTECTED]> writes: > Is there a way to replay a merge on a head that GIT considers unrelated? > > I have been playing with exporting to mbox format with > git-format-patch-script, and applying those to the destination branch. > However, this drops binary files -- and I _d

Re: Moved files and merges

"H. Peter Anvin" <[EMAIL PROTECTED]> writes: > I currently have two klibc trees, > > rsync://rsync.kernel.org/pub/scm/libs/klibc/klibc.git > > and > > rsync://rsync.kernel.org/pub/scm/libs/klibc/klibc-kbuild.git I cloned them to take a look. You_do_ seem to have a lot of renames. $ git clon

Re: Moved files and merges

On 9/3/05, H. Peter Anvin <[EMAIL PROTECTED]> wrote: > Is there any way I can record in the repository that these files are > actually moved files, and that the merge should apply the patch elsewhere? Well, if you run pickaxe at merge-time on the file-paths that weren't found, you can probably wal

Re: Tool renames? was Re: First stab at glossary

Daniel Barkalow <[EMAIL PROTECTED]> writes: > On Thu, 1 Sep 2005, Junio C Hamano wrote: > >> Tim Ottinger <[EMAIL PROTECTED]> writes: >> >> > git-update-cache for instance? >> >> Logically you are right, but I suspect that may not fly well in >> practice. Too many of us have already got our fin

Re: [PROBLEM] Checkout from cloned repository does not work

Pekka Enberg <[EMAIL PROTECTED]> writes: > I cannot checkout from a cloned git repository I have created. I am > using git 0.99.5 from Gentoo portage. > Following the tutorial, I create new git repository: >... > Now on the server, I create a repository: > > $ mkdir git-test.git > GIT_DIR=git

Re: Tool renames? was Re: First stab at glossary

On Thu, 1 Sep 2005, Junio C Hamano wrote: > Tim Ottinger <[EMAIL PROTECTED]> writes: > > > git-update-cache for instance? > > I am not sure which 'cache' commands need to be 'index' now. > > Logically you are right, but I suspect that may not fly well in > practice. Too many of us have already

Re: gitk with hyperspace support

On 9/1/05, Sean <[EMAIL PROTECTED]> wrote: > > BTW, did you sometimes notice lines you can't click at all? > > An example is the red line on the most left side of the graph > > by SHA 66129f88c4cc719591f687e5c8c764fe9d3e437a. > For what it's worth, everything near that SHA1 works here as expected.

Re: Tool renames? was Re: First stab at glossary

Junio C Hamano <[EMAIL PROTECTED]> wrote: > Tim Ottinger <[EMAIL PROTECTED]> writes: > > git-update-cache for instance? > > I am not sure which 'cache' commands need to be 'index' now. > Logically you are right, but I suspect that may not fly well in > practice. Too many of us have already got ou

[PATCH] Possible cleanups for local-pull.c

Hi. This patch contains the following possible cleanups: * Make some needlessly global functions in local-pull.c static * Change 'char *' to 'const char *' where appropriate Signed-off-by: Peter Hagervall <[EMAIL PROTECTED]> --- diff --git a/cache.h b/cache.h --- a/cache.h +++ b/cache.h @@ -3

Re: [PATCH] Show modified files in git-ls-files

Junio C Hamano wrote: Catalin Marinas <[EMAIL PROTECTED]> writes: Brian Gerst <[EMAIL PROTECTED]> wrote: Add -m/--modified to show files that have been modified wrt. the index. M was already taken so the tag for modifified files is C (changed). I think git-ls-files should be consistent wi

[PROBLEM] Checkout from cloned repository does not work

Hi, I cannot checkout from a cloned git repository I have created. I am using git 0.99.5 from Gentoo portage. Following the tutorial, I create new git repository: $ mkdir git-test $ cd git-test/ $ git-init-db defaulting to local storage area $ echo "Hello, Git" > hello $ git-update-c

[PATCH 3/4] commit-id micro cleanup

Resync commit-id and tree-id: cg-Xlib is not needed in either. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]> --- commit-id |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/commit-id b/commit-id --- a/commit-id +++ b/commit-id @@ -5,8 +5,6 @@ # # Tak

[PATCH 4/4] cg-{diff,mkpatch}: rename/copy optional detection

Add -B, -M and -C options to detect content rewrites, renames and changes to cg-diff and cg-mkpatch, to be passed right down to git-diff-*. I've not added a way to pass down any option, since not everything may make sense, and a shell script colorizing --name-only-z output would not play so nice (a

[PATCH] [PATCH] Doc: replace read-cache with git-read-tree.

Replace references to "read-cache" with references to git-read-tree in the documentation. I chose that because reference say "see read-cache about stages", and stages are explained in git-read-tree. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]> --- Documentation/git-ls-files.

[PATCH] Fix automerge message.

The rewrite done while adding the shorthand support made the remote refname recorded in the commit message too long for human consumption, while losing information by using the shorthand not the real URL to name the remote repository there. They were both bad changes done without enough thinking.

Re: [PATCH] Show modified files in git-ls-files

Catalin Marinas <[EMAIL PROTECTED]> writes: > Brian Gerst <[EMAIL PROTECTED]> wrote: >> Add -m/--modified to show files that have been modified wrt. the index. >> >> M was already taken so the tag for modifified files is C (changed). > > I think git-ls-files should be consistent with git-diff-cach

Re: [PATCH] Show modified files in git-ls-files

Brian Gerst <[EMAIL PROTECTED]> wrote: > Add -m/--modified to show files that have been modified wrt. the index. > > M was already taken so the tag for modifified files is C (changed). I think git-ls-files should be consistent with git-diff-cache where M means modified and U unmerged (but for the

Re: empty patch-2.6.13-git? patches on ftp.kernel.org

On Fri, 2 Sep 2005, David Woodhouse wrote: > > rm -rf tmp-empty-tree > mkdir -p tmp-empty-tree/.git > cd tmp-empty-tree Ahh. Please change that to rm -rf tmp-empty-tree mkdir tmp-empty-tree cd tmp-empty-tree git-init-db because otherwise you'l

Re: empty patch-2.6.13-git? patches on ftp.kernel.org

On Wed, 2005-08-31 at 15:34 +0200, Tomasz K³oczko wrote: > Seems patches stored on ftp://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots > are empty (only logs are correct): > -rw-r--r--1 536 53620 Aug 30 09:01 patch-2.6.13-git1.gz > -rw-r--r--1 536 53620 A

Ugly "git pull .." merge messages

Junio, I think this happened when you rewrote the pull/push stuff to do shorthands.. Lately, "git pull" generates a lot of extra crud in the single-line commit message, which is annoying because a lot of tools will thus actually not show enough of the line to be valid. For example, it used to ge