[14:38] zerkms: A branch is literally a 41-byte file
[14:38] I cannot
[14:38] that exists in .git/refs
[14:38] the project uses git
03[14:38] * tvw (~tv@e176010028.adsl.alicedsl.de) has joined #git
[14:38] zerkms: tell them to switch because you dont like it and cant understand it
03[14:38] * jn__ (~jn@80.199.116.190.static.peytz.dk) has joined #git
[14:38] That contains a SHA1 hash of a commit and a newline
02[14:38] * jn__ (~jn@80.199.116.190.static.peytz.dk) Quit (Client Quit)
[14:39] zerkms: how many branches are there in the remote repository?
[14:39] sitaram: I have «trivial» issue
03[14:39] * jnsl_ (~jn@80.199.116.190.static.peytz.dk) has joined #git
[14:39] test
[14:39] sitaram: and no one can help me :-S
[14:39] reuss: sec
03[14:39] * gusnan (~gusnan@h36n5c1o269.bredband.skanova.com) has joined #git
[14:40] git branch -a |wc -l
[14:40] 1655
[14:40] Hi guys when i make a pull on my testsite i get: «Your local changes to ‘settings.php’ would be overwritten by merge……» So i made a file called .gitignore and added settings.php to it, but i still get the same error when i try to pull
[14:40] 1655 branches? wow!
[14:40] it is a big project, moved from svn recently, yes
[14:40] probably `git log origin/F2060_STATSD –not master` could help you …
[14:41] reuss: ideally he wants «git log branch –not –all» except that –all includes branch also 
[14:41] sitaram: yes, i know 
02[14:41] * adnasa (~adnasa@user29.217-10-104.netatonce.net) Quit (Quit: adnasa)
[14:42] sitaram: sorry for being jerk, I just too angry of the fact that I cannot do that simple thing (and yes, I’m mercurial-guy, so when I solve such issues – I sometimes compare scms)
[14:42] zerkms: how many remotes is there in the repo? `git remote show` …
[14:42] just one
[14:42] oh, –not-master helped
[14:42] zerkms: you’re not being a jerk. Maybe I am. but the fact is you got used to a flawed model where the branch name is encoded *inside* the commits, which is *horrible*
[14:43] and you have no idea what branch the one you’re looking at is based off?
[14:43] actually I cannot even understand the phrase :-S (english is weird language)
[14:43] haha – well that doesn’t help much does it?
[14:43] zerkms: Having the originating branch name encoded in the commit doesn’t make sense — it pollutes the branch namespace, and forces people to think of a proper branch name that won’t clash with other developers choices when they start coding a new feature.
[14:44] anyway – git log origin/F2060_STATSD –not master — this returned me what I want
[14:44] and I’m again happy panda
[14:44] zerkms: alrighty then 
[14:44] thank you guys
[14:44] reuss++
03[14:44] * AleiPhoenix (~aleiphoen@221.133.228.74) has joined #git
[14:44] and probably I need to read something about git once again
06[14:45] * sitaram kept thinking of enumerating all the other branches instead of going for Pareto’s rule
[14:45] (but I will not love it as much as I love hg
03[14:45] * cher (~quassel@85.183.80.39) has joined #git
[14:45] zerkms: if you want to maintain that, do NOT learn git properly. If you understand git you will have no choice but to rescind that statement
[14:46] hehe
02[14:46] * JohnFlux_ (~johnflux@konversation/developer/JohnFlux) Quit (Ping timeout: 250 seconds)
[14:46] some things in git just confuses me, like branch deletion
03[14:50] * babilen (~babilen@unaffiliated/babilen) has joined #git
[14:51] sitaram: » but the fact is you got used to a flawed model where the branch name is encoded *inside* the commits, which is *horrible*» — no, we don’t
[14:51] Bug 38137: …. — we use bug-NNNN – prefixed comments
03[14:52] * kirean (~Erik@81-233-102-231-no38.tbcn.telia.com) has joined #git
[14:54] zerkms: no we don’t what? no we don’t hardcode the branch inside the commit chain? Hg’s answer to that mess was bookmarks
02[14:54] * tvw (~tv@e176010028.adsl.alicedsl.de) Quit (Read error: Connection reset by peer)
[14:55] ah, you mentioned about hg
[14:55] well, I like that obvious behaviour
[14:55] personally for me – it is how I expect the scm should behave
02[14:55] * julius_ (~julius@p3EE2BAAA.dip.t-dialin.net) Quit (Ping timeout: 260 seconds)
[14:55] zerkms: they themselves don’t — theyve been trying to do the sensible thing for a few revs now
03[14:55] * Hrrwr (~mth@87.226.75.123) has left #git
[14:56] zerkms: their first attempt was bookmarks
[14:56] then they made *all* the bookma
