On Fri, Jan 3, 2014 at 3:31 AM, Dawid Weiss <[email protected]> wrote: >> ^^^^^^^ see that shit? it says the words 'working directory clean' but it >> lies. > > No, it doesn't lie. You are holding it wrong. > > If a merge can proceed without conflicts, it will commit > automatically, so your working copy *is* clean. If you don't want to > perform this final commit automatically add --no-commit. >
My working directory _IS NOT_ clean if 'git push' would do something. Seriously, telling me i'm holding it wrong isn't addressing my concerns. I hate git for many technical reasons: * crappy software license * terrible command line interface * bad documentation * horrible IDE integration * lack of revision numbers * bugs in git status * origin/master vs origin master * many ways to fuck yourself with a one character typo But I'm trying to be reasonable, ill give up all of those things because its more popular. However, basic versioning must work. Telling me i'm "doing it wrong" is simply unacceptable bullshit. Its typical of git users to do this, even in the case of actual data loss bugs in git: http://benno.id.au/blog/2011/10/01/git-recursive-merge-broken This shows me git is useless for real software, and only usable for toy ruby projects and other garbage. I'm -1 for these technical reasons (until my concerns are truly addresed). --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
