On Wed, Nov 23, 2011 at 10:51 AM, Junio C Hamano wrote:
>
> I am guilty of introducing "git reset --soft HEAD^" before I invented
> "commit --amend" during v1.3.0 timeframe to solve the issue "soft" reset
> originally wanted to.
I do use "commit --amend" a lot, but I still appreciate having "rese
On Wed, Nov 23, 2011 at 12:49 AM, Matthieu Moy
wrote:
> Philippe Vaucher writes:
>
>> Optional: a new mode would be introduced for consistency:
>> --worktree (or maybe --tree): only updates the worktree but not the index
>
> That would be an alias for "git checkout -- path", right?
Not quite, i
On Tue, Dec 18, 2012 at 6:55 AM, Junio C Hamano wrote:
> Sitaram Chamarty writes:
>
>> When using -M with a number to act as a threshold for declaring
>> a change as being a rename, I found a... quirk. Any 2-digit
>> number after the M will work,...
>
> That is not 2-digit number.
>
> A few hist
---
Documentation/diff-options.txt | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f4f7e25..39f2c50 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -309,7 +309,11 @@ e
On Mon, Dec 17, 2012 at 7:53 PM, Junio C Hamano wrote:
> Here is a work-in-progress relative to Chris's 83c9989
> (Documentation/git-checkout.txt: document 70c9ac2 behavior,
> 2012-12-17).
It sounds pretty good to me.
> @@ -54,12 +61,17 @@ $ git checkout
> that is to say, the branch is not res
On Mon, Dec 17, 2012 at 2:20 AM, Johannes Sixt wrote:
>>> +'git checkout' [--detach] []::
>
> The title here is better spelled as two lines:
>
> 'git checkout' ::
> 'git checkout' --detach ::
AsciiDoc renders these horizontally separated by a comma when
formatted as a man page instead of vertical
I like these, and I think they are conveying the right amount of
information. There is a slight discrepancy between the and
versions, where it seems we are assuming that by checking out
a commit you are intending to work 'on top of' it. This could be
avoided by using the term 'with' in both cases
On 18 December 2012 03:01, Toralf Förster wrote:
> On 12/17/2012 12:38 PM, Andrew Ardill wrote:
>> On 17 December 2012 21:23, Toralf Förster wrote:
>>> Hello,
>>>
>>> I'm faced with this situation :
>>> http://lists.ssl.berkeley.edu/mailman/private/boinc_alpha/2012-December/017371.html
>>> and ev
Junio C Hamano writes:
> I agree with you that sightseeing use case where you do not intend
> to make any commit is also important. That is exactly why I said
> "further work is done on that branch" not "to that branch" in the
> message you are responding to.
Here is a work-in-progress relative
Ramsay Jones writes:
> Junio C Hamano wrote:
> ...
>> Why does your printf die in the first place???
>
> I really don't know. ...
>
> Sorry for wasting your time.
Not a waste. I was hoping somebody (not necessarily you) may be able
to come up with a cleaner solution. Unfortunately it hasn't
hap
Manlio Perillo writes:
> Il 17/12/2012 05:54, Junio C Hamano ha scritto:
>> Manlio Perillo writes:
>>
>>> The git-completion.bash script was using the git ls-tree command
>>> without the --name-only option, with a sed filter to parse path names;
>>> use the --name-only option, instead.
>>>
>>>
On 18 December 2012 08:59, Junio C Hamano wrote:
> Andrew Ardill writes:
>> Even if the primary purpose of "git checkout " is to "check
>> out the branch so that further work is done on that branch", I don't
>> believe that means it has to be stated first. In fact, I would say
>> that there are e
Sitaram Chamarty writes:
> When using -M with a number to act as a threshold for declaring
> a change as being a rename, I found a... quirk. Any 2-digit
> number after the M will work,...
That is not 2-digit number.
A few historical trivia may help.
Originally we said "you can use -M2 to choo
On Tue, Dec 18, 2012 at 01:28:47AM +0100, Sven Strickroth wrote:
> If GIT_ASKPASS environment variable is not set, git-svn does not try to use
> SSH_ASKPASS as git-core does. This change adds a fallback to SSH_ASKPASS.
>
> Signed-off-by: Sven Strickroth
> ---
Thanks, this series looks fine to m
Hi,
When using -M with a number to act as a threshold for declaring
a change as being a rename, I found a... quirk. Any 2-digit
number after the M will work, but if the number is 100, it will
require a % to be appended to be effective.
Here's a transcript that will demonstrate the problem when r
git-svn reads usernames and other user queries from an interactive
terminal. This cause GUIs (w/o STDIN connected) to hang waiting forever
for git-svn to complete
(http://code.google.com/p/tortoisegit/issues/detail?id=967).
This change extends the Git::prompt helper, so that it can also be used
f
If GIT_ASKPASS environment variable is not set, git-svn does not try to use
SSH_ASKPASS as git-core does. This change adds a fallback to SSH_ASKPASS.
Signed-off-by: Sven Strickroth
---
perl/Git.pm | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/perl/Git.pm b/perl/Git.p
git-svn reads passwords from an interactive terminal or by using
GIT_ASKPASS helper tool. This cause GUIs (w/o STDIN connected) to hang
waiting forever for git-svn to complete
(http://code.google.com/p/tortoisegit/issues/detail?id=967).
Commit 56a853b62c0ae7ebaad0a7a0a704f5ef561eb795 also tried to
On Tue, Dec 18, 2012 at 12:57:03AM +0200, Oren Held wrote:
> Avoid color escape codes if colors are disabled, just like the
> behavior of other git commands. This solves the case of color escape
> codes in stdout when piping or redirecting, e.g.: $ git log
> --format=%Cred%h > out
You may be int
The test_format function did not indent its in-line test
script in an attempt to make the output of the test look
better. But it does not make a big difference to the output,
and the source looks quite ugly. Let's use our normal
indenting instead.
Signed-off-by: Jeff King
---
t/t6006-rev-list-fo
On Mon, Dec 17, 2012 at 05:55:52PM -0500, Junio C Hamano wrote:
> From: Junio C Hamano
> To: Junio C Hamano
>
> The test_format function did not indent its in-line test
> script in an attempt to make the output of the test look
> better. But it does not make a big difference to the output,
> and
Avoid color escape codes if colors are disabled, just like the behavior of
other git commands.
This solves the case of color escape codes in stdout when piping or
redirecting, e.g.:
$ git log --format=%Cred%h > out
Signed-off-by: Oren Held
---
Would appreciate your help or comments :)
pretty.
From: Junio C Hamano
Traditionally, %C(color attr) always emitted the ANSI color
sequence; it was up to the scripts that wanted to conditionally
color their output to omit %C(...) specifier when they do not want
colors.
Optionally allow "auto," to be prefixed to the color, so that the
output is
From: Junio C Hamano
The test_format function did not indent its in-line test
script in an attempt to make the output of the test look
better. But it does not make a big difference to the output,
and the source looks quite ugly. Let's use our normal
indenting instead.
Signed-off-by: Jeff King
-
On Mon, Dec 17, 2012 at 12:03:40PM -0800, Junio C Hamano wrote:
> > So no, I do not think you can cover every conceivable case. But having
> > git-log respect --color and the usual color.* variables for this feature
> > seems like the only sane default. It makes the easy cases just work, and
> > t
From: "Junio C Hamano" Sent: Monday, December 17,
2012 9:13 PM
"Philip Oakley" writes:
From: "Junio C Hamano" Sent: Monday, December 17,
This is to "check out the branch" ;-)
...
From a user perspective it's better to refer to the working directory
first rather than the internal mechanics
Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> diff --git a/t/test-lib.sh b/t/test-lib.sh
>> index f50f834..9dcf3c1 100644
>> --- a/t/test-lib.sh
>> +++ b/t/test-lib.sh
>> @@ -202,6 +202,15 @@ do
>> esac
>> done
>>
>> +if test -z "$GIT_TEST_PRINT"
>> +then
>> +GIT_TEST_PRINT="print
Nguyen Thai Ngoc Duy wrote:
> On Sun, Dec 16, 2012 at 2:19 AM, Ramsay Jones
> wrote:
>>
>> The failing tests make use of a POSIX character class, '[:xdigit:]'
>> in this case, which some versions of the fnmatch() library function
>> do not support. In the spirit of commit f1cf7b79 ("t3070: disable
Andrew Ardill writes:
> Even if the primary purpose of "git checkout " is to "check
> out the branch so that further work is done on that branch", I don't
> believe that means it has to be stated first. In fact, I would say
> that there are enough other use cases that the language should be
> sli
On 18 December 2012 08:13, Junio C Hamano wrote:
> "Philip Oakley" writes:
>
>> From: "Junio C Hamano" Sent: Monday, December 17,
>>> This is to "check out the branch" ;-)
>>> ...
>>
>> From a user perspective it's better to refer to the working directory
>> first rather than the internal mechan
Zoltan Klinger writes:
> +static void print_filtered(const char *msg, struct string_list *lst)
> +{
> + int i;
> + char *name;
> + char *dir = 0;
> +
> + sort_string_list(lst);
> +
> + for (i = 0; i < lst->nr; i++) {
> + name = lst->items[i].string;
> +
Junio C Hamano wrote:
> It could turn out that we may be able to get rid of sys/param.h
> altogether, but one step at a time. Inputs from people on minority
> platforms are very much appreciated---does your platform build fine
> when the inclusion of the file is removed from git-compat-util.h?
QN
Andreas Schwab writes:
> Christian Couder writes:
>
>> Yeah, at one point I wanted to have a command that created to craft a
>> new commit based on an existing one.
>
> This isn't hard to do, you only have to resort to plumbing:
>
> $ git cat-file commit fef11965da875c105c40f1a9550af1f5e34a6e62
"Philip Oakley" writes:
> From: "Junio C Hamano" Sent: Monday, December 17,
>> This is to "check out the branch" ;-)
>> ...
>
> From a user perspective it's better to refer to the working directory
> first rather than the internal mechanics.
>
>Prepare to work on , by updating the files in t
From: "Junio C Hamano" Sent: Monday, December 17,
2012 7:21 AM
Chris Rorvick writes:
The forms of checkout that do not take a path are lumped together in
the
DESCRIPTION section, but the description for this group is dominated
by
explanation of the -b|-B form. Split these apart for more clar
Hi,
On Thu, Dec 13, 2012 at 01:46:43PM +0800, ?A???Y wrote:
> If there are merge conflict files, then changed submodules are not
> updated automatically.
> Why not submodules?
> Files do try to merge / update.
This is work in progress, currently you still have to use submodule
update to get them
Manlio Perillo writes:
> By the way, IMHO there should be an option for adding a slash to
> directory names in ls-tree.
I am not sure about that; ls-tree is meant to be used by scripts
that are capable of doing that kind of thing themselves.
If we were to add an option to add a slash, I think i
Sven Strickroth writes:
> Am 26.11.2012 05:50 schrieb Junio C Hamano:
>> I think between Peff and me it fell in the cracks during the
>> hand-off; I do not know about the others, probably people did not
>> find it interesting perhaps?
>>
>> I'll add Eric Wong (git-svn submaintainer) to Cc.
>
> I
Christian Couder writes:
> Yeah, at one point I wanted to have a command that created to craft a
> new commit based on an existing one.
This isn't hard to do, you only have to resort to plumbing:
$ git cat-file commit fef11965da875c105c40f1a9550af1f5e34a6e62 | sed
s/bfae342c973b0be3c9e99d3d86e
Jeff King writes:
> If "git frotz" wants to have a separate "color.frotz" option to override
> that, then they would need to implement that themselves either with or
> without your patch. I do not think its presence makes things any harder.
That _was_ (but no longer is) exactly my point. Eh, ra
Jeff King writes:
> On Sun, Dec 16, 2012 at 06:24:58PM -0800, Junio C Hamano wrote:
>
>> I seem to be getting
>>
>> (`\c...@example.com''). `LT and GT are the literal
>> less-than (\x3c)
>>
>> out of this part in the resulting HTML output, which is probably not
>> what you wanted to see.
>>
Nguyen Thai Ngoc Duy writes:
> On Mon, Dec 17, 2012 at 6:33 PM, Dinesh Subramani
> wrote:
>> I am using the below command :
>>
>> git log --stat --decorate=full --since=
>>
>> Can you please let me know if the above command will list all the
>> commits and would not skip any of the commits due t
On Mon, Dec 17, 2012 at 11:34:48AM -0800, Junio C Hamano wrote:
> > Yeah, that should definitely be documented. I wonder if it should
> > actually respect color.diff, which is what "log" usually uses (albeit
> > mostly for the diff itself, we have always used it for the graph and for
> > the "comm
Manlio Perillo writes:
>> As long as all of the above stops completion at directory boundary,
>> I think the above sounds like a sensible thing to do. e.g. when
>> "ls-files" gives Documentation/Makefile and Documentation/git.txt,
>> "git cmd Doc" first would give "git cmd Documentation/" and
>>
Jeff King writes:
> On Mon, Dec 17, 2012 at 06:44:10PM +0700, Nguyen Thai Ngoc Duy wrote:
>
>> > if (!end)
>> > return 0;
>> > - color_parse_mem(placeholder + 2,
>> > - end - (place
Johannes Sixt writes:
> Am 12/17/2012 9:48, schrieb Junio C Hamano:
>> Here is what I tentatively have ...
>
> Thanks!
>
>> -'git checkout' [--detach] []::
>> +'git checkout' --detach []::
>> +'git checkout' ::
>>
>> -Update the index and working tree to reflect the specified
>> -commit
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Il 17/12/2012 05:54, Junio C Hamano ha scritto:
> Manlio Perillo writes:
>
>> The git-completion.bash script was using the git ls-tree command
>> without the --name-only option, with a sed filter to parse path names;
>> use the --name-only option, in
On 12/17/2012 12:38 PM, Andrew Ardill wrote:
> On 17 December 2012 21:23, Toralf Förster wrote:
>> Hello,
>>
>> I'm faced with this situation :
>> http://lists.ssl.berkeley.edu/mailman/private/boinc_alpha/2012-December/017371.html
>> and even a "git stash" doesn't help.
>
> Hi Toralf,
>
> That l
Hi,
Am 26.11.2012 05:50 schrieb Junio C Hamano:
> Sven Strickroth writes:
>
>> Am 11.11.2012 17:40 schrieb Sven Strickroth:
>>> Am 06.10.2012 20:28 schrieb Junio C Hamano:
It is either that it was simply forgotten, or after I wrote the part
you quoted early in January there were discus
At Mon, 17 Dec 2012 14:25:00 +,
Mark Brown wrote:
>
> On Mon, Dec 17, 2012 at 03:09:34PM +0100, Takashi Iwai wrote:
> > At Mon, 17 Dec 2012 22:14:10 +0900,
> > Mark Brown wrote:
> > >
> > > The following changes since commit
> > > 29594404d7fe73cd80eaa4ee8c43dcc53970c60e:
> > >
> > > Linu
On Mon, Dec 17, 2012 at 03:09:34PM +0100, Takashi Iwai wrote:
> At Mon, 17 Dec 2012 22:14:10 +0900,
> Mark Brown wrote:
> >
> > The following changes since commit 29594404d7fe73cd80eaa4ee8c43dcc53970c60e:
> >
> > Linux 3.7 (2012-12-10 19:30:57 -0800)
> >
> > are available in the git repository
On Mon, 17 Dec 2012 14:43:59 +0100
Christian Couder wrote:
> Hi Yann,
>
> On Mon, Dec 17, 2012 at 11:40 AM, Yann Dirson wrote:
> > On Mon, 17 Dec 2012 09:43:53 +0100
> > Thomas Rast wrote:
> >
> >> Junio C Hamano writes:
> >>
> >>
> >> I suppose there's the additional issue that grafts are mu
Hi Yann,
On Mon, Dec 17, 2012 at 11:40 AM, Yann Dirson wrote:
> On Mon, 17 Dec 2012 09:43:53 +0100
> Thomas Rast wrote:
>
>> Junio C Hamano writes:
>>
>>
>> I suppose there's the additional issue that grafts are much easier to
>> use than replacements if you really only want to replace some par
On Mon, Dec 17, 2012 at 12:40:55AM -0800, Junio C Hamano wrote:
> +# %C(auto,...) should trump --color=always
> +#
> +# NEEDSWORK: --color=never should also be tested but we need to run a
> +# similar test under pseudo-terminal with test_terminal which is too
> +# much hassle for its worth.
> +
>
On Mon, 17 Dec 2012 17:03:09 +0530, Dinesh Subramani
wrote:
> I am using the below command :
>
> git log --stat --decorate=full --since=
>
> Can you please let me know if the above command will list all the
> commits and would not skip any of the commits due to History
> Simplification. Any hel
On Mon, Dec 17, 2012 at 06:44:10PM +0700, Nguyen Thai Ngoc Duy wrote:
> > if (!end)
> > return 0;
> > - color_parse_mem(placeholder + 2,
> > - end - (placeholder + 2),
> > +
On Sun, Dec 16, 2012 at 06:24:58PM -0800, Junio C Hamano wrote:
> I seem to be getting
>
> (`\c...@example.com''). `LT and GT are the literal
> less-than (\x3c)
>
> out of this part in the resulting HTML output, which is probably not
> what you wanted to see.
>
> I have a feeling that it migh
On Mon, Dec 17, 2012 at 6:33 PM, Dinesh Subramani
wrote:
> I am using the below command :
>
> git log --stat --decorate=full --since=
>
> Can you please let me know if the above command will list all the
> commits and would not skip any of the commits due to History
> Simplification. Any help woul
On Mon, Dec 17, 2012 at 3:40 PM, Junio C Hamano wrote:
> Traditionally, %C(color attr) always emitted the ANSI color
> sequence; it was up to the scripts that wanted to conditionally
> color their output to omit %C(...) specifier when they do not want
> colors.
>
> Optionally allow "auto," to be p
On 17 December 2012 21:23, Toralf Förster wrote:
> Hello,
>
> I'm faced with this situation :
> http://lists.ssl.berkeley.edu/mailman/private/boinc_alpha/2012-December/017371.html
> and even a "git stash" doesn't help.
Hi Toralf,
That list is private and not visible without an account. Can you
t
often the output is requested in help forums - and a
"git config -l | wgetpaste" exposes parameters like sendmail.smtppass -
so hide those variables in the output (if not explicitly wanted) would
makes sense, or ?
--
MfG/Sincerely
Toralf Förster
pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872
(1) Only print out the names of the files and directories that got
actually deleted.
(2) Show warning message for ignored untracked git repositories
Consider the following repo layout:
test.git/
|-- tracked_file
|-- tracked_dir/
| |-- some_tracked_file
| |-- some_unt
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Il 17/12/2012 05:50, Junio C Hamano ha scritto:
> Manlio Perillo writes:
>
>> The git-completion.bash script did not implemented full support for
>> completion, for git commands that operate on files from the current
>> working directory or the index
On Mon, 17 Dec 2012 09:43:53 +0100
Thomas Rast wrote:
> Junio C Hamano writes:
>
> > Yann Dirson writes:
> >
> >> In this respect, they seem to be
> >> lacking a few features, when compared to "replace" refs, but they have
> >> different
> >> uses, ...
> >
> > Not reallyl; grafts were o
On Mon, 17 Dec 2012 00:56:06 -0800
Junio C Hamano wrote:
> Yann Dirson writes:
>
> > And we may still want the bug fixed, or would we just list it as a known
> > bug ?
> > At least it does not seem to occur with "replace" refs:
>
> The "replace" was designed to "fix" known limitation of graft
Hello,
I'm faced with this situation :
http://lists.ssl.berkeley.edu/mailman/private/boinc_alpha/2012-December/017371.html
and even a "git stash" doesn't help.
Now /me wonders whether that repository is just screwed up or whether I
do have with git.1.8.0.2 at an almost stable Gentoo linux a probl
On Sun, Dec 16, 2012 at 09:29:24PM -0800, Junio C Hamano wrote:
> John Keeping writes:
>> Here `` is the person's display name (for example
>> ``Com M Itter'') and `` is the person's email address
>> -(``c...@example.com''). `LT` and `GT` are the literal less-than (\x3c)
>> +(``$$c...@example.c
OK; I would also prefer to have it in ./howto.
So please drop this patch; I will provide a new one.
- Original Nachricht
Von: Junio C Hamano
An: Thomas Ackermann
Datum: 16.12.2012 21:01
Betreff: Re: [PATCH] Move api-command.txt to the end of API list in
api-index.txt
> Th
On Mon, 17 Dec 2012 14:56:17 +0530, Prasad Karmarkar
wrote:
> Hi ,
>
> I have been hearing from my Release Management that git log is not
> reliable. Is it so ?
> Is there a known instance where Git log has missed out on commits ?
>
> Any information about this would be really helpful
Are you
Am 12/17/2012 9:48, schrieb Junio C Hamano:
> Here is what I tentatively have ...
Thanks!
> -'git checkout' [--detach] []::
> +'git checkout' --detach []::
> +'git checkout' ::
>
> - Update the index and working tree to reflect the specified
> - commit and set HEAD to point directly to
Yann Dirson writes:
> And we may still want the bug fixed, or would we just list it as a known bug ?
> At least it does not seem to occur with "replace" refs:
The "replace" was designed to "fix" known limitation of grafts,
which is _inherent_ to it; the graft information was designed _not_
to be
Regards,
Andrew Ardill
On 17 December 2012 19:20, Johannes Sixt wrote:
> Am 12/17/2012 8:21, schrieb Junio C Hamano:
>> Chris Rorvick writes:
>>> 'git checkout' []::
>
> Is really optional in this form?
>
> BTW, what does plain 'git checkout' do? Just report ahead/behind information?
I thin
Here is what I tentatively have (so that I do not forget) on 'pu',
marked with "(squash???)", as a suggested update on top of Chris's
patches.
Documentation/git-checkout.txt | 29 +
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git c/Documentation/git-checko
Junio C Hamano writes:
> Yann Dirson writes:
>
>> In this respect, they seem to be
>> lacking a few features, when compared to "replace" refs, but they have
>> different
>> uses, ...
>
> Not reallyl; grafts were old hack whose use is still supported with
> its original limitations; replac
Traditionally, %C(color attr) always emitted the ANSI color
sequence; it was up to the scripts that wanted to conditionally
color their output to omit %C(...) specifier when they do not want
colors.
Optionally allow "auto," to be prefixed to the color, so that the
output is colored iff it goes to
Pandora Charms may well be all about contemplating that 1982, nonetheless it
was the introduction of Pandora's customizable bracelet in 1999 that surely
sparked their attractiveness.
[url=http://www.buycheappandorabracelets.co.uk/]pandora uk[/url] is named
soon right after the Greek Myth of Zeus, w
Am 12/17/2012 8:21, schrieb Junio C Hamano:
> Chris Rorvick writes:
>> 'git checkout' []::
Is really optional in this form?
BTW, what does plain 'git checkout' do? Just report ahead/behind information?
>> +
>> +Update the index, working tree, and HEAD to reflect the
>> +specified bran
[url=http://www.pandoracheapcanada.com/] pandora bracelet charms[/url]
is actually a jewelry brand that focuses on custom charm anklet bracelets,
rings, necklaces, and jewelry. The brand originated in Denmark in the year
1982. Their signature style is justly famed and highly sought after. This
b
78 matches
Mail list logo
