Setting per-repository configuration for git

2013-10-25 Thread Jeremy Rosen
Hello everybody I am looking into the git configuration mechanism and there seem to be a hole in use cases I'm trying to figure out... git configurations can be saved at various places * /etc/gitconfig : system-wide configuration * ~/.gitconfig : user-wide configuration * .git/config :

Re: RFE: support change-id generation natively

2013-10-21 Thread Jeremy Rosen
for those of us that are not using gerrit... what is a change-id (semantically, I got from your mail that it is some sort of unit id set at commit time) and in what way is it different from the commit-id ? Cordialement Jérémy Rosen +33 (0)1 42 68 28 04 fight key loggers : write some perl

Re: [PATCH v8 2/2] status: always show tracking branch even no change

2013-08-26 Thread Jeremy Rosen
But this will not work if there is no change between the current branch and its upstream. Always report upstream tracking info even if there is no difference, so that git status is consistent for checking tracking info for current branch. E.g. $ git status # On branch feature1

Re: first parent, commit graph layout, and pull merge direction

2013-05-23 Thread Jeremy Rosen
- Mail original - On Thu, May 23, 2013 at 5:06 AM, Andreas Krey a.k...@gmx.de wrote: [snip] ... Don't do that, then. :-) Problem is, in this case 'I' expands to about 17 people I need to educate on this. This is a feature of `git pull` that I really despise. I really

Re: Subtree: My Status

2013-04-22 Thread Jeremy Rosen
- Mail original - Hi folks, I apologize for being off the grid for a while. We had a baby and unexpectedly ended up in the NICU. We just got him home a week ago. Everyone is doing fine but I had to pretty much drop all non-essential work for a month or so. Good to here that

Re: [PATCH v2 1/8] Add new git-cc-cmd helper to contrib

2013-04-22 Thread Jeremy Rosen
Would it make sense to integrate this in git shortlog, which already does something similar? Conceptually, yes, but the end result will be much larger in scope. I am not sure if shortlog is still a good label for it. since we are throwing ideas around... The first place where I

Re: [PATCH 2/6] show: obey --textconv for blobs

2013-04-22 Thread Jeremy Rosen
git show --textconv HEAD~4:binary-gob | less but I doubt it is a good idea to turn it on by default this late in the game. Exactly. I certainly do not mind it as an option, and I am on the fence regarding it as a default (I think it might have been a sane thing to do from the

git rebase : knowing where I am...

2013-04-10 Thread Jeremy Rosen
Hello is there some way to know how far you are within a rebase when the rebase is interupted by a conflict other than the message given by git rebase when it was interrupted ? I would have expected a git rebase --status or something similar... Regards Jérémy Rosen fight key loggers

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-09 Thread Jeremy Rosen
looking a little bit more into this, I was very suprised there seems to be little/no tools in the git ecosystem that studies the dependencies between commits based on the file they modified and/or the conflict they would cause. Is there any pre-existing tool to do that ? It can be done

Re: Teaching rerere about existing merges

2013-04-09 Thread Jeremy Rosen
thanks a lot, that solves my problem. I'm a bit suprised that it's not part of the git-rerere command but that's good enough for me... Cordialement Jérémy Rosen fight key loggers : write some perl using vim - Mail original - Jeremy Rosen jeremy.ro...@openwide.fr writes

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-08 Thread Jeremy Rosen
so, I started using it this WE for my big rebase I had aproximately 130 non-merge commits in my branch, a feature branch in which I had regularly merged master, but I needed to rebase everything and then reorganise most commits to make the whole thing reviewable * merge bug-fix with the

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-04 Thread Jeremy Rosen
very usefull indeed, where can I find it ? I have a big rebase/merge/reorganise work that is comming soon and that is going to be tremendously usefull... Cordialement Jérémy Rosen fight key loggers : write some perl using vim - Mail original - Hi, I made this script to

Re: git subtree oddity

2013-03-28 Thread Jeremy Rosen
I am starting to regret that I caved in and started carrying a copy of it in contrib/. It probably is a good idea to drop it from my tree and let it mature and eventually flourish outside. that's a shame... it solves a real problem, is simple to use, and really powerfull. but

Re: Questions/investigations on git-subtree and tags

2013-03-12 Thread Jeremy Rosen
Paul, I'm not quite sure where I should go from here... should I send you a patch so you make it a V3 of your patch ? should I send a patch superseeding yours ? I have also found a similar problem in git-subtree pull, which needs the same fix. in the mean time, attached is the current

Re: Questions/investigations on git-subtree and tags

2013-03-08 Thread Jeremy Rosen
ok, attached is a patch on top of your patch that solves my particular problem I am not formally submitting it since its on top of your part and i'd really like your input before submitting. It solves my problem and afaict does what your fix did and what git-subtree originally intended to do...

Re: Questions/investigations on git-subtree and tags

2013-03-08 Thread Jeremy Rosen
- Mail original - Jeremy Rosen jeremy.ro...@openwide.fr writes: 506,513c506,507 case $2 in *\**) # Avoid pulling in multiple branches die '$2' contains a wildcard ;; *:*) # Don't create a local branch

Questions/investigations on git-subtree and tags

2013-03-07 Thread Jeremy Rosen
Hello everybody I am trying to use git-subtree to follow a subproject but I have a couple of problems and I am not sure if I am doing something wrong Basically I am trying to use a tag on the subproject as my base for the subproject but subtree doesn't seem to handle that properly my first

Re: Questions/investigations on git-subtree and tags

2013-03-07 Thread Jeremy Rosen
Hi Jérémy, Git subtree ignores tags from the remote repo. is that a design decision or a case of not implemented yet To follow a project in a subdirectory I would use git-subtree add selecting a branch, not a tag, from the other repo. Then use git-subtree pull to keep yourself

Re: Questions/investigations on git-subtree and tags

2013-03-07 Thread Jeremy Rosen
Ok, I can understand that you don't want to import tags for namespace reason, but in that case shouldn't git subtree add refuse to create a subtree when the tag isn't a commit It shouldn't and tries not to, but is limited in it's ability to identify if a refspec points to a commit or

Re: Questions/investigations on git-subtree and tags

2013-03-07 Thread Jeremy Rosen
I think I tried adding the ^{} syntax, but I don't think it works on remote repos. Or I couldn't get the right syntax. indeed, it doesn't work on fetch, but it could be used somewhere between the fetch and the commit-tree to move from the ref to the associated commit Latest patch: