Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Simon Wistow
On Sun, Feb 06, 2011 at 03:19:21PM +0100, Marco Von Ballmoos said: > I would have said exactly the same thing before I learned git, but > you're missing out. It's worth learning, but it's hateful for making > itself seem so intimidating -- and for including so few safeguards or, > at the very le

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Nicholas Clark
On Sun, Feb 06, 2011 at 08:13:21PM +0100, Jarkko Hietaniemi wrote: > On Sun, Feb 6, 2011 at 8:11 PM, Aristotle Pagaltzis wrote: > > * Jarkko Hietaniemi [2011-02-06 11:15]: > >> You know, it's gobbledygook like the below that makes me stay > >> away from learning git. > > > > And using what instea

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Aristotle Pagaltzis
* Jarkko Hietaniemi [2011-02-06 11:15]: > You know, it's gobbledygook like the below that makes me stay > away from learning git. And using what instead?

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Jarkko Hietaniemi
On Sun, Feb 6, 2011 at 8:11 PM, Aristotle Pagaltzis wrote: > * Jarkko Hietaniemi [2011-02-06 11:15]: >> You know, it's gobbledygook like the below that makes me stay >> away from learning git. > > And using what instead? For the past years, mostly perforce. I must be too steeped in sin because

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Jarkko Hietaniemi
On Sun, Feb 6, 2011 at 7:54 PM, David Parsons wrote: On Feb 6, 2011, at 2:13 AM, Jarkko Hietaniemi wrote: You know, it's gobbledygook like the below that makes me stay away from learning git.   Well, you can just ignore it.   There is a pretty good SCCS in   there[*] if you peel away sever

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread David Parsons
On Feb 6, 2011, at 2:13 AM, Jarkko Hietaniemi wrote: You know, it's gobbledygook like the below that makes me stay away from learning git. Well, you can just ignore it. There is a pretty good SCCS in there[*] if you peel away several layers of self-indulgent chrome and features fo

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Aristotle Pagaltzis
* Marco Von Ballmoos [2011-02-06 15:25]: > It's nice to know that you never lose changes, but if you can't > find them or dig them out and apply them to your branch, > they're as good as gone to you anyway. Yeah. I think this needs to be advertised much more loudly than it is. One of my highest-v

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Nicholas Clark
On Sun, Feb 06, 2011 at 11:13:35AM +0100, Jarkko Hietaniemi wrote: > You know, it's gobbledygook like the below that makes me stay away > from learning git. It's somewhat like Perl, in that "there's more than one way to do it" and "make hard things possible". Unfortunately it missed the "make easy

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Marco Von Ballmoos
On Feb 6, 2011, at 11:13 AM, Jarkko Hietaniemi wrote: You know, it's gobbledygook like the below that makes me stay away from learning git. I would have said exactly the same thing before I learned git, but you're missing out. It's worth learning, but it's hateful for making itself seem so i

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Aristotle Pagaltzis
* Michael G Schwern [2011-02-06 06:45]: > Here is your git undo button. > > [alias] > undo = reset --hard HEAD^ Except for the `--hard`, which will throw away changes in the only place where git cannot recover them: the working copy. You probably want this instead: git stash git res

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Jarkko Hietaniemi
You know, it's gobbledygook like the below that makes me stay away from learning git. On Sun, Feb 6, 2011 at 11:10 AM, Aristotle Pagaltzis wrote: * Michael G Schwern [2011-02-06 06:45]: Here is your git undo button. [alias]     undo = reset --hard HEAD^ Except for the `--hard`, which will

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-06 Thread Michael G Schwern
On 2011.2.4 1:39 PM, Aaron J. Grier wrote: > is there a knob for me to always default git merge to --no-commit ? Software and systems which try to prevent errors are hateful. They come from the failed assumption that the user and system will realize they're going to make an error BEFORE they make