[git-users] git diff when file has been renamed

2013-02-14 Thread Matt Neuburg
My files have all been renamed, so to diff one of them to an earlier commit I'm saying this sort of thing: git diff HEAD:newname cb3e0a5fa8:oldname I have to keep a list of the new names and old names beside me at all times. This seems nuts. Is there a better way? Clearly git can tell from

Re: [git-users] Work with two repositories

2013-02-14 Thread adam . tongu
Hi, I added the new repository and named it consultants. I am able to pull from that repository. Now I would like to know how to handle this with my local branches. I have a branch say mylocalbranch whose origin is named origin because it was the first one. For the moment I am always working

Re: [git-users] don't let you change branch with pending changes

2013-02-14 Thread John McKown
That is really nice! Thanks for the pointer. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, vi

Re: [git-users] don't let you change branch with pending changes

2013-02-14 Thread Øyvind A . Holm
On 14 February 2013 14:44, Fabrizio Cioni wrote: > I'll have to accept the logic and to be very careful on my (and other) git > behaviour, knowing when to be careful. > I've studied and tested git for personal use in the last months, now that > we're using in a group things get more interesting, a

Re: [git-users] don't let you change branch with pending changes

2013-02-14 Thread John McKown
My habit, when I am going to do something in a project is to: cd ~/project git branch # more commands just to remind me which branch is active immediately after I cd into the subdirectory. I have some subdirectories which are "duplicated" on multiple machines. The contents of each machine is in i

Re: [git-users] don't let you change branch with pending changes

2013-02-14 Thread Dale R. Worley
> From: Fabrizio Cioni > > I don't understand why the existing logic allows it, but i clearly see how > a distracted/in a rush/sleepless developer can make a mess of it; still > recoverable but very time-consuming when you find it x days later. There is the converse problem of making a bunch o

[git-users] Re: don't let you change branch with pending changes

2013-02-14 Thread Fabrizio Cioni
Thanks for your answer and for the link, i'll have a look but i fear i'm still too much newbie to manipulate custom scripts; i'll keep it away for a rainy day. Meanwhile i'll have to accept the logic in which git flows, even if it sounds illogical to me. On Thursday, February 14, 2013 1:44:24 P

Re: [git-users] don't let you change branch with pending changes

2013-02-14 Thread Fabrizio Cioni
Thanks Konstantin, both for this answer and the linked one. I'll have to accept the logic and to be very careful on my (and other) git behaviour, knowing when to be careful. I've studied and tested git for personal use in the last months, now that we're using in a group things get more interestin

[git-users] Re: don't let you change branch with pending changes

2013-02-14 Thread Fabrizio Cioni
Thanks for your answer and for the link, i'll have a look but i fear i'm still too much newbie to manipulate custom scripts; i'll keep it away for a rainy day. Meanwhile i'll have to accept the logic in which git flows, even if it sounds illogical to me. On Thursday, February 14, 2013 1:44:24 P

Re: [git-users] don't let you change branch with pending changes

2013-02-14 Thread Konstantin Khomoutov
On Thu, 14 Feb 2013 01:02:29 -0800 (PST) Fabrizio Cioni wrote: > Example: > 1) I'm working on branch "newfeatures" and i've edited some files > 2) the customer call and warn me of a bug requiring a quick fix > 3) i switch from "newfeatures" to "master" and i create a branch > "fix_2000" from mast

[git-users] Re: don't let you change branch with pending changes

2013-02-14 Thread Thomas Ferris Nicolaisen
On Thursday, February 14, 2013 10:02:29 AM UTC+1, Fabrizio Cioni wrote: > Example: > 1) I'm working on branch "newfeatures" and i've edited some files > 2) the customer call and warn me of a bug requiring a quick fix > 3) i switch from "newfeatures" to "master" and i create a branch > "fix_2000"

[git-users] Re: git svn init throws Not a git repository (or any of the parent directories): .git

2013-02-14 Thread Thomas Ferris Nicolaisen
On Wednesday, February 13, 2013 10:46:59 PM UTC+1, Ace McCloud wrote: > Hi all, > > I have problem with git svn init: > When I executegit svn init svn+ssh://username[at]example.com/path/repo > I see:fatal: Not a git repository (or any of the parent directories): .git > Already at toplevel, but .gi

[git-users] don't let you change branch with pending changes

2013-02-14 Thread Fabrizio Cioni
Example: 1) I'm working on branch "newfeatures" and i've edited some files 2) the customer call and warn me of a bug requiring a quick fix 3) i switch from "newfeatures" to "master" and i create a branch "fix_2000" from master; while doing this i forget to commit on "newfeatures", what i'm workin