pandora bracelet charms is actually a jewelry brand

2012-12-17 Thread lily265
[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

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Johannes Sixt
Am 12/17/2012 8:21, schrieb Junio C Hamano: Chris Rorvick ch...@rorvick.com writes: 'git checkout' [branch]:: Is branch 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

pandora bracelets uk gaining a symbol of want and alternative

2012-12-17 Thread mimima333
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,

[PATCH] log --format: teach %C(auto,black) to paint it black only on terminals

2012-12-17 Thread 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 colored iff it goes to

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: Yann Dirson dir...@bertin.fr 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

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
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

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Andrew Ardill
Regards, Andrew Ardill On 17 December 2012 19:20, Johannes Sixt j.s...@viscovery.net wrote: Am 12/17/2012 8:21, schrieb Junio C Hamano: Chris Rorvick ch...@rorvick.com writes: 'git checkout' [branch]:: Is branch really optional in this form? BTW, what does plain 'git checkout' do? Just

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Junio C Hamano
Yann Dirson dir...@bertin.fr 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

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Johannes Sixt
Am 12/17/2012 9:48, schrieb Junio C Hamano: Here is what I tentatively have ... Thanks! -'git checkout' [--detach] [commit]:: +'git checkout' --detach [commit]:: +'git checkout' commit:: - Update the index and working tree to reflect the specified - commit and set HEAD to point

Re: git log reliability

2012-12-17 Thread Tomas Carnecky
On Mon, 17 Dec 2012 14:56:17 +0530, Prasad Karmarkar prasad.s.karmar...@gmail.com 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

Aw: Re: [PATCH] Move api-command.txt to the end of API list in api-index.txt

2012-12-17 Thread Thomas Ackermann
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 gits...@pobox.com An: Thomas Ackermann th.ac...@arcor.de Datum: 16.12.2012 21:01 Betreff: Re: [PATCH] Move api-command.txt to the end

Re: [PATCH] Documentation: don't link to example mail addresses

2012-12-17 Thread John Keeping
On Sun, Dec 16, 2012 at 09:29:24PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Here `name` is the person's display name (for example ``Com M Itter'') and `email` is the person's email address -(``c...@example.com''). `LT` and `GT` are the literal less-than (\x3c)

problem with BOINC repository and CR/LF

2012-12-17 Thread Toralf Förster
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

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Yann Dirson
On Mon, 17 Dec 2012 00:56:06 -0800 Junio C Hamano gits...@pobox.com wrote: Yann Dirson dir...@bertin.fr 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

[PATCH v2] git-clean: Display more accurate delete messages

2012-12-17 Thread Zoltan Klinger
(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 |   |--

RFC: git config -l should not expose sensitive information

2012-12-17 Thread Toralf Förster
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 872A

Re: [PATCH] log --format: teach %C(auto,black) to paint it black only on terminals

2012-12-17 Thread Nguyen Thai Ngoc Duy
On Mon, Dec 17, 2012 at 3:40 PM, Junio C Hamano gits...@pobox.com 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

Re: Git Log and History Simplification

2012-12-17 Thread Nguyen Thai Ngoc Duy
On Mon, Dec 17, 2012 at 6:33 PM, Dinesh Subramani dinesh.subram...@gmail.com wrote: I am using the below command : git log --stat --decorate=full --since=date 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

Re: [PATCH v2] Documentation: don't link to example mail addresses

2012-12-17 Thread Jeff King
On Sun, Dec 16, 2012 at 06:24:58PM -0800, Junio C Hamano wrote: I seem to be getting (tt`\c...@example.com''). `LT/tt and ttGT/tt 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

Re: ASoC updates for v3.8

2012-12-17 Thread Mark Brown
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 at:

Re: ASoC updates for v3.8

2012-12-17 Thread Takashi Iwai
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: Linux 3.7 (2012-12-10

Re: [PATCH 0/2] second try

2012-12-17 Thread Sven Strickroth
Hi, Am 26.11.2012 05:50 schrieb Junio C Hamano: Sven Strickroth sven.strickr...@tu-clausthal.de 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

Re: problem with BOINC repository and CR/LF

2012-12-17 Thread Toralf Förster
On 12/17/2012 12:38 PM, Andrew Ardill wrote: On 17 December 2012 21:23, Toralf Förster toralf.foers...@gmx.de 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,

Re: [PATCH] git-completion.bash: update obsolete code.

2012-12-17 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 17/12/2012 05:54, Junio C Hamano ha scritto: Manlio Perillo manlio.peri...@gmail.com 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

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 12/17/2012 9:48, schrieb Junio C Hamano: Here is what I tentatively have ... Thanks! -'git checkout' [--detach] [commit]:: +'git checkout' --detach [commit]:: +'git checkout' commit:: -Update the index and working tree to reflect the

Re: [PATCH] log --format: teach %C(auto,black) to paint it black only on terminals

2012-12-17 Thread Junio C Hamano
Jeff King p...@peff.net 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 -

Re: [PATCH] git-completion.bash: add support for path completion

2012-12-17 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com 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 DocTAB first would give git cmd

Re: [PATCH] log --format: teach %C(auto,black) to paint it black only on terminals

2012-12-17 Thread Jeff King
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 commit header

Re: Git Log and History Simplification

2012-12-17 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Mon, Dec 17, 2012 at 6:33 PM, Dinesh Subramani dinesh.subram...@gmail.com wrote: I am using the below command : git log --stat --decorate=full --since=date Can you please let me know if the above command will list all the commits and would

Re: [PATCH v2] Documentation: don't link to example mail addresses

2012-12-17 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Sun, Dec 16, 2012 at 06:24:58PM -0800, Junio C Hamano wrote: I seem to be getting (tt`\c...@example.com''). `LT/tt and ttGT/tt are the literal less-than (\x3c) out of this part in the resulting HTML output, which is probably not what you wanted to

Re: [PATCH] log --format: teach %C(auto,black) to paint it black only on terminals

2012-12-17 Thread Junio C Hamano
Jeff King p...@peff.net 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.

Re: [PATCH 0/2] second try

2012-12-17 Thread Junio C Hamano
Sven Strickroth sven.strickr...@tu-clausthal.de 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

Re: [PATCH] git-completion.bash: update obsolete code.

2012-12-17 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com 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

Re: Submodule not updated automatically on merge conflict

2012-12-17 Thread Heiko Voigt
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 in

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, 2012 7:21 AM Chris Rorvick ch...@rorvick.com 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.

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com 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

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com 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

Re: What's cooking in git.git (Dec 2012, #04; Sun, 16)

2012-12-17 Thread Matt Kraai
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? QNX

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Andrew Ardill andrew.ard...@gmail.com writes: Even if the primary purpose of git checkout branch 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

Re: [PATCH] t3070: Disable some failing fnmatch tests

2012-12-17 Thread Ramsay Jones
Nguyen Thai Ngoc Duy wrote: On Sun, Dec 16, 2012 at 2:19 AM, Ramsay Jones ram...@ramsay1.demon.co.uk 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

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, 2012 9:13 PM Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, This is to check out the branch ;-) ... From a user perspective it's better to refer to the working

Re: [PATCH] log --format: teach %C(auto,black) to paint it black only on terminals

2012-12-17 Thread 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 the hard

[PATCH 1/2] t6006: clean up whitespace

2012-12-17 Thread Jeff King
From: Junio C Hamano gits...@pobox.com 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.

[PATCH 2/2] log --format: teach %C(auto,black) to respect color config

2012-12-17 Thread Jeff King
From: Junio C Hamano gits...@pobox.com 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

[PATCH] Pretty formats: skip color codes if !want_color()

2012-12-17 Thread Oren Held
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 o...@held.org.il --- Would appreciate your help or

Re: [PATCH 1/2] t6006: clean up whitespace

2012-12-17 Thread Jeff King
On Mon, Dec 17, 2012 at 05:55:52PM -0500, Junio C Hamano wrote: From: Junio C Hamano gits...@pobox.com To: Junio C Hamano gits...@pobox.com 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

[PATCH 1/2] t6006: clean up whitespace

2012-12-17 Thread 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 p...@peff.net ---

Re: [PATCH] Pretty formats: skip color codes if !want_color()

2012-12-17 Thread Jeff King
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

[PATCH 1/3] git-svn, perl/Git.pm: add central method for prompting passwords

2012-12-17 Thread Sven Strickroth
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

bug? 'git log -M100' is different from 'git log -M100%'

2012-12-17 Thread Sitaram Chamarty
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

Re: [PATCH 2/3] perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

2012-12-17 Thread Jeff King
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 em...@cs-ware.de --- Thanks, this series

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Andrew Ardill
On 18 December 2012 08:59, Junio C Hamano gits...@pobox.com wrote: Andrew Ardill andrew.ard...@gmail.com writes: Even if the primary purpose of git checkout branch 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

Re: [PATCH] git-completion.bash: update obsolete code.

2012-12-17 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com writes: Il 17/12/2012 05:54, Junio C Hamano ha scritto: Manlio Perillo manlio.peri...@gmail.com 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

Re: [PATCH 1/1] tests: Allow customization of how say_color() prints

2012-12-17 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk 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.

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com 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

Re: problem with BOINC repository and CR/LF

2012-12-17 Thread Andrew Ardill
On 18 December 2012 03:01, Toralf Förster toralf.foers...@gmx.de wrote: On 12/17/2012 12:38 PM, Andrew Ardill wrote: On 17 December 2012 21:23, Toralf Förster toralf.foers...@gmx.de wrote: Hello, I'm faced with this situation :

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Andrew Ardill
I like these, and I think they are conveying the right amount of information. There is a slight discrepancy between the branch and commit 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'

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Chris Rorvick
On Mon, Dec 17, 2012 at 2:20 AM, Johannes Sixt j.s...@viscovery.net wrote: +'git checkout' [--detach] [commit]:: The title here is better spelled as two lines: 'git checkout' commit:: 'git checkout' --detach branch:: AsciiDoc renders these horizontally separated by a comma when formatted as

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Chris Rorvick
On Mon, Dec 17, 2012 at 7:53 PM, Junio C Hamano gits...@pobox.com 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 branch that is to say,

[PATCH] clarify -M without % symbol in diff-options

2012-12-17 Thread Sitaram Chamarty
--- 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 @@

Re: bug? 'git log -M100' is different from 'git log -M100%'

2012-12-17 Thread Sitaram Chamarty
On Tue, Dec 18, 2012 at 6:55 AM, Junio C Hamano gits...@pobox.com wrote: Sitaram Chamarty sitar...@gmail.com 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

Re: Proposal: create meaningful aliases for git reset's hard/soft/mixed

2012-12-17 Thread Martin von Zweigbergk
On Wed, Nov 23, 2011 at 12:49 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Philippe Vaucher philippe.vauc...@gmail.com 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

Re: Proposal: create meaningful aliases for git reset's hard/soft/mixed

2012-12-17 Thread Martin von Zweigbergk
On Wed, Nov 23, 2011 at 10:51 AM, Junio C Hamano gits...@pobox.com 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