On 2012-03-16 09:08, Jonathan M Davis wrote:
On Friday, March 16, 2012 08:52:47 Jacob Carlborg wrote:
On 2012-03-16 04:52, James Miller wrote:
Also, git-svn isn't actually that bad...
It is. You can't properly use git because you have to make sure it's
compatible with svn, like linear history
On Friday, March 16, 2012 08:52:47 Jacob Carlborg wrote:
> On 2012-03-16 04:52, James Miller wrote:
> > Also, git-svn isn't actually that bad...
>
> It is. You can't properly use git because you have to make sure it's
> compatible with svn, like linear history. If you don't have a linear
> history
On 2012-03-16 04:52, James Miller wrote:
Also, git-svn isn't actually that bad...
It is. You can't properly use git because you have to make sure it's
compatible with svn, like linear history. If you don't have a linear
history you're in big trouble.
--
/Jacob Carlborg
On 16 March 2012 17:09, H. S. Teoh wrote:
>> Generally I find that pulls should be rebased, ff-only, and local
>> merges done with --no-ff. This means that you have merge history in
>> the tree, which can be useful when trying to do code archaeology, and
>> pulls are forced to be merged properly,
On Fri, Mar 16, 2012 at 04:52:35PM +1300, James Miller wrote:
[...]
> Generally I find that pulls should be rebased, ff-only, and local
> merges done with --no-ff. This means that you have merge history in
> the tree, which can be useful when trying to do code archaeology, and
> pulls are forced to
On 16 March 2012 16:35, H. S. Teoh wrote:
> [...]
>> I used to have this problem all the time - now I have a script which
>> checks out master and pulls with -ff-only (in all three repositories)
>> giving me a nice big error if I accidentally committed to master.
>> Although I think I just lost it
On Fri, Mar 16, 2012 at 01:43:52PM +1100, Daniel Murphy wrote:
> "H. S. Teoh" wrote in message
> news:mailman.719.1331847338.4860.digitalmars-d-le...@puremagic.com...
>
> > Actually, I discovered that my origin/master branch was also broken
> > (probably due to running the wrong git command in i
"H. S. Teoh" wrote in message
news:mailman.719.1331847338.4860.digitalmars-d-le...@puremagic.com...
> Actually, I discovered that my origin/master branch was also broken
> (probably due to running the wrong git command in it in the past),
> because it had a bunch of commits from upstream that fo
On Thu, Mar 15, 2012 at 11:12:26PM +0100, Alex Rønne Petersen wrote:
> On 15-03-2012 22:37, H. S. Teoh wrote:
[...]
> >I did discover an interesting thing about git though... at one point
> >in the cleanup process I accidentally reset 1 more commit than I had
> >intended, and that commit had no oth
On 15-03-2012 22:37, H. S. Teoh wrote:
On Thu, Mar 15, 2012 at 09:51:30PM +0100, Alex Rønne Petersen wrote:
On 15-03-2012 21:49, H. S. Teoh wrote:
[...]
Another question. How to I repair my current history, which is all
messed up now? That is, my branch has a whole bunch of commits I didn't
ma
On Thu, Mar 15, 2012 at 09:51:30PM +0100, Alex Rønne Petersen wrote:
> On 15-03-2012 21:49, H. S. Teoh wrote:
[...]
> >Another question. How to I repair my current history, which is all
> >messed up now? That is, my branch has a whole bunch of commits I didn't
> >make; how do I clean it up? Or is i
On 15-03-2012 22:17, Sean Cavanaugh wrote:
On 3/15/2012 3:56 PM, Alex Rønne Petersen wrote:
On 15-03-2012 21:53, Gour wrote:
On Thu, 15 Mar 2012 13:49:14 -0700
"H. S. Teoh" wrote:
Another question. How to I repair my current history, which is all
messed up now?
By not using DVCS which allow
On Thursday, March 15, 2012 16:17:50 Sean Cavanaugh wrote:
> On 3/15/2012 3:56 PM, Alex Rønne Petersen wrote:
> > On 15-03-2012 21:53, Gour wrote:
> >> On Thu, 15 Mar 2012 13:49:14 -0700
> >>
> >> "H. S. Teoh" wrote:
> >>> Another question. How to I repair my current history, which is all
> >>> me
On 3/15/2012 3:56 PM, Alex Rønne Petersen wrote:
On 15-03-2012 21:53, Gour wrote:
On Thu, 15 Mar 2012 13:49:14 -0700
"H. S. Teoh" wrote:
Another question. How to I repair my current history, which is all
messed up now?
By not using DVCS which allows you to rewrite history (hint: check
Fossil
On 15-03-2012 21:53, Gour wrote:
On Thu, 15 Mar 2012 13:49:14 -0700
"H. S. Teoh" wrote:
Another question. How to I repair my current history, which is all
messed up now?
By not using DVCS which allows you to rewrite history (hint: check
Fossil). ;)
It's perfectly useful in DVCS. Without it
On Thu, 15 Mar 2012 13:49:14 -0700
"H. S. Teoh" wrote:
> Another question. How to I repair my current history, which is all
> messed up now?
By not using DVCS which allows you to rewrite history (hint: check
Fossil). ;)
Otoh, I do not know how much you are 'in love' wiht git, but maybe it
woul
On 15-03-2012 21:49, H. S. Teoh wrote:
On Thu, Mar 15, 2012 at 08:59:57PM +0100, Alex Rønne Petersen wrote:
On 15-03-2012 20:13, H. S. Teoh wrote:
I'm trying to submit a pull request for druntime, but I'm running into a
git problem. This is what I did:
- (I forgot that my master branch is out
On Thu, Mar 15, 2012 at 08:59:57PM +0100, Alex Rønne Petersen wrote:
> On 15-03-2012 20:13, H. S. Teoh wrote:
> >I'm trying to submit a pull request for druntime, but I'm running into a
> >git problem. This is what I did:
> >
> >- (I forgot that my master branch is out of date)
> >- created a new b
On 15-03-2012 20:13, H. S. Teoh wrote:
I'm trying to submit a pull request for druntime, but I'm running into a
git problem. This is what I did:
- (I forgot that my master branch is out of date)
- created a new branch for the fix and committed some changes
- switched to master and ran 'git pull'
19 matches
Mail list logo
