Re: [git-users] An equivalent of `--full-history` to git bisect

2016-07-29 Thread Oleg Taranenko
Hi Ram, good I found this post. Ironically at the same time you written it I struggled with my heavy enterprise git repo (~200k objects) and at that point git was to me really "goddamn idiotic trackload"... Instead looking over the reachable commits, say between May 1 and May 15 git bisect brin

[git-users] Re: Marking a branch "closed"?

2016-07-29 Thread Matěj Cepl
On 2016-07-20, 06:02 GMT, Charles Manning wrote: For example let's say you are using some fault tracking database (eg. trac). It often makes sense to do the fix on a topic branch (eg. fix-trac-1234). If you leave the branch in place after merging it you can then refer to the branch in the t

Re: [git-users] How to remove remote branch completely

2016-07-29 Thread 'Konstantin Khomoutov' via Git for human beings
On Thu, 28 Jul 2016 09:37:00 -0700 (PDT) Valencia wrote: > I have 2 branches in my repo. I am done with most of the code > changes. Therefore, I want keep just one branch on my repo. How do I > completely remove a remote branch. > > I read online that we can use "git branch -d , to delete > bra

[git-users] Re: How to remove remote branch completely

2016-07-29 Thread Valencia
Thanks Konstantin! Yes, I agree reading helps indeed. I did read about it, parallel, posting the query here on this forum, due to time constraints. Your explanation surely gave me more insight and was really helpful. -- You received this message because you are subscribed to the Google Groups

[git-users] git merge -- resolving conflicts?

2016-07-29 Thread Michael
After doing a "git merge", I wind up with a few conflicts. My files have the three states. I am finding that I almost always want the third state (between === and >>>) to resolve these conflicts. How can I tell merge, AFTER seeing the conflicts, and looking at them, to use the third option for

Re: [git-users] git merge -- resolving conflicts?

2016-07-29 Thread Konstantin Khomoutov
On Fri, 29 Jul 2016 09:10:06 -0700 Michael wrote: > After doing a "git merge", I wind up with a few conflicts. > > My files have the three states. > > I am finding that I almost always want the third state (between === > and >>>) to resolve these conflicts. > > How can I tell merge, AFTER seei

Re: [git-users] Re: Marking a branch "closed"?

2016-07-29 Thread Michael
On 2016-07-20, at 9:22 AM, Matěj Cepl wrote: > but I think the right question to ask is what you expect to do with those > leftovers hanging around? ... or leave them around as notes for latter > development (just left them hanging in the repo; branches and commits are > cheap in git)? For me

[git-users] lost file with git add - git rm -f

2016-07-29 Thread GUGLHUPF
Hi, fairly new to git. Today I did a "git add somefile" and then decided I wanted to unstage it. I did then a "git rm -f somefile". There was no git command in between. Particularly no commit. git wiped the file from disk. I worked very hard on that file (several days( and I really hope this ca

[git-users] Re: lost file with git add - git rm -f

2016-07-29 Thread GUGLHUPF
On Friday, July 29, 2016 at 4:09:36 PM UTC-7, GUGLHUPF wrote: > > Hi, > fairly new to git. Today I did a "git add somefile" and then decided I > wanted to unstage it. I did then a "git rm -f somefile". There was no git > command in between. Particularly no commit. > > git wiped the file from di

[git-users] Re: lost file with git add - git rm -f

2016-07-29 Thread GUGLHUPF
and for completeness the shell output: ✗ git add modifTDMFile ✗ git status On branch createPriceSheet Changes to be committed: (use "git reset HEAD ..." to unstage) new file: modifTDMFile Changes not staged for commit: *and then* ✗ git add twoWordCountries ✗ git status On branch