* [PATCH] Document git-clone --use-separate-remote
From: Uwe Zeisberger @ 2006-06-08 6:50 UTC (permalink / raw)
To: git
Signed-off-by: Uwe Zeisberger <uzeisberger@io.fsforth.de>
---
Documentation/git-clone.txt | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 94d9393..7572e4b 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -11,7 +11,7 @@ SYNOPSIS
[verse]
'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]
[-o <name>] [-u <upload-pack>] [--reference <repository>]
- <repository> [<directory>]
+ [--use-separate-remote] <repository> [<directory>]
DESCRIPTION
-----------
@@ -73,7 +73,7 @@ OPTIONS
files in `<directory>/.git`, make the `<directory>`
itself the `$GIT_DIR`. This implies `-n` option. When
this option is used, neither the `origin` branch nor the
- default `remotes/origin` file is created.
+ default `remotes/origin` file is created.
-o <name>::
Instead of using the branch name 'origin' to keep track
@@ -94,12 +94,17 @@ OPTIONS
if unset the templates are taken from the installation
defined default, typically `/usr/share/git-core/templates`.
+--use-separate-remote::
+ Save remotes heads under `$GIT_DIR/remotes/origin/' instead
+ of `$GIT_DIR/refs/heads/'. Only the master branch is saved
+ in the latter.
+
<repository>::
The (possibly remote) repository to clone from. It can
be any URL git-fetch supports.
<directory>::
- The name of a new directory to clone into. The "humanish"
+ The name of a new directory to clone into. The "humanish"
part of the source repository is used if no directory is
explicitly given ("repo" for "/path/to/repo.git" and "foo"
for "host.xz:foo/.git"). Cloning into an existing directory
--
1.3.3.g423a
--
Uwe Zeisberger
http://www.google.com/search?q=square+root+of+2
^ permalink raw reply related
* Re: git-cvsservr questions
From: Martin Langhoff @ 2006-06-08 5:23 UTC (permalink / raw)
To: Jon Loeliger; +Cc: git
In-Reply-To: <E1FoCCg-0002vH-FX@jdl.com>
On 6/8/06, Jon Loeliger <jdl@jdl.com> wrote:
> Mart{i,y}n et al,
>
> I'm having a bit of a problem setting up my git-cvsserver.
> I think I have followed the man page, but this is the
> only real response I get:
>
> $ setenv CVSROOT :pserver:anonymous@jdl.com:/pub/..../foo.git
> $ cvs co master cvs [checkout aborted]: unrecognized auth response
> from jdl.com: Unknown command BEGIN AUTH REQUEST at
> /usr/bin/git-cvsserver line 132, <STDIN> line 1.
...
> I have enabled it the config file, and set a log file
Very strange. The calling line to git-cvsserver should have the
'pserver' option. Perhaps the inetd configuration is missing the
doubled-up pserver?
cheers,
martin
^ permalink raw reply
* git-cvsservr questions
From: Jon Loeliger @ 2006-06-08 4:33 UTC (permalink / raw)
To: git
Mart{i,y}n et al,
I'm having a bit of a problem setting up my git-cvsserver.
I think I have followed the man page, but this is the
only real response I get:
$ setenv CVSROOT :pserver:anonymous@jdl.com:/pub/..../foo.git
$ cvs co master cvs [checkout aborted]: unrecognized auth response
from jdl.com: Unknown command BEGIN AUTH REQUEST at
/usr/bin/git-cvsserver line 132, <STDIN> line 1.
I've installed DBD:SQLite, but I don't know if it is working
or not. Not sure what file it would create in my repo if it
was working properly. I've made the bare repo directory be
mode 777 just to be sure it is writable by "nobody."
My client is 1.12.9.
I have enabled it the config file, and set a log file, but
I get no output. Do I need to enable the output somehow?
Other debug enabling bits to turn on for more help here?
Have I missed some obvious step? You know, intuit my problem
from my sparse description! :-) Well, or tell me what else
you need to know...
Thanks,
jdl
^ permalink raw reply
* GIT 1.4.0-rc2
From: Junio C Hamano @ 2006-06-08 3:41 UTC (permalink / raw)
To: git
I've tagged the tip of "master" as v1.4.0-rc2.
Many documentation updates, new and much improved gitk, git
aliases stored in .git/config, and most importantly, http-fetch
fix.
I think we are getting there; expect real 1.4.0 this Saturday my
time. I am planning to throw in a bit of surprise in it as well.
* Shortlog since 1.4.0-rc1 *
Francis Daly:
Some doc typo fixes
config.txt grammar, typo, and asciidoc fixes
git-cvsserver asciidoc formatting tweaks
Horst H. von Brand:
Cleanup git-send-email.perl:extract_valid_email
Johannes Schindelin and Petr Baudis:
git aliases stored in .git/config
Jon Loeliger:
Refactor git_tcp_connect() functions a little.
Jonas Fonseca:
Misc doc improvements
Document git-ls-tree --fullname
Junio C Hamano:
git alias: try alias last.
send-email: be more lenient and just catch obvious mistakes.
send-email: a bit more careful domain regexp.
git-format-patch: add --output-directory long option again
HTTP cleanup
Make index file locking code reusable to others.
refs.c: convert it to use lockfile interface.
ref-log: style fixes.
Documentation: add missing docs make check-docs found.
make clean: remove dist-doc targets.
Documentation: git-ls-tree (typofix)
Documentation: add another example to git-ls-files
Nick Hengeveld:
HTTP cleanup
http-fetch: fix possible segfault
Paul Mackerras:
gitk: Make a row of controls for controlling highlighting
gitk: Highlight entries in the file list as well
gitk: Highlight paths of interest in tree view as well
gitk: First cut at a search function in the patch/file display window
gitk: Improve the text window search function
gitk: Move "pickaxe" find function to highlight facility
gitk: Fix bug in highlight stuff when no line is selected
gitk: Provide ability to highlight based on relationship to selected commit
gitk: Add a goto next/previous highlighted commit function
gitk: Show nearby tags
gitk: Show branch name(s) as well, if "show nearby tags" is enabled
gitk: Re-read the descendent/ancestor tag & head info on update
Petr Baudis:
Document git aliases support
Documentation: git aliases
Rene Scharfe:
Off-by-one error in get_path_prefix(), found by Valgrind
Robert Fitzsimons:
builtin-grep: pass ignore case option to external grep
^ permalink raw reply
* Re: gitignore: regex for the current dir files only?
From: Junio C Hamano @ 2006-06-08 2:40 UTC (permalink / raw)
To: Yasushi SHOJI; +Cc: git
In-Reply-To: <87mzcol7i3.wl@mail2.atmark-techno.com>
Yasushi SHOJI <yashi@atmark-techno.com> writes:
> because we have "vmlinux*" in the toplevel .gitignore in linus's tree,
> all vmlinux.lds.S under arch/$(ARCH)/kernel/ is affected. for kernel,
> it might as easier to remove "*" from the exp. but I was wandering if
> it's worth to have an expression for gitignore to handle "a regex for
> the current dir only"?
Yeah, that would be a very useful thing to have. Something like
this?
#!/bin/sh
rm -rf test
mkdir -p test/a/b/c
cd test
git init-db
date >a/vmlinux.1
date >a/b/vmlinux.2
date >a/b/c/vmlinux.3
echo 'vmlinux*' >a/.gitignore
echo '!/vmlinux*' >a/b/.gitignore
git status -u
^ permalink raw reply
* gitignore: regex for the current dir files only?
From: Yasushi SHOJI @ 2006-06-08 2:13 UTC (permalink / raw)
To: git
Hello,
this problem came up when I was editing vmlinux.lds.S in the kernel
tree.
because we have "vmlinux*" in the toplevel .gitignore in linus's tree,
all vmlinux.lds.S under arch/$(ARCH)/kernel/ is affected. for kernel,
it might as easier to remove "*" from the exp. but I was wandering if
it's worth to have an expression for gitignore to handle "a regex for
the current dir only"?
comments?
--
yashi
^ permalink raw reply
* Re: [PATCH] config.txt grammar, typo, and asciidoc fixes
From: Petr Baudis @ 2006-06-08 1:28 UTC (permalink / raw)
To: Francis Daly; +Cc: git
In-Reply-To: <20060607231505.GX29682@craic.sysops.org>
Dear diary, on Thu, Jun 08, 2006 at 01:15:05AM CEST, I got a letter
where Francis Daly <francis@daoine.org> said that...
> Nothing major.
>
> Signed-off-by: Francis Daly <francis@daoine.org>
>
> ---
>
> The first change makes it "the behaviour of the git command". If it was
> intended to be "the behaviour(s?) of the git commands" it would be a
> slightly different change.
Yes, it should probably read as "git commands' behavior".
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.
^ permalink raw reply
* Re: [PATCH] cvsimport: complete the cvsps run before starting the import - BAD
From: Junio C Hamano @ 2006-06-08 1:16 UTC (permalink / raw)
To: Martin Langhoff; +Cc: git
In-Reply-To: <46a038f90606071706w46567f6j4f4addae5c877537@mail.gmail.com>
"Martin Langhoff" <martin.langhoff@gmail.com> writes:
> As far as I can see, you had the good sense of not applying this one.
> It is bad, and should be dropped.
Actually it wasn't sense but distraction. I got sidetracked
while looking at the patch.
^ permalink raw reply
* Re: [PATCH] cvsimport: complete the cvsps run before starting the import - BAD
From: Martin Langhoff @ 2006-06-08 0:06 UTC (permalink / raw)
To: junio; +Cc: git
Junio,
As far as I can see, you had the good sense of not applying this one.
It is bad, and should be dropped.
cheers,
martin
^ permalink raw reply
* [PATCH] config.txt grammar, typo, and asciidoc fixes
From: Francis Daly @ 2006-06-07 23:15 UTC (permalink / raw)
To: git
Nothing major.
Signed-off-by: Francis Daly <francis@daoine.org>
---
The first change makes it "the behaviour of the git command". If it was
intended to be "the behaviour(s?) of the git commands" it would be a
slightly different change.
0d3cd4b4e7cb25b239808ad2c63e3e8c7ff48db2
Documentation/config.txt | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
0d3cd4b4e7cb25b239808ad2c63e3e8c7ff48db2
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 570b691..03eef40 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2,15 +2,15 @@ CONFIGURATION FILE
------------------
The git configuration file contains a number of variables that affect
-the git commands behavior. They can be used by both the git plumbing
-and the porcelains. The variables are divided to sections, where
+the git command's behavior. They can be used by both the git plumbing
+and the porcelains. The variables are divided into sections, where
in the fully qualified variable name the variable itself is the last
dot-separated segment and the section name is everything before the last
dot. The variable names are case-insensitive and only alphanumeric
characters are allowed. Some variables may appear multiple times.
The syntax is fairly flexible and permissive; whitespaces are mostly
-ignored. The '#' and ';' characters begin commends to the end of line,
+ignored. The '#' and ';' characters begin comments to the end of line,
blank lines are ignored, lines containing strings enclosed in square
brackets start sections and all the other lines are recognized
as setting variables, in the form 'name = value'. If there is no equal
@@ -35,8 +35,8 @@ Variables
~~~~~~~~~
Note that this list is non-comprehensive and not necessarily complete.
-For command-specific variables, you will find more detailed description
-in the appropriate manual page. You will find description of non-core
+For command-specific variables, you will find a more detailed description
+in the appropriate manual page. You will find a description of non-core
porcelain configuration variables in the respective porcelain documentation.
core.fileMode::
@@ -52,10 +52,10 @@ core.gitProxy::
on hostnames ending with the specified domain string. This variable
may be set multiple times and is matched in the given order;
the first match wins.
-
- Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
- (which always applies universally, without the special "for"
- handling).
++
+Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
+(which always applies universally, without the special "for"
+handling).
core.ignoreStat::
The working copy files are assumed to stay unchanged until you
--
1.3.3.g63df-dirty
--
Francis Daly francis@daoine.org
^ permalink raw reply related
* [PATCH] git-cvsserver asciidoc formatting tweaks
From: Francis Daly @ 2006-06-07 22:28 UTC (permalink / raw)
To: git
No content change here.
html output improved. man output changed.
Signed-off-by: Francis Daly <francis@daoine.org>
---
08a466185e9d4ca5eb9914addc17297435d204a0
Documentation/git-cvsserver.txt | 49 +++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 18 deletions(-)
08a466185e9d4ca5eb9914addc17297435d204a0
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 952635d..e328db3 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -36,49 +36,62 @@ INSTALLATION
1. If you are going to offer anonymous CVS access via pserver, add a line in
/etc/inetd.conf like
-
++
+--
+------
cvspserver stream tcp nowait nobody git-cvsserver pserver
- Note: In some cases, you need to pass the 'pserver' argument twice for
- git-cvsserver to see it. So the line would look like
+------
+Note: In some cases, you need to pass the 'pserver' argument twice for
+git-cvsserver to see it. So the line would look like
+------
cvspserver stream tcp nowait nobody git-cvsserver pserver pserver
- No special setup is needed for SSH access, other than having GIT tools
- in the PATH. If you have clients that do not accept the CVS_SERVER
- env variable, you can rename git-cvsserver to cvs.
-
+------
+No special setup is needed for SSH access, other than having GIT tools
+in the PATH. If you have clients that do not accept the CVS_SERVER
+env variable, you can rename git-cvsserver to cvs.
+--
2. For each repo that you want accessible from CVS you need to edit config in
the repo and add the following section.
-
++
+--
+------
[gitcvs]
enabled=1
# optional for debugging
logfile=/path/to/logfile
- Note: you need to ensure each user that is going to invoke git-cvsserver has
- write access to the log file and to the git repository. When offering anon
- access via pserver, this means that the nobody user should have write access
- to at least the sqlite database at the root of the repository.
-
+------
+Note: you need to ensure each user that is going to invoke git-cvsserver has
+write access to the log file and to the git repository. When offering anon
+access via pserver, this means that the nobody user should have write access
+to at least the sqlite database at the root of the repository.
+--
3. On the client machine you need to set the following variables.
CVSROOT should be set as per normal, but the directory should point at the
appropriate git repo. For example:
++
+--
+For SSH access, CVS_SERVER should be set to git-cvsserver
- For SSH access, CVS_SERVER should be set to git-cvsserver
-
- Example:
+Example:
+------
export CVSROOT=:ext:user@server:/var/git/project.git
export CVS_SERVER=git-cvsserver
-
+------
+--
4. For SSH clients that will make commits, make sure their .bashrc file
sets the GIT_AUTHOR and GIT_COMMITTER variables.
5. Clients should now be able to check out the project. Use the CVS 'module'
name to indicate what GIT 'head' you want to check out. Example:
-
++
+------
cvs co -d project-master master
+------
Eclipse CVS Client Notes
------------------------
--
1.3.3.g63df-dirty
--
Francis Daly francis@daoine.org
^ permalink raw reply related
* Re: [PATCH] Document git-ls-tree --fullname
From: Jon Loeliger @ 2006-06-07 21:00 UTC (permalink / raw)
To: Jonas Fonseca; +Cc: Junio C Hamano, Git List
In-Reply-To: <20060607203434.GA30402@diku.dk>
On Wed, 2006-06-07 at 15:34, Jonas Fonseca wrote:
> Jon Loeliger <jdl@freescale.com> wrote Wed, Jun 07, 2006:
> > On Wed, 2006-06-07 at 14:46, Jonas Fonseca wrote:
> >
> > > +--full-name::
> > > + Instead of showing the path names relative the current working
> > ^to
> > > + directory, show the full path names.
> > > +
> >
> > *sigh*
>
> I'm deeply sorry. I can't seem to get anything right ...
Listen. It's not that bad. Really. Put the knife down.
I grew up in a country where I was not a native speaker
of the local language. I feel your pain, and I feel Junio's
pain of not having a language hard wired into your brain.
And I know typos and lack of sleep and drinking happen... :-)
Junio nailed me for bad code just a day or two ago.
It's a collective effort...
jdl
^ permalink raw reply
* Re: [PATCH] Classify commands in stg --help output.
From: Catalin Marinas @ 2006-06-07 20:56 UTC (permalink / raw)
To: Yann Dirson; +Cc: git
In-Reply-To: <20060528212519.3207.76228.stgit@gandelf.nowhere.earth>
On 28/05/06, Yann Dirson <ydirson@altern.org> wrote:
>
> Commands will be much easier to find out that way.
> Inspiration mostly comes from pg-help.
Applied, with a small difference - I moved 'pull' to the repository
commands (it looks better there since it is not directly related to
the stack).
Thanks.
--
Catalin
^ permalink raw reply
* Re: [PATCH] Document git-ls-tree --fullname
From: Jonas Fonseca @ 2006-06-07 20:34 UTC (permalink / raw)
To: Jon Loeliger; +Cc: Junio C Hamano, Git List
In-Reply-To: <1149710874.23938.162.camel@cashmere.sps.mot.com>
Jon Loeliger <jdl@freescale.com> wrote Wed, Jun 07, 2006:
> On Wed, 2006-06-07 at 14:46, Jonas Fonseca wrote:
>
> > +--full-name::
> > + Instead of showing the path names relative the current working
> ^to
> > + directory, show the full path names.
> > +
>
> *sigh*
I'm deeply sorry. I can't seem to get anything right ...
--
Jonas Fonseca
^ permalink raw reply
* Re: [PATCH] Document git-ls-tree --fullname
From: Jon Loeliger @ 2006-06-07 20:07 UTC (permalink / raw)
To: Jonas Fonseca; +Cc: Junio C Hamano, Git List
In-Reply-To: <20060607194654.GB21448@diku.dk>
On Wed, 2006-06-07 at 14:46, Jonas Fonseca wrote:
> +--full-name::
> + Instead of showing the path names relative the current working
^to
> + directory, show the full path names.
> +
*sigh*
jdl
^ permalink raw reply
* [PATCH] Document git aliases support
From: Petr Baudis @ 2006-06-07 20:11 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vzmgog5ce.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Wed, Jun 07, 2006 at 08:58:57PM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> said that...
> Petr Baudis <pasky@suse.cz> writes:
> > diff --git a/Documentation/config.txt b/Documentation/config.txt
> > index c861c6c..ad9ec3e 100644
> > --- a/Documentation/config.txt
> > +++ b/Documentation/config.txt
> > @@ -91,6 +91,13 @@ core.warnAmbiguousRefs::
> > If true, git will warn you if the ref name you passed it is ambiguous
> > and might match multiple refs in the .git/refs/ tree. True by default.
> >
> > +alias.*::
> > + Command aliases for the gitlink:git[1] command wrapper - e.g.
> > + after defining "alias.last = cat-file commit HEAD", the invocation
> > + "git last" is equivalent to "git cat-file commit HEAD". You cannot
> > + override even existing command names with aliases. Arguments are
> > + split by spaces, the usual shell quoting and escaping is supported.
> > +
>
> "even"? How about: "alias that hides existing command names are
> not used to avoid confusion"?
Oops, that "even" was not meant to be there. I have rephrased it a bit.
---
This patch ports and modifies appropriately the git aliases documentation
from my patch, shall it rest in peace.
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
Documentation/config.txt | 8 ++++++++
Documentation/git.txt | 3 +++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c861c6c..91615c1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -91,6 +91,14 @@ core.warnAmbiguousRefs::
If true, git will warn you if the ref name you passed it is ambiguous
and might match multiple refs in the .git/refs/ tree. True by default.
+alias.*::
+ Command aliases for the gitlink:git[1] command wrapper - e.g.
+ after defining "alias.last = cat-file commit HEAD", the invocation
+ "git last" is equivalent to "git cat-file commit HEAD". It is not
+ allowed to redefine existing command names using aliases to avoid
+ confusion and troubles with script usage. Arguments are split by
+ spaces, the usual shell quoting and escaping is supported.
+
apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 24ca55d..e474bdf 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -21,6 +21,9 @@ link:everyday.html[Everyday Git] for a u
"man git-commandname" for documentation of each command. CVS users may
also want to read link:cvs-migration.html[CVS migration].
+The COMMAND is either a name of a Git command (see below) or an alias
+as defined in the configuration file (see gitlink:git-repo-config[1]).
+
OPTIONS
-------
--version::
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.
^ permalink raw reply related
* [PATCH] Document git-ls-tree --fullname
From: Jonas Fonseca @ 2006-06-07 19:46 UTC (permalink / raw)
To: Junio C Hamano, git
Additionally, reformat synopsis and remove stub notice.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 018c401..7e072b5 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -8,9 +8,10 @@ git-ls-tree - Lists the contents of a tr
SYNOPSIS
--------
+[verse]
'git-ls-tree' [-d] [-r] [-t] [-z]
- [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
- <tree-ish> [paths...]
+ [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
+ <tree-ish> [paths...]
DESCRIPTION
-----------
@@ -47,6 +48,10 @@ OPTIONS
lines, show only handful hexdigits prefix.
Non default number of digits can be specified with --abbrev=<n>.
+--full-name::
+ Instead of showing the path names relative the current working
+ directory, show the full path names.
+
paths::
When paths are given, show them (note that this isn't really raw
pathnames, but rather a list of patterns to match). Otherwise
@@ -72,8 +77,6 @@ Documentation
Documentation by David Greaves, Junio C Hamano and the git-list
<git@vger.kernel.org>.
-This manual page is a stub. You can help the git documentation by expanding it.
-
GIT
---
Part of the gitlink:git[7] suite
--
Jonas Fonseca
^ permalink raw reply related
* Re: [PATCH] Misc doc improvements
From: Francis Daly @ 2006-06-07 18:59 UTC (permalink / raw)
To: git
Jonas Fonseca wrote:
> +FILES
> +-----
> +'.mailcap'::
s/cap/map/
.mailcap is for something else.
f
--
Francis Daly francis@daoine.org
^ permalink raw reply
* Re: [PATCH] Document git aliases support
From: Junio C Hamano @ 2006-06-07 18:58 UTC (permalink / raw)
To: git
In-Reply-To: <20060607184350.31338.46653.stgit@machine.or.cz>
Petr Baudis <pasky@suse.cz> writes:
> Documentation/config.txt | 7 +++++++
> Documentation/git.txt | 3 +++
> 2 files changed, 10 insertions(+), 0 deletions(-)
Thanks.
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index c861c6c..ad9ec3e 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -91,6 +91,13 @@ core.warnAmbiguousRefs::
> If true, git will warn you if the ref name you passed it is ambiguous
> and might match multiple refs in the .git/refs/ tree. True by default.
>
> +alias.*::
> + Command aliases for the gitlink:git[1] command wrapper - e.g.
> + after defining "alias.last = cat-file commit HEAD", the invocation
> + "git last" is equivalent to "git cat-file commit HEAD". You cannot
> + override even existing command names with aliases. Arguments are
> + split by spaces, the usual shell quoting and escaping is supported.
> +
"even"? How about: "alias that hides existing command names are
not used to avoid confusion"?
^ permalink raw reply
* Re: [PATCH] Off-by-one error in get_path_prefix(), found by Valgrind
From: Junio C Hamano @ 2006-06-07 18:47 UTC (permalink / raw)
To: Pavel Roskin, Rene Scharfe; +Cc: git
In-Reply-To: <1149705204.11931.3.camel@dv>
Pavel Roskin <proski@gnu.org> writes:
> On Wed, 2006-06-07 at 20:05 +0200, Rene Scharfe wrote:
>> Argh, yes. Thanks, Pavel!
>
> Actually, thanks to Julian Seward for Valgrind.
>
>> However, the other branch is incorrect, too:
>> accessing path->buf[path->len] is wrong, even if it's within the buffer.
>> In order to use a length variable to point to the end of some string we
>> need to subtract 1. *sigh* So, how about this one instead?
>
> Fine with me. Thank you for noticing!
Thanks both. Applied.
^ permalink raw reply
* Re: [PATCH] Misc doc improvements
From: Jakub Narebski @ 2006-06-07 18:46 UTC (permalink / raw)
To: git
In-Reply-To: <20060607183233.GA21448@diku.dk>
Jonas Fonseca wrote:
> +grafts::
> + Grafts enables two otherwise different lines of development to be
> + joined together by recording fake ancestry information for commits.
> + This way you can make git pretend the set of parents a commit
> + has is different from what was recorded when the commit was created.
> + Configured via the `.git/info/grafts` file.
Actually, grafts are used to "fake" (or change) parents (ancestry) of an
existing commit. It can be used both to add parents (e.g. joining roots of
"current" repository with historical one), or remove parents (e.g. to
shorten (cauterize) history like in the "shalllow clone" idea).
--
Jakub Narebski
Warsaw, Poland
^ permalink raw reply
* [PATCH] Document git aliases support
From: Petr Baudis @ 2006-06-07 18:43 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This patch ports and modifies appropriately the git aliases documentation
from my patch, shall it rest in peace.
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
Documentation/config.txt | 7 +++++++
Documentation/git.txt | 3 +++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c861c6c..ad9ec3e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -91,6 +91,13 @@ core.warnAmbiguousRefs::
If true, git will warn you if the ref name you passed it is ambiguous
and might match multiple refs in the .git/refs/ tree. True by default.
+alias.*::
+ Command aliases for the gitlink:git[1] command wrapper - e.g.
+ after defining "alias.last = cat-file commit HEAD", the invocation
+ "git last" is equivalent to "git cat-file commit HEAD". You cannot
+ override even existing command names with aliases. Arguments are
+ split by spaces, the usual shell quoting and escaping is supported.
+
apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 24ca55d..e474bdf 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -21,6 +21,9 @@ link:everyday.html[Everyday Git] for a u
"man git-commandname" for documentation of each command. CVS users may
also want to read link:cvs-migration.html[CVS migration].
+The COMMAND is either a name of a Git command (see below) or an alias
+as defined in the configuration file (see gitlink:git-repo-config[1]).
+
OPTIONS
-------
--version::
^ permalink raw reply related
* [PATCH] Document git aliases support
From: Petr Baudis @ 2006-06-07 18:43 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This patch ports and modifies appropriately the git aliases documentation
from my patch, shall it rest in peace.
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
Documentation/config.txt | 7 +++++++
Documentation/git.txt | 3 +++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c861c6c..ad9ec3e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -91,6 +91,13 @@ core.warnAmbiguousRefs::
If true, git will warn you if the ref name you passed it is ambiguous
and might match multiple refs in the .git/refs/ tree. True by default.
+alias.*::
+ Command aliases for the gitlink:git[1] command wrapper - e.g.
+ after defining "alias.last = cat-file commit HEAD", the invocation
+ "git last" is equivalent to "git cat-file commit HEAD". You cannot
+ override even existing command names with aliases. Arguments are
+ split by spaces, the usual shell quoting and escaping is supported.
+
apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 24ca55d..e474bdf 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -21,6 +21,9 @@ link:everyday.html[Everyday Git] for a u
"man git-commandname" for documentation of each command. CVS users may
also want to read link:cvs-migration.html[CVS migration].
+The COMMAND is either a name of a Git command (see below) or an alias
+as defined in the configuration file (see gitlink:git-repo-config[1]).
+
OPTIONS
-------
--version::
^ permalink raw reply related
* Re: [PATCH] Off-by-one error in get_path_prefix(), found by Valgrind
From: Pavel Roskin @ 2006-06-07 18:33 UTC (permalink / raw)
To: Rene Scharfe; +Cc: git
In-Reply-To: <20060607180543.GA26638@lsrfire.ath.cx>
On Wed, 2006-06-07 at 20:05 +0200, Rene Scharfe wrote:
> Argh, yes. Thanks, Pavel!
Actually, thanks to Julian Seward for Valgrind.
> However, the other branch is incorrect, too:
> accessing path->buf[path->len] is wrong, even if it's within the buffer.
> In order to use a length variable to point to the end of some string we
> need to subtract 1. *sigh* So, how about this one instead?
Fine with me. Thank you for noticing!
--
Regards,
Pavel Roskin
^ permalink raw reply
* [PATCH] Misc doc improvements
From: Jonas Fonseca @ 2006-06-07 18:32 UTC (permalink / raw)
To: Junio C Hamano, git
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
Documentation/git-apply.txt | 2 +-
Documentation/git-shortlog.txt | 19 ++++++++++++++++---
Documentation/glossary.txt | 7 +++++++
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 9cc7c74..2ff7494 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -76,7 +76,7 @@ OPTIONS
-C<n>::
Ensure at least <n> lines of surrounding context match before
and after each change. When fewer lines of surrounding
- context exist they all most match. By default no context is
+ context exist they all must match. By default no context is
ever ignored.
--apply::
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index 54fb922..0dbd3b2 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -5,7 +5,6 @@ NAME
----
git-shortlog - Summarize 'git log' output
-
SYNOPSIS
--------
git-log --pretty=short | 'git-shortlog'
@@ -13,8 +12,22 @@ git-log --pretty=short | 'git-shortlog'
DESCRIPTION
-----------
Summarizes 'git log' output in a format suitable for inclusion
-in release announcements.
-
+in release announcements. Each commit will be grouped by author
+the first line of the commit message will be shown.
+
+Additionally, "[PATCH]" will be stripped from the commit description.
+
+FILES
+-----
+'.mailcap'::
+ If this file exists, it will be used for mapping author email
+ addresses to a real author name. One mapping per line, first
+ the author name followed by the email address enclosed by
+ '<' and '>'. Use hash '#' for comments. Example:
+
+ # Keep alphabetized
+ Adam Morrow <adam@localhost.localdomain>
+ Eve Jones <eve@laptop.(none)>
Author
------
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad..879c708 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -109,6 +109,13 @@ file system::
git archive::
Synonym for repository (for arch people).
+grafts::
+ Grafts enables two otherwise different lines of development to be
+ joined together by recording fake ancestry information for commits.
+ This way you can make git pretend the set of parents a commit
+ has is different from what was recorded when the commit was created.
+ Configured via the `.git/info/grafts` file.
+
hash::
In git's context, synonym to object name.
--
1.4.0.rc1.gfd4c-dirty
--
Jonas Fonseca
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox