[git-users] Hook that fires on git reset

2016-03-04 Thread Mike Lewis
Is there any hook that fires when a git reset command is issued? The natural assumption would be the post-rewrite hook, since part of the history is being rewritten, but it does not, both according to the official documentation and some experiments that I've run. The hook doesn't necessarily

[git-users] warning in tree ad82bbbe50a28ff5e712c1a18986908168afbf10: contains '.git'

2016-03-04 Thread Matěj Cepl
Hi, I have clone Mercurial repository from https://bitbucket.org/fbennett/citeproc-js using git 1.8.3.1 and git-remote-hg from https://github.com/felipec/git-remote-hg. When I did I run $ git fsck on the result and got this: $ git fsck Checking object directories: 100%

Re: [git-users] Git says there are local changes, but there are no changes. (Windows)

2016-03-04 Thread Ben Page
The repos that exhibit this behavior are Visual Studio projects and the problem files are text files. I don't think the problem is line endings. git diff returns nothing and the projects have * text=auto in the .gitattributes file and core.autocrlf set to true. I believe the problem is caused

Re: [git-users] remote and remote-tracking branches

2016-03-04 Thread dmgf
On Friday, March 4, 2016 at 12:29:58 PM UTC+1, Konstantin Khomoutov wrote: > > > It depends. If you really want to wipe out any mentions of that branch, > the third command is necessary too: the way remote-tracking branches > work is somewhat asymmetrical to normal branches in that if a

Re: [git-users] remote and remote-tracking branches

2016-03-04 Thread Konstantin Khomoutov
On Fri, 4 Mar 2016 03:13:52 -0800 (PST) dmgf wrote: > Are they different objects? > In the Git user manual > it is > written that "your local repository keeps branches which track each > of those remote

[git-users] remote and remote-tracking branches

2016-03-04 Thread dmgf
Are they different objects? In the Git user manual it is written that "your local repository keeps branches which track each of those remote branches, called remote-tracking branches, which you can view using the -r option to