Next Git conference or meeting

2014-09-01 Thread Christian Couder
Hi everyone, It looks like there will be no Git conference or Git developer meeting this year. Anyway, next year Git will be 10 years old and it would be nice if something could be organized. A few week ago, I was at the LinuxCon North America in Chicago [1]. I love going to a LinuxCon and givin

Re: Configurable filename for what is now .gitignore

2014-09-01 Thread Duy Nguyen
On Tue, Sep 2, 2014 at 3:30 AM, Bostjan Skufca wrote: > There is currently no way to transfer/share repository configuration > between clones. See http://article.gmane.org/gmane.comp.version-control.git/216624 -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body o

Re: [PATCH v8 1/4] cache-tree: Create/update cache-tree on checkou

2014-09-01 Thread John Keeping
On Mon, Sep 01, 2014 at 04:49:28PM -0400, David Turner wrote: > On Sun, 2014-08-31 at 13:07 +0100, John Keeping wrote: > > On Fri, Jul 11, 2014 at 09:44:33PM -0700, David Turner wrote: > > > When git checkout checks out a branch, create or update the > > > cache-tree so that subsequent operations a

Re: [PATCH v8 1/4] cache-tree: Create/update cache-tree on checkou

2014-09-01 Thread David Turner
On Sun, 2014-08-31 at 13:07 +0100, John Keeping wrote: > On Fri, Jul 11, 2014 at 09:44:33PM -0700, David Turner wrote: > > When git checkout checks out a branch, create or update the > > cache-tree so that subsequent operations are faster. > > > > update_main_cache_tree learned a new flag, WRITE_T

Re: Configurable filename for what is now .gitignore

2014-09-01 Thread Bostjan Skufca
I see another crux of the problem. There is currently no way to transfer/share repository configuration between clones. (Or is there? Could this be done with attributes? Probably not...) This is a bit awkward. Are there any plans to provide such functionality? Pros/cons? (It should be limited in

Re: git fsck exit code?

2014-09-01 Thread David Turner
On Sun, 2014-08-31 at 20:54 +0200, Øyvind A. Holm wrote: > On 29 August 2014 22:18, David Turner wrote: > > On Fri, 2014-08-29 at 12:21 -0700, Junio C Hamano wrote: > > > Jeff King writes: > > > > On Wed, Aug 27, 2014 at 06:10:12PM -0400, David Turner wrote: > > > > > It looks like git fsck exits

Re: Trailing whitespace on git diff output.

2014-09-01 Thread Matthieu Moy
Adria Farres <14farr...@gmail.com> writes: > Hello, > > Today, while redirecting git diff's output to a text file, I noticed git diff > leaves a trailing whitespace between different deltas of the same file (the > line > that separates two different deltas). For example, committing a file with th

Trailing whitespace on git diff output.

2014-09-01 Thread Adria Farres
Hello, Today, while redirecting git diff's output to a text file, I noticed git diff leaves a trailing whitespace between different deltas of the same file (the line that separates two different deltas). For example, committing a file with the following content: --- test test --- then changing i

Dealing with conflicting tags - multiple remotes

2014-09-01 Thread Finucane, Stephen
Hi, Take a repo with multiple remotes. These remotes each have a specific branch/tag naming convention, and there are tags in each that conflict with those in other remotes. In order to avoid conflicts, it seems possible to add something like this to the '.git/config' file: [remote "origin

git stash -u deletes directories containing ignored files

2014-09-01 Thread Cyrille Truchot
Hey there, I'm sure you've already heard about this because this is referenced on the web, but I cannot find anything about it on GitHub in the open issues nor in the fixed ones. I'm working with Git for Windows, version 1.8.3. The .gitignorefile contains a line like this : 'mydirectory/*'. A

Re: git fsck exit code?

2014-09-01 Thread Øyvind A . Holm
On 31 August 2014 20:54, Øyvind A. Holm wrote: > On 29 August 2014 22:18, David Turner wrote: > > error in tree 9f50addba2b4e9e928d9c6a7056bdf71b36fba90: contains > > duplicate file entries > > I don't think git fsck should return !0 in this case. Yes, it's an > inconsistency in the repo, but it's