IRCloggy #git 2014-04-09

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2014-04-09
	← beyondcreed left	00:00
	→ john2x joined	00:00
mcantor	jrnieder: the format string stuff is REALLY confusing...	00:01
	← jcw4 left	00:01
	→ zivester joined	00:01
	← MattMaker left	00:01
	← BadProphet left	00:01
	→ jcw4 joined	00:02
	← starkhalo left	00:03
	→ madewokherd joined	00:03
	← rainmanjam left	00:03
	← harish left	00:03
	← ascarter left	00:04
	← john2x left	00:04
	← _rgn left	00:05
	← vpl left	00:05
	→ john2x joined	00:05
	→ Favoretti joined	00:05
	→ BadProph_ joined	00:06
	→ Orbitrix joined	00:06
	← Orbitrix left	00:06
	← VinceZa left	00:06
	→ Orbitrix joined	00:06
	← veebers left	00:07
	← SocalNick left	00:07
	← infynyxx left	00:07
mcantor	jrnieder: I'm confused. Isn't "4-byte" the same as "32-bit"?	00:07
	→ _rgn joined	00:07
mcantor	But the format file says it has a 4-byte version number and then a 32-bit count of indexed entries.	00:07
	→ vpl joined	00:07
	→ crankyadmin joined	00:08
jrnieder	char[4] vs int?	00:08
	who knows what goes through the minds of technical writers	00:08
	→ alexbodn joined	00:08
	← blackmesa left	00:09
	← becks__ left	00:09
	← mcantor left	00:10
	← The-Mad-Pirate-2 left	00:10
	→ The-Mad-Pirate joined	00:10
	→ Neozonz\|Disc joined	00:11
phy1729	_technically_ bytes don't _have_ to be 8 bits which is why all ehternet and internet stuff uses octet instead	00:11
	← Guest___ left	00:12
	→ tokik joined	00:12
	← lithiumjake left	00:13
	→ lithiumjake joined	00:13
	→ AccessibleWeb joined	00:13
	→ veebers joined	00:14
	← shortest_path left	00:15
	→ kotopies joined	00:15
	← Orbitrix left	00:16
	← ifdm_ left	00:16
	→ BaNzoune1 joined	00:17
	← AccessibleWeb left	00:18
	→ lithiumjake_ joined	00:18
	← lithiumjake left	00:18
	← zorbash left	00:19
	← BaNzoune1 left	00:19
	→ MattMaker joined	00:20
	← MattMake_ left	00:21
	← Nicholas_Rishel left	00:24
	← lolmaus left	00:24
	→ Orbitrix joined	00:25
	← Orbitrix left	00:25
	→ Orbitrix joined	00:25
	← przemkovv left	00:26
	→ robarell_ joined	00:26
	→ MattMake_ joined	00:27
	← MattMaker left	00:27
	→ przemkovv joined	00:28
	→ johnkevinmbasco joined	00:28
	→ MattMaker joined	00:29
	← johnkevinmbasco left	00:29
	← wes8 left	00:29
	→ johnkevinmbasco joined	00:29
	← holomorph left	00:30
	← edwardly left	00:30
	← robarell_ left	00:30
	← chiromante left	00:30
	→ Cassiel joined	00:30
	← Neozonz\|Disc left	00:31
	← b4rbz left	00:31
	← bburky left	00:31
	← MattMake_ left	00:31
	← hahuang65 left	00:31
	← rotta left	00:32
	→ edwardly joined	00:32
	→ ascarter joined	00:34
Eugene	If you ever find a byte that isn't 8 bits, its time to consult a psychiatrist.	00:35
	But also, make no assumptions.	00:35
	← Chaser left	00:36
	← MattMaker left	00:36
	→ Chaser joined	00:37
	← dreiss left	00:37
	→ MattMaker joined	00:37
	← betelgeu1e left	00:39
	← hyperair left	00:39
	→ Neozonz\|Disc joined	00:41
	← tacotime left	00:41
	← Nizumzen left	00:42
	→ MattMake_ joined	00:42
	← MattMaker left	00:42
	← iron_houzi left	00:42
	← johnkevinmbasco left	00:43
	← BadProph_ left	00:43
	→ chiromante joined	00:43
	→ variable joined	00:43
	→ boombatower joined	00:44
	← guyz left	00:46
	← Skrypter left	00:46
	← zajn left	00:47
	← Foxhoundz left	00:48
	→ iron_houzi joined	00:48
	← gdogg left	00:49
	← el3ctron left	00:49
	→ Skrypter joined	00:50
	← lithiumjake_ left	00:50
	→ BadProphet joined	00:51
	→ lithiumjake joined	00:51
	← alexbodn left	00:51
	← MattMake_ left	00:51
	← _iron left	00:52
	→ stellarhopper joined	00:52
	→ MattMaker joined	00:53
	← WaReZ left	00:53
	→ jameswlane joined	00:53
	→ b1lly1 joined	00:53
	← jameswlane left	00:54
	→ jameswlane joined	00:54
	← Neozonz\|Disc left	00:55
	← kotopies left	00:56
	← chiromante left	00:57
	→ pbrobst joined	00:57
	→ viscera joined	00:58
	← ni__ left	00:59
	→ Neozonz\|Disc joined	00:59
	→ Sabbath joined	01:00
	→ hooper joined	01:00
	→ Sample joined	01:01
	→ SidWu_ joined	01:01
	← SidWu_ left	01:01
	→ sohail joined	01:02
	→ wrouesnel joined	01:03
	← CKyle left	01:05
	→ alexbodn joined	01:06
	← Neozonz\|Disc left	01:07
	← veebers left	01:07
	→ SamB_ joined	01:07
	→ Neozonz\|Disc joined	01:07
	→ jakobhans joined	01:07
	→ veebers joined	01:08
	→ Vampire0_ joined	01:09
	← SamB left	01:10
	→ Mrono joined	01:10
Mrono	I'm finally done	01:10
	My company is now completely on git instead of svn	01:10
	← jcvfen left	01:12
	← Vampire0 left	01:12
	← joki left	01:12
	← chipotle_ left	01:13
ashooby	Mrono: the fun is only beginning	01:14
	→ weiyang joined	01:14
	→ AccessibleWeb joined	01:14
	← koda left	01:15
	← ascarter left	01:15
	← xunil left	01:15
	← b1lly1 left	01:16
	← momomomomo left	01:17
	← MattMaker left	01:17
	→ MattMaker joined	01:17
	→ Dougie187 joined	01:18
	→ revyd joined	01:18
	← Deseaus left	01:18
	← revyd left	01:18
	← Sample left	01:18
	→ thiago joined	01:19
	← AccessibleWeb left	01:19
	→ Goplat joined	01:19
	→ Dougie2187 joined	01:21
	← jameswlane left	01:21
	→ heedly joined	01:22
	→ Klumben joined	01:22
heedly	I just did a git add -p, and lost most of my changes when I do a diff..	01:22
	maybe I messed something up, how do I get them back?	01:22
	← alexlindenlevy left	01:23
Mrono	ashooby: I've been using git for 8 months with subgit in the back	01:24
	← gtmanfred left	01:24
	→ zacts joined	01:25
Mrono	ashooby: and I took the chance before anyone cloned it to clean some binaries out of the history, dropped it from 1.3Gb to 525Mb	01:25
zacts	I've just discovered tig, it's neat	01:25
	← MattMaker left	01:25
	← Skrypter left	01:25
zacts	especially since I <3 the cli	01:25
	→ ignas joined	01:25
	→ gtmanfred joined	01:26
	← Celm left	01:26
	→ buzzybron joined	01:26
	← tyreld left	01:26
	→ robarell_ joined	01:26
	→ ifdm_ joined	01:27
	→ MattMaker joined	01:27
	← alexbodn left	01:27
ashooby	Mrono: hopefully your co-workers will transition into git gracefully	01:27
	← robarell_ left	01:28
	← griotspeak left	01:28
ashooby	my project recently moved to git and at the beginning people were constantly messing everything up	01:28
	→ DolphinDream joined	01:28
	← crankyadmin left	01:29
	→ digifiv5e joined	01:30
	← tvw left	01:30
	digifiv5e → Guest37155	01:30
	SamB_ → SamB	01:31
	→ watabou joined	01:31
	← _ikke_ left	01:31
	→ b1lly1 joined	01:31
	← jefflyne left	01:33
	← kballou left	01:33
Mrono	ashooby: thankfully it's just me and another guy right now	01:33
	ashooby: and we're using the git flow layout with master/develop protected (gitlab)	01:34
	minimal possibility for anything major	01:34
	→ CKyle joined	01:34
	→ _ikke_ joined	01:34
	→ astrozyk joined	01:35
	→ rfoust_ joined	01:36
	← SamB left	01:36
	← Neozonz\|Disc left	01:36
	→ SamB joined	01:36
ashooby	I still stand by what I said earlier :P	01:36
	→ crankyadmin joined	01:36
Mrono	haha	01:37
	yeah	01:37
	← rfoust left	01:37
Mrono	I keep a pretty close eye on things since i'm the one who first said 'lets use git' and did everything from beginning to end	01:38
	← Mocramis left	01:38
Mrono	wrote my own node js deployment server to rsync the files out to production	01:38
	→ Mocramis joined	01:38
	→ fairuz joined	01:39
	← warbaque left	01:39
	→ ascarter joined	01:40
	→ sgen joined	01:40
	→ jdahm joined	01:40
	← heedly left	01:41
	← teran left	01:41
	rfoust_ → rfoust	01:42
	← howitdo left	01:42
	← pheaver left	01:42
	→ alexbodn joined	01:43
milki	cant the clone empty repo warning be disabled?	01:43
	→ Garheade joined	01:43
	→ Skrypter joined	01:43
	→ tmcmahon joined	01:43
	→ howitdo joined	01:44
	← b1lly1 left	01:44
	→ hyperair joined	01:46
	← BiggFREE left	01:47
	→ joki joined	01:47
	→ MattMake_ joined	01:47
	← LucasKA left	01:48
	← MattMaker left	01:50
	→ dreiss joined	01:52
	← recycle left	01:52
	→ recycle joined	01:53
	→ ErKa joined	01:53
	← dsdeiz left	01:53
	→ MattMaker joined	01:53
	→ Ravensdale joined	01:54
	→ zumba_addict joined	01:54
	← MattMake_ left	01:55
	→ kalypso joined	01:55
	→ harish joined	01:56
	→ alexlindenlevy joined	01:56
	← zacts left	01:58
	→ Celm joined	01:58
	← Ravensdale left	01:58
	→ daito joined	01:59
	→ pantsman joined	02:00
	← jxpx777 left	02:02
	→ jxpx777 joined	02:02
	← MattMaker left	02:03
	← bwreilly left	02:03
	→ b1lly1 joined	02:03
	← jxpx777 left	02:03
	→ jxpx777_ joined	02:03
	← sohail left	02:03
	← dreiss left	02:03
	← Goles left	02:04
	→ Neozonz joined	02:04
	← tmcmahon left	02:05
	→ pwnz0r joined	02:05
	→ MattMaker joined	02:06
	← bodom left	02:06
	→ el3ctron joined	02:07
	← dik_dak left	02:08
	← macrover left	02:08
	→ setuid joined	02:08
	← ErKa left	02:10
	← MattMaker left	02:11
	→ MattMaker joined	02:12
	← ascarter left	02:14
	→ LucasKA joined	02:15
	→ AccessibleWeb joined	02:15
	→ ezekiel\|work joined	02:15
	→ jonjon1123 joined	02:17
	← pantsman left	02:17
	← jxpx777_ left	02:17
	← jonjon1123 left	02:18
	→ jonjon1123 joined	02:19
	← jaimef left	02:19
	← b1lly1 left	02:19
	← AccessibleWeb left	02:19
	← LucasKA left	02:19
	→ jaimef joined	02:20
	→ zajn joined	02:20
	← uso left	02:21
	→ john2x_ joined	02:21
	→ MattMake_ joined	02:21
	← zajn left	02:21
	→ dsdeiz joined	02:21
	← MattMaker left	02:23
	← asakura0 left	02:23
	← john2x left	02:24
	← jonjon1123 left	02:24
	→ asakura0 joined	02:25
	→ phuh joined	02:27
	← phuh left	02:27
	→ nayak94 joined	02:27
	→ PCChris joined	02:29
	→ robarell_ joined	02:29
	← MattMake_ left	02:29
	← PCChris left	02:30
	Guest49150 → Guest35796	02:30
	→ mizu_no_oto joined	02:31
	→ PCChris joined	02:31
	← godgodgodgo left	02:31
	← PCChris left	02:32
	→ mieko joined	02:32
	← hellopat left	02:33
	→ PCChris joined	02:33
	← PCChris left	02:33
	← robarell_ left	02:34
	→ PCChris joined	02:35
	→ quazimodo joined	02:35
	← Guest35796 left	02:35
	← PCChris left	02:35
	← hyperair left	02:36
	→ PCChris joined	02:36
	→ hyperair joined	02:36
	→ xjiujiu joined	02:36
	→ MattMaker joined	02:37
	← PCChris left	02:37
	← mizu_no_oto left	02:37
	→ PCChris joined	02:37
	← nb_bez_ left	02:37
	Garheade → Garheade\|AFK	02:38
	← PCChris left	02:38
	→ jenrzzz joined	02:38
	→ PCChris joined	02:38
	← Neozonz left	02:38
	→ becks__ joined	02:38
	← PCChris left	02:39
	← makubi left	02:39
	→ PCChris joined	02:39
	← pbrobst left	02:39
	← PCChris left	02:40
	← Forkk left	02:41
	← MattMaker left	02:41
	← sgen left	02:41
	→ Guest_ joined	02:41
	← wrouesnel left	02:42
	→ PCChris joined	02:42
	← Celm left	02:42
	→ snuffeluffegus joined	02:42
	→ Forkk joined	02:42
	← PCChris left	02:42
	→ MattMaker joined	02:42
	→ Celm joined	02:43
	→ PCChris joined	02:44
	→ talios joined	02:44
	← becks__ left	02:44
	→ makubi joined	02:44
	← PCChris left	02:44
	→ diegoviola joined	02:45
	→ becks__ joined	02:45
	← Celm left	02:45
	→ LucasKA joined	02:45
	← vijay13 left	02:46
	← maestrojed left	02:48
	← cgar left	02:49
	← Skrypter left	02:49
	← BadProphet left	02:49
	← Evanlec left	02:49
	← becks__ left	02:49
	← LucasKA left	02:50
	→ Evanlec joined	02:50
	← obert left	02:51
	← alexlindenlevy left	02:51
	→ zz_ag4ve joined	02:52
	→ rchavik joined	02:53
	→ hellopat joined	02:53
	← nayak94 left	02:54
	→ nayak94 joined	02:54
	→ lindenle joined	02:54
	→ fatalhalt joined	02:55
	← ignas left	02:55
	← alvaro_o left	02:55
	← koell left	02:58
	← hellopat left	02:58
	→ Seven_Six_Two joined	02:59
	← dmnd left	03:00
	→ starkhalo joined	03:01
	← recycle left	03:02
	→ robbyoconnor joined	03:04
	→ dreiss joined	03:05
	→ Mitchbones joined	03:05
	← Cassiel left	03:05
	→ BadProphet joined	03:06
	→ quazimod1 joined	03:09
	→ b4rbz joined	03:10
	→ bwreilly joined	03:10
	← maqr left	03:10
	→ maqr joined	03:11
	← Guest_ left	03:11
	→ luriv joined	03:12
	← TheMoonMaster left	03:13
	← bwreilly left	03:14
	← quazimod1 left	03:15
	← quazimodo left	03:15
	← githogori left	03:15
	→ quazimodo joined	03:15
	→ ascarter joined	03:16
	→ AccessibleWeb joined	03:16
	← eberg left	03:16
	← jakobhans left	03:17
	→ jcarouth joined	03:17
	← jstimm left	03:18
	← rchavik left	03:18
	→ sethwklein joined	03:18
	← Noldorin left	03:19
	← AccessibleWeb left	03:20
	← zivester left	03:21
	← daito left	03:21
	→ pheaver joined	03:22
	← dreiss left	03:22
	← MattMaker left	03:22
Seven_Six_Two	I'm not sure if I understand how git works. I set up git locally, will my project show up on github automagically?	03:23
	assuming that git is properly configured?	03:23
	→ TheMoonMaster joined	03:23
fairuz	Seven_Six_Two: Git has nothing to do with github	03:24
	But of course, you can set your remote to be github	03:24
	→ quazimod1 joined	03:24
fairuz	So that when you push/pull, it will push/pull to/from github	03:25
Seven_Six_Two	oh, so should I initially create the project on github?	03:25
	→ lasserix joined	03:25
buzzybron	c;ear	03:25
	→ alexlindenlevy joined	03:25
fairuz	Seven_Six_Two: The question is do you want to use github or just git?	03:26
Seven_Six_Two	ok. I've located a better tutorial. thanks	03:26
fairuz	If it's the former, yes you need to create project on github	03:26
	→ griotspeak joined	03:26
Seven_Six_Two	I would like to use both together, so that my project has a public face	03:26
	← lindenle left	03:27
	→ zivester joined	03:27
fairuz	Seven_Six_Two: Ok. You can create project on github. Github normally will tell you what to do afterwards (add remote, clone etc)	03:27
Seven_Six_Two	ok. Now that I know that, at least I can stop fiddling and go read again.	03:27
	thanks	03:28
	→ MattMaker joined	03:28
	→ john2x joined	03:28
	← Gamecubic left	03:29
	→ robarell_ joined	03:30
	← john2x_ left	03:32
	← jcarouth left	03:32
	← madewokherd left	03:33
	→ karthiknayak joined	03:34
	← nayak94 left	03:34
	← FreezingCold left	03:34
	← robarell_ left	03:34
	← eletuchy left	03:35
	→ dancat joined	03:37
	→ aboba joined	03:37
	→ mribeirodantas joined	03:37
	← MattMaker left	03:38
	→ LucasKA joined	03:38
	← harish left	03:38
	→ fsdldl joined	03:38
	← alexlindenlevy left	03:39
	← pheaver left	03:39
	→ MattMaker joined	03:41
	→ rchavik joined	03:41
	← yacks left	03:42
	→ yacks joined	03:43
	← fairuz left	03:45
	← MattMaker left	03:46
	→ Celm joined	03:46
	→ fairuz joined	03:46
	← fairuz left	03:46
	→ Nicholas_Rishel joined	03:46
	→ MattMaker joined	03:46
	→ fairuz joined	03:47
	← fairuz left	03:48
	← Celm left	03:50
	← crankyadmin left	03:50
	← robbyoconnor left	03:50
	← MattMaker left	03:51
	← ascarter left	03:52
	→ robbyoconnor joined	03:52
	→ luc_ joined	03:52
	← Dougie2187 left	03:52
	← Dougie187 left	03:55
	→ zajn joined	03:56
	→ Ivo joined	03:56
	← EGreg left	03:57
	→ l0x3py joined	03:57
	→ vien41f joined	03:58
	← vien41f left	03:59
	← kukks left	03:59
	← GT4066 left	03:59
	→ githogori joined	03:59
	→ daito joined	04:00
	← hooper left	04:00
	→ kukks joined	04:02
	→ MattMaker joined	04:03
	← weltall left	04:03
	← aspiers left	04:04
	← robustus left	04:04
	→ robustus joined	04:06
	← quazimod1 left	04:06
	← quazimodo left	04:06
	→ roymiloh joined	04:06
	← dougsland left	04:08
	← karthiknayak left	04:08
	← griotspeak left	04:09
	→ Snowball64 joined	04:10
	← Fissure left	04:12
	→ Celm joined	04:13
	← mribeirodantas left	04:14
	← Celm left	04:15
	← Garen left	04:15
	← crystal77 left	04:15
	→ chrisshattuck joined	04:16
	→ AccessibleWeb joined	04:16
	→ crankyadmin joined	04:17
	→ ascarter joined	04:17
	← daito left	04:18
	← b4rbz left	04:19
	→ Garen joined	04:19
	→ arietis joined	04:20
	← AccessibleWeb left	04:21
	→ rotta joined	04:22
	← MattMaker left	04:22
	← roymiloh left	04:22
	← rockfruit left	04:24
	→ beautifulmind joined	04:24
	→ Celm joined	04:25
	→ harish joined	04:28
	← CKyle left	04:29
	→ Sample joined	04:31
	→ robarell_ joined	04:31
	→ jcarouth joined	04:31
	→ Fissure joined	04:32
	→ simesy joined	04:35
	← Lemony left	04:35
	← robarell_ left	04:35
	→ ril joined	04:37
ril	hi!	04:37
	→ deens joined	04:37
ril	I cloned of someone's github repo, and had to make some changes to get it to compile on my system	04:37
	I'd like to contribute them back but I'm not really sure how	04:38
	← DolphinDream left	04:39
	← aboba left	04:39
offby1	ril: there are lots of ways, actually	04:41
skorgon	ril: pretty vague. what is the problem? make your changes in small logical chunks and commit them to your repo. push the branch to your fork on github and oopen a pull request	04:42
offby1	ril: with github, an easy an popular way is to use a "pull request". github's documentation has lots of discussion	04:42
	→ hellopat joined	04:42
	← ascarter left	04:42
	→ anry joined	04:42
	→ jeff_04 joined	04:42
ril	so I made the changes in a read-only clone before I thought to fork the repo	04:42
	i've committed them on my machine but I'm not sure how to push them back to github	04:43
	→ jefflyne joined	04:43
ril	I think I need to repoint my clone to my fork?	04:43
skorgon	ril: add your github repo as remote to your local repo (git remote add foo <url>)	04:43
	→ MattMaker joined	04:44
ril	what's foo?	04:44
	oh, foo<url>	04:44
skorgon	and then push the branch to that remote with git push foo <local branch>:<remote branch>	04:44
	an arbitrary name for that remote	04:44
	← Nicholas_Rishel left	04:44
skorgon	there is a space between foo and <url>	04:44
ril	oh	04:45
	→ fairuz joined	04:45
skorgon	it's just a name to refer to that remote when you fetch or pull or refer to remote branches of that remote	04:45
ril	is there a naming convention?	04:45
	→ sanjayu joined	04:45
skorgon	origin is the name of the remote you originally cloned from	04:45
	other than that, i'm not aware of any	04:46
ril	ok	04:46
skorgon	give it a descriptive name, so you know what it is	04:46
	← hellopat left	04:46
skorgon	the name is just used locally in your repo anyway	04:46
ril	should it be specific to the change I'm committing?	04:46
skorgon	well, it refers to the remote, i.e. your github fork of that project	04:46
	← joelm left	04:46
skorgon	change specific names are rather for branches	04:46
ril	ok	04:46
	ok, added the remote	04:47
	now I need to make a branch?	04:47
	← jenrzzz left	04:47
skorgon	not necessarily	04:47
	→ Rakko joined	04:47
skorgon	if you used the push syntax i posted a little further above, you can push your local branch under any arbitrary other name - or the same - to the remote	04:48
	← jefflyne left	04:48
skorgon	but you need to have the changes commited somewhere, ideally based on the latest version of the upstream project	04:48
	→ k_sze[work] joined	04:48
Rakko	If I'm told my master is ahead of origin/master by 3 commits, does that mean it's queried the origin remote to see its newest commit? Or is it just using my local clone of it?	04:48
	← Celm left	04:49
k_sze[work]	erm, `git push -f` seems to be somewhat dangerous.	04:49
skorgon	Rakko: just what you already have locally	04:49
Rakko	ok	04:49
ril	so git push myRemote	04:49
skorgon	Rakko: you need to git fetch the remote to actually get remote updates	04:49
k_sze[work]	Is there a way to configure it so that the repository and branch name are required when I use `git push -f`?	04:49
ril	and then what, my github URL and then their github URL?	04:49
skorgon	ril: i'd rather use git push myRemote <local branch>:<remote branch>	04:49
ril	what goes in the angle brackets	04:50
skorgon	k_sze[work]: isn't that what happens when you set push.default=none ?	04:50
	the name of the local branch you want to push and a name of the remote branch you want to push to (doesn't need to exist)	04:50
ril	do I need to make a branch first?	04:51
skorgon	k_sze[work]: though that would affect all pushes	04:51
	ril: locally? you should be on a branch, aren't you?	04:51
ril	I guess? I have no idea	04:51
	I git cloned	04:51
	tried to compile	04:51
	← dancat left	04:51
ril	noticed some typedefs were broken	04:51
	fixed them	04:51
	did git commit -a	04:51
skorgon	but you can create one	04:51
k_sze[work]	skorgon: exactly. I want convenience when I do plain `git push`, but more safety when doing `git push -f`	04:52
	→ pweaver_ joined	04:52
skorgon	actually the push command does not need a branch to specify the local side. you can even give it any sha1	04:52
ril	I'm sorry, I do not understand.	04:53
	→ Tommy[D]_ joined	04:53
	← Zifre left	04:54
ril	should I make a branch on github for this pull request?	04:54
	← rook2paw1 left	04:54
skorgon	the push will create a branch on github.	04:55
Rakko	2nd question: I have a repo with a bunch of submodules. I usually do `git submodule update --remote` to update them, which causes changes to be shown in the main repo. But just now I instead did `git submodule foreach 'git co master && git pull'`. It did update several, but now the main repo doesn't show any changes. Why is that?	04:55
ril	but you said I need to push with a branch name...	04:55
	← Tommy[D] left	04:56
skorgon	ril: right, but the remot branch will be created	04:56
ril	oh god	04:56
	ok, so I need to delete the branch I just made?	04:56
	← snuffeluffegus left	04:56
skorgon	what branch did you create? but i think no, there shouldn't be any need to remove a branch - other than cleaning up eventually	04:57
ril	ok	04:57
	→ hyperboreean joined	04:57
ril	so git push <myThing>	04:58
	now it's just hanging	04:58
	← Sample left	04:58
ril	I feel so fucking stupid	04:59
skorgon	you should probably read this https://help.github.com/articles/fork-a-repo	05:00
Rakko	anyone?	05:02
	← CheckDavid left	05:02
ril	error: failed to push some refs to 'git@github.com:AprilArcus/vpython-wx.git'	05:02
	hint: Updates were rejected because the remote contains work that you do	05:02
	hint: not have locally. This is usually caused by another repository pushing	05:02
	hint: to the same ref. You may want to first integrate the remote changes	05:02
	← sanjayu left	05:02
	← LucasKA left	05:03
	← anry left	05:03
	→ Sample joined	05:03
	← Sample left	05:03
	→ Sample joined	05:03
	← bhldev_ left	05:03
ril	ok. I'll just… delete this fork, and try again?	05:03
	→ bhldev_ joined	05:04
	← BadProphet left	05:04
	→ sanjayu joined	05:04
	→ dreiss joined	05:05
	← chris_thomson left	05:05
	→ BadProph_ joined	05:06
	← Rylee left	05:06
	→ veebers_ joined	05:07
grumbel_	ril, you'll have to first get the changes from remote and merge your changes	05:08
	either do git fetch; git rebase or git pull	05:08
	← akim left	05:08
grumbel_	pull will create a merging commit, while rebase will put your changes on top of the work done in remote	05:08
	→ akim joined	05:08
	→ Rylee joined	05:08
	← veebers left	05:09
	← pweaver_ left	05:09
	→ iamntz joined	05:10
ril	okay	05:10
	$ git rebase	05:10
	Current branch master is up to date.	05:10
	so current status: no forks, no branches, I have my changes committed into a clone of the master repository.	05:11
	what do	05:11
	I feel like I should have made a fork before I started editing anything	05:12
	but I guess it is too late for that?	05:12
	→ jstimm joined	05:12
	← akim left	05:12
	→ MattMake_ joined	05:13
	→ ariscop joined	05:14
	→ daito joined	05:14
	← rgr left	05:15
	← MattMaker left	05:15
	← jeff_04 left	05:15
grumbel_	ril: did you do git fetch	05:15
	← Snowball64 left	05:15
	← k4r1m left	05:16
	→ pweaver_ joined	05:16
grumbel_	you can also fork now, clone that fork, and take your changes to that new clone, if you like	05:16
	→ AccessibleWeb joined	05:17
ril	Permission denied (publickey).	05:18
	fatal: Could not read from remote repository.	05:18
	← pwnz0r left	05:20
	ChanServ set mode: +o	05:20
	← MattMake_ left	05:21
	→ jceb joined	05:21
	Eugene changed the topic to: Welcome to #git, the place for git help and Hydra operatives \| Current table version: 1.9.1 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Cut off one branch and two more will grow to take its place	05:21
	Eugene set mode: +v	05:21
	Eugene set mode: -o	05:21
	→ MattMaker joined	05:21
grumbel_	ril: uh, seems that your ssh configuration is somehow broken; I wonder why git push worked then, though	05:22
	← AccessibleWeb left	05:22
	← chrisshattuck left	05:24
	→ zacts joined	05:24
	→ dmnd joined	05:25
	→ rook2pawn joined	05:26
	→ MattMake_ joined	05:28
	← MattMaker left	05:28
	→ marthinal joined	05:29
Rakko	submodules are hard	05:29
	I should go shopping	05:29
Eugene	Rakko - I recommend beer.	05:29
Rakko	I have whisky only	05:30
Eugene	And rum. Don't forget rum.	05:30
	→ ErKa joined	05:30
Rakko	I have a repo with a bunch of submodules. I usually do `git submodule update --remote` to update them, which causes changes to be shown in the main repo. But just now I instead did `git submodule foreach 'git co master && git pull'`. It did update several, but now the main repo doesn't show any changes. Why is that?	05:30
	(I also that did `git submodule update --remote` to see what would happen afterward; seemingly nothing did.)	05:30
	← Devastator left	05:31
	→ kayloos joined	05:31
	→ robarell_ joined	05:32
ril	okay, I got it all sorted out!	05:32
	thanks everyone <3	05:32
	→ lite_ joined	05:32
Eugene	Because you're not using enough alcohol to use submodules. Nobody ever is.	05:32
Rakko	I know	05:32
	→ Devastator joined	05:32
Eugene	(seriously, I have no idea. I hate those things so much)	05:32
Rakko	But I wannnnnnt to learrrrrn	05:32
	→ vijay13 joined	05:32
	← ifdm_ left	05:34
	← starkhalo left	05:34
	→ hoschi joined	05:34
	→ diegovio1 joined	05:35
	← robarell_ left	05:35
	← MattMake_ left	05:36
	← diegoviola left	05:36
	→ nfk joined	05:36
	diegovio1 → diegoviola	05:36
	← JerryT left	05:37
	← _5kg left	05:37
	→ ferreum joined	05:38
	→ jenrzzz joined	05:39
	→ diegovio1 joined	05:40
	← endiruna left	05:41
	diegoviola → Guest28903	05:42
	diegovio1 → diegoviola	05:42
	← kayloos left	05:42
	← Guest28903 left	05:42
	← robbyoconnor left	05:44
	→ robbyoconnor joined	05:45
	← jaimef left	05:46
	← arunpandianp_ left	05:46
	→ diegovio1 joined	05:46
	→ arunpandianp_ joined	05:46
	→ endiruna joined	05:46
	→ jaimef joined	05:46
	→ fragamus joined	05:46
	diegoviola → Guest77543	05:47
	diegovio1 → diegoviola	05:47
	← Guest77543 left	05:47
	← tpollard left	05:48
	→ Celm joined	05:49
	← viscera left	05:50
	→ FilipNortic joined	05:50
	→ jekle joined	05:52
	→ elbeardmorez joined	05:52
	→ ifdm_ joined	05:53
	← Celm left	05:53
	← arunpandianp_ left	05:54
	→ kbart joined	05:54
	← Mitchbones left	05:54
	← diegoviola left	05:55
	← robbyoconnor left	05:56
	→ arunpandianp_ joined	05:56
	→ robbyoconnor joined	05:57
	→ wrouesnel joined	05:57
	← mh` left	05:58
	→ mh` joined	05:59
	→ Macaveli joined	05:59
	← Sample left	06:00
	→ Tronsha joined	06:01
	← iamntz left	06:01
	→ Sample joined	06:01
	→ zumba_ad_ joined	06:02
	→ Raging_Hog joined	06:02
	← oojacoboo left	06:02
	→ mrjensen joined	06:02
	← arunpandianp_ left	06:02
	→ tvw joined	06:02
	→ teran joined	06:02
	→ arunpandianp_ joined	06:03
	← zumba_addict left	06:03
	→ oojacoboo joined	06:03
	→ ehmatthes joined	06:03
	← Sleepy63 left	06:05
	← talios left	06:05
	→ EminenceHC joined	06:06
	← Sample left	06:06
	→ Atrumx joined	06:06
	→ papegaaij joined	06:06
	→ iamntz joined	06:07
	→ qrohlf joined	06:07
	→ Exancillatus joined	06:07
	→ ryez joined	06:07
	→ diegoviola joined	06:08
	← heavystorm left	06:08
	→ k4r1m joined	06:08
	→ mh`` joined	06:09
	← qrohlf left	06:09
	← mh` left	06:09
	mh`` → mh`	06:09
	← dreiss left	06:11
	← lov left	06:11
	→ lov joined	06:11
	← Exancillatus left	06:11
	→ heavystorm joined	06:12
	← el3ctron left	06:12
	→ jluc joined	06:12
	→ qrohlf joined	06:13
	→ Sicp_ joined	06:13
	← arunpandianp_ left	06:14
	→ arunpandianp_ joined	06:14
	← Goplat left	06:14
	→ cbreak-work joined	06:14
	→ eletuchy joined	06:14
	→ a-l-e joined	06:16
	← qrohlf left	06:16
	← EminenceHC left	06:16
	→ qrohlf joined	06:16
	→ EminenceHC joined	06:17
	→ roymiloh joined	06:17
	→ Zematix joined	06:17
	← Sicp_ left	06:18
	Zematix → zematis	06:18
	→ AccessibleWeb joined	06:18
	← qrohlf left	06:19
	→ nilg joined	06:19
	→ qrohlf joined	06:19
	→ Sleepy63 joined	06:19
	→ soerenbf joined	06:19
	← zematis left	06:19
	← qrohlf left	06:20
	← ilmgb_ left	06:20
	← EminenceHC left	06:21
	→ _5kg joined	06:21
	→ sschonert joined	06:22
	← AccessibleWeb left	06:23
	→ draftqin joined	06:23
	→ zoso joined	06:24
	→ Skrypter joined	06:24
	→ kesha joined	06:24
	← soerenbf left	06:25
	→ freimatz joined	06:26
	→ vurma joined	06:27
	← diegoviola left	06:27
	→ Gizburdt joined	06:30
	→ hellopat joined	06:30
	→ soee joined	06:30
	→ diegovio1 joined	06:31
	→ aarapov joined	06:31
	→ robarell_ joined	06:32
	→ weltall joined	06:32
	diegovio1 → diegoviola	06:33
	← hellopat left	06:34
	→ _iron joined	06:35
	← kesha left	06:36
	← robarell_ left	06:36
	→ kesha joined	06:37
	→ h0bbit joined	06:37
	← diegoviola left	06:38
	→ pikaren joined	06:38
	← rchavik left	06:38
	← jceb left	06:39
	← ORiON-- left	06:39
	→ jmd joined	06:40
	← kukks left	06:40
	→ obert joined	06:41
	→ maestrojed joined	06:41
jmd	Can someone help me with a submodule problem. I have modified something in a submodule and want to discard those modifications. git checkout -- <submoddir> seems to have no effect. What is the correct way to do it?	06:42
	← veebers_ left	06:42
	→ ORiON-- joined	06:42
milki	go into the submodule dir and git checkout	06:42
Rakko	I had a question about submodules too, if you'd like to take a shot at it, milki	06:43
	milki runs away	06:43
Rakko	ok then :)	06:43
milki	sobmodules are chasing after us	06:43
	!ask	06:43
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	06:43
Rakko	I know, I know	06:43
	but last two times I got no answers	06:44
	I just wanted to warn before spamming the channel	06:44
	and let you take care of jmd first	06:44
jmd	milki: Ok Thanks.	06:44
	← fatalhalt left	06:46
	← ORiON-- left	06:46
Rakko	I have a repo with a bunch of submodules. I usually do `git submodule update --remote` to update them, which causes changes to be shown in the main repo. But just now I instead did `git submodule foreach 'git co master && git pull'`. It did update several, but now the main repo doesn't show any changes. Why is that?	06:46
	(I also that did `git submodule update --remote` to see what would happen afterward; seemingly nothing did.)	06:46
milki	what did main repo show _before_ you did that?	06:47
	→ dreiss joined	06:48
Rakko	it was clean	06:48
milki	and the checkout and pull showed changes?	06:48
	→ AccessibleWeb joined	06:49
	→ ORiON-- joined	06:49
Rakko	yes	06:49
	in a few submods	06:49
	← Rastus_Vernon left	06:49
Rakko	submodules are strange magic	06:50
	milki shrugs	06:50
	→ jagob joined	06:50
	→ Celm joined	06:50
	→ xificurC joined	06:50
Rakko	hmm	06:50
milki	maybe the local masters were not up to date but the checked out repo before you co were	06:50
Rakko	yeah	06:50
jmd	Rakko: submodules are an abomination - they should never have been put into git.	06:50
Rakko	but they were ;)	06:51
milki	the idea is pretty logical though	06:51
	→ veebers joined	06:51
Rakko	all I want is for my main repo to track external repos by either tag or branch tip or commit id	06:51
	I did clone my repo into another directory and checked all the submodule commits and they were up to date there	06:52
	→ mishok13 joined	06:52
Rakko	I just have no idea where those commit ids are stored in git	06:52
milki	they are stored in the tree itself	06:52
	git ls-tree HEAD -- path/to/submodule	06:53
	→ mbrgm joined	06:53
Rakko	but they aren't in /.gitmodules	06:53
milki	correct	06:53
	← jenrzzz left	06:53
	← AccessibleWeb left	06:53
milki	that only tells git where to fetch the submodules from	06:53
Rakko	so presumably they're in /.git/modules/...	06:53
	← lite_ left	06:53
	→ Dudi joined	06:53
milki	o ya, i forgot that existed...	06:53
	→ jenrzzz joined	06:53
	milki wonders whats in there	06:53
	→ lite_ joined	06:54
	← Celm left	06:54
	→ hd1 joined	06:54
	→ diegoviola joined	06:55
	gitinfo set mode: +v	06:55
	← ErKa left	06:55
	→ xificurC_ joined	06:56
	← roymiloh left	06:56
	→ hooper joined	06:57
	← hooper left	06:57
	← draftqin left	06:57
	← xificurC left	06:57
	← Kingsy left	06:57
	→ anry joined	06:58
	← dmnd left	06:58
	← harish left	06:58
	← earth left	06:58
	→ Kneferilis joined	06:58
	→ Exancillatus joined	06:59
	→ kukks joined	06:59
	← kukks left	06:59
	→ kukks joined	06:59
	→ harobed joined	07:00
	→ Mendenba_ joined	07:00
	← jenrzzz left	07:00
	→ m0nkmaster joined	07:01
	← luriv left	07:01
	← Mendenbarr left	07:01
	→ jenrzzz joined	07:02
	← ehmatthes left	07:02
	→ pwnz0r joined	07:02
	← BadProph_ left	07:04
	→ talios joined	07:04
	← talios left	07:04
	→ talios joined	07:05
	← talios left	07:05
	→ talios joined	07:05
	← talios left	07:05
	→ pduin joined	07:06
	← thiago left	07:06
	→ talios joined	07:06
	→ jceb joined	07:06
	← dreiss left	07:06
	← zumba_ad_ left	07:07
	→ hkon_ joined	07:07
	→ shruggar joined	07:07
	← boombatower left	07:08
	← Exancillatus left	07:08
	→ Xethron joined	07:08
	← ifdm_ left	07:09
	→ thevishy joined	07:09
	→ ghostlines joined	07:10
	→ ifdm_ joined	07:10
	→ rockfruit joined	07:11
	→ rob_w joined	07:11
	→ soerenbf joined	07:11
	→ LucasKA joined	07:11
	→ zumba_addict joined	07:11
	← obert left	07:11
	→ Exancillatus joined	07:12
	← skasturi left	07:13
	← xjiujiu left	07:13
	→ w41 joined	07:13
	← w41 left	07:13
	→ w41 joined	07:13
	← Gizburdt left	07:13
	→ draftqin joined	07:13
	→ stodan joined	07:14
	← Rakko left	07:14
	→ Gizburdt joined	07:14
	→ skasturi joined	07:14
	← soerenbf left	07:15
	← skasturi left	07:17
	→ skastur1 joined	07:17
	→ Neon1024 joined	07:18
	skastur1 → skasturi	07:18
	→ MafooUK joined	07:18
	→ freestyl3r joined	07:18
	← teran left	07:18
	→ teran joined	07:19
	→ blackmesa joined	07:19
	→ jnavila joined	07:19
	← mishok13 left	07:20
	→ alorence joined	07:20
	→ BadProphet joined	07:21
	← ruskie left	07:21
	→ thierryp joined	07:22
	→ jargon joined	07:22
	← teran left	07:23
	← mikecmpbll left	07:27
	→ Sonderblade joined	07:27
	← Sonderblade left	07:28
	→ Sonderblade joined	07:28
	→ mishok13 joined	07:28
	← sonicblud left	07:29
	→ codeurge joined	07:29
	← shruggar left	07:29
	← kalypso left	07:30
	← Xethron left	07:30
	← john2x left	07:30
	← m0nkmaster left	07:31
Sonderblade	Say someone has rebased a branch I also have locally. How can I check if I have local commits not contained in the other persons rebased branch?	07:31
	← hd1 left	07:32
	→ john2x joined	07:32
	← losted left	07:32
osse	Sonderblade: git cherry	07:33
	I think	07:33
	→ robarell_ joined	07:33
	→ losted joined	07:33
jast	git cherry compares the patches, so depending on how much rebasing has happened it won't detect all commits with equivalent changes	07:33
kay______	test	07:35
	→ soerenbf joined	07:35
	← skorgon left	07:36
	← setuid left	07:36
	← asakura0 left	07:36
Sonderblade	osse: the commits that command list are already part of the rebased branch	07:36
kay______	i'd lose my HEAD if it wasn't detached	07:36
	← beautifulmind left	07:37
	→ skorgon joined	07:37
	← robarell_ left	07:37
	← Exancillatus left	07:37
	→ asakura0 joined	07:37
	← blackmesa left	07:38
	→ m0nkmaster joined	07:39
osse	Sonderblade: I'm not entirely sure how to use git-cherry; you'll have to look it up. Other than that, jast has a point. If you're unlucky you'll have to do it by hand	07:39
Sonderblade	osse: that sucks. cant i just tell git to treat commits with the exact same author, commit message and timestamp to be the same?	07:41
	Vampire0_ → Vampire0	07:42
Vampire0	Sonderblade, if the commits have the same diff, git cherry should see them as the same. But if you rebase it can happen that there are conflicts along the way that get resolved	07:42
	And then it is not seen as the same commit anymore	07:42
	→ ruskie joined	07:43
	← LucasKA left	07:43
	→ lb1a joined	07:43
	→ Exancillatus joined	07:44
Sonderblade	Vampire0: yes but git is wrong, it is "the same commit" for all intents and purposes	07:45
	← einonm left	07:45
	→ einonm joined	07:45
	← ggherdov_ left	07:45
	→ ggherdov_ joined	07:45
	← ggherdov_ left	07:45
	→ ggherdov_ joined	07:45
	← Seven_Six_Two left	07:46
osse	Sonderblade: git-cherry outputs all commits with a + or a - in front	07:46
	how many +'es were thereP?	07:46
	← francisfish left	07:47
	← Exancillatus left	07:48
Sonderblade	osse: 1	07:48
osse	that means there is only one commit that Git thinks you have that is not in the rebased branch	07:49
Vampire0	Well RTFM then :-) (man git cherry)	07:49
gitinfo	the git-cherry manpage is available at http://jk.gs/git-cherry.html	07:49
	→ ngladitz joined	07:50
	→ ArSn joined	07:50
	→ akiva joined	07:51
kay______	BC	07:52
	5*5	07:52
	→ lavong joined	07:52
	→ Balliad joined	07:55
	← sschonert left	07:55
	→ Stalkr_ joined	07:55
	← Stalkr_ left	07:55
	→ Stalkr_ joined	07:55
	← m0nkmaster left	07:56
	→ sschonert joined	07:56
	→ BiggFREE joined	07:56
	← maestrojed left	07:57
	→ Kicer86 joined	07:57
Sonderblade	osse: the only diff in the commits is that one has a \ No newline at end of file message and the other doesn't. there was no rebase conflict	07:57
	← ORiON-- left	07:57
	← Exio4 left	07:58
	→ Exio4 joined	07:59
osse	As far as Git is concerned then it's different commit	08:00
	→ ORiON-- joined	08:00
osse	anyway, it was just the one commit you had to inspect manually. So you're done	08:00
	→ psoo joined	08:00
	→ Kingsy joined	08:00
Kingsy	if I have a git diff.. can I commit those changes into a file?	08:01
	→ sdouglas joined	08:01
	← Skrypter left	08:02
	→ mikecmpbll joined	08:02
	→ Error404NotFound joined	08:03
osse	Kingsy: what do you mean?	08:03
akheron	Kingsy: git apply	08:03
	→ matteo joined	08:03
	← RagBal left	08:04
	→ sweetyReaper joined	08:04
Kingsy	osse: well, I am looking at the history of a branch. I can see the various changes made to various files in the commit history, however for one specific file there is like 500 changes. If you view the file in the commit history it gives you a diff... I need to implement the same changes made in that commit on that file, to another file in another repo	08:04
	← rockfruit left	08:04
	← lavong left	08:04
	→ lavong joined	08:05
tobiasvl	Kingsy: http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/	08:05
Kingsy	tobiasvl: but its not a .patch, its a diff	08:05
	or is that the same thing?	08:05
tobiasvl	but you can create a patch from the diff	08:05
osse	Kingsy: the default git-diff output is a valid patch	08:05
Kingsy	oh great	08:06
	← pweaver_ left	08:06
	→ b1lly1 joined	08:07
	← sdouglas left	08:07
	← ril left	08:09
Kingsy	it just says patch does not apply when you --check it	08:09
	← winny left	08:09
	← tureba left	08:09
	← ariscop left	08:09
	→ winny joined	08:09
tobiasvl	Kingsy: sure you chose the right revision? it matches the other file somewhat?	08:10
Kingsy	tobiasvl: yeah, at least it should, perhaps I just have to do this manually..	08:10
	it'll take ages :(	08:10
	→ tureba joined	08:11
	→ kotopies joined	08:11
	← losted left	08:11
	← Mrono left	08:11
tobiasvl	Kingsy: naw man, that shouldn't be necessary	08:11
	→ amcsi_work joined	08:12
osse	Kingsy: did you do git diff foo bar -- path/to/file? So that you get the exact patch?	08:13
	← cebor left	08:13
	← ORiON-- left	08:13
	← pwnz0r left	08:13
Kingsy	osse: I got the diff from gitg	08:13
osse	and copy-pasted it?	08:14
Kingsy	yeah	08:14
	→ RagBal joined	08:14
osse	then all sorts of things can go wrong, wrt. formatting, whitespace etc.	08:14
Kingsy	well you can export the entire commit as a patch but that didnt work either.	08:16
	→ losted joined	08:16
	→ Silmarilion joined	08:16
	→ teran joined	08:16
osse	maybe it simply doesn't apply	08:16
	→ shruggar joined	08:16
osse	if you export the entire commit then you get changes to other files as well	08:17
Kingsy	yeah which is fine	08:17
	→ cebor joined	08:17
Kingsy	but they all say patch does not apply	08:17
osse	in that case you can use git-cherry-pick	08:17
	→ Octalot joined	08:17
	← soerenbf left	08:17
	→ hellopat joined	08:18
	Keridos_off → Keridos	08:19
	→ wrouesnel2 joined	08:19
	→ soerenbf joined	08:20
	→ ORiON-- joined	08:22
	← endiruna left	08:22
	← b1lly1 left	08:22
	← soerenbf left	08:22
	← hellopat left	08:22
	→ jameswlane joined	08:23
	→ Xethron joined	08:23
	← Xethron left	08:23
	→ Xethron joined	08:23
	→ m0nkmaster joined	08:24
	→ PeterBooker joined	08:24
Kingsy	osse: loads of errors like this --> http://pastie.org/9032394	08:24
	← kukks left	08:25
	← kotopies left	08:25
tobiasvl	Kingsy: and is that text present in the file?	08:25
osse	Kingsy: what command did you run?	08:26
	← ORiON-- left	08:26
	← kermit left	08:26
	→ blinkdesign joined	08:27
	→ kermit joined	08:27
	→ rockfruit joined	08:28
	→ soerenbf joined	08:29
	← hkon_ left	08:29
	→ ilmgb joined	08:30
	← psoo left	08:30
Kingsy	tobiasvl: yes	08:31
	→ moritzs joined	08:31
Kingsy	osse: git apply -v --checkout 001patch.patch	08:31
	oops	08:31
	--check not --checkout***	08:31
	haha	08:31
	← Leoneof left	08:32
	← Dudi left	08:32
	← vijay13 left	08:33
	→ robarell_ joined	08:34
	← BiggFREE left	08:34
	→ pairofdice joined	08:35
	→ Leoneof joined	08:35
osse	try git-cherry-pick	08:35
	← wrouesnel2 left	08:35
	ggherdov_ → ggherdov	08:36
	← Segfault_ left	08:36
	→ rath joined	08:36
	→ Dudi joined	08:37
	← ifdm_ left	08:37
	→ tgummerer joined	08:37
	← robarell_ left	08:38
	→ ifdm_ joined	08:38
	← Leoneof left	08:40
	→ sgronblo joined	08:40
	→ AccessibleWeb joined	08:40
	→ Leoneof joined	08:41
	→ slax0r joined	08:41
	→ welly joined	08:41
	→ gain joined	08:41
	← vurma left	08:42
	→ spacepluk joined	08:43
	→ vurma joined	08:44
	← m0nkmaster left	08:45
	→ user258467 joined	08:46
	← AccessibleWeb left	08:46
	→ AccessibleWeb joined	08:47
	← simesy left	08:47
	← arietis left	08:47
	→ m0nkmaster joined	08:47
	→ HelperW joined	08:50
	→ Accessib_ joined	08:50
	→ Celm joined	08:51
	← AccessibleWeb left	08:51
	→ arietis joined	08:51
	← Celm left	08:55
	← proycon left	08:57
	→ delight joined	08:58
	← alansaul-laptop left	08:58
	→ SilverBln joined	09:01
	← MafooUK left	09:02
	→ MafooUK joined	09:02
	→ francisfish joined	09:03
	← SilverBln left	09:03
	← chipster left	09:05
	← ezekiel\|work left	09:05
	→ chipster joined	09:05
	← asakura0 left	09:06
	← m0nkmaster left	09:06
	→ Kayra joined	09:07
	→ hkon_ joined	09:08
	→ asakura0 joined	09:08
	← frobware left	09:09
	→ JohnBat26 joined	09:10
	← weiyang left	09:12
	→ whitebone joined	09:13
	← whitebone left	09:14
	→ dannymichel joined	09:14
	→ ni__ joined	09:14
	← devoldmx left	09:16
	→ moberberger joined	09:16
	→ Nizumzen joined	09:17
	→ simesy joined	09:17
	← Stalkr_ left	09:18
	← BadProphet left	09:19
	← fsdldl left	09:19
	← Gizburdt left	09:20
	Kyle____ → Kyle	09:21
	Kyle → Guest44217	09:21
	← delight left	09:22
	→ canton7-mac joined	09:22
	→ frobware joined	09:23
lite_	so something like .foo:hover .bar {} ?	09:23
	→ m0nkmaster joined	09:23
	Guest44217 → Eliz	09:23
	← masak_ left	09:24
	← jnavila left	09:24
	← simesy left	09:25
	← Joost` left	09:26
	→ nnyk_ joined	09:26
	← eletuchy left	09:26
	→ eletuchy joined	09:26
	→ eaj joined	09:27
	→ Joost` joined	09:27
	→ delight joined	09:28
	← nnyk_ left	09:30
	← eletuchy left	09:31
	← Nizumzen left	09:32
	→ carbon joined	09:32
	← lasserix left	09:34
	← Accessib_ left	09:34
	← RaptorJesus left	09:34
	→ robarell_ joined	09:34
	→ AccessibleWeb joined	09:34
	→ jnavila joined	09:35
	→ BadProphet joined	09:36
	→ W0rmDr1nk joined	09:36
	← mrjensen left	09:36
	→ mrjensen joined	09:36
	← h0bbit left	09:36
	→ aspiers joined	09:37
	djh_ → djh	09:37
	→ Naeblis joined	09:38
djh	Is there an easy way to get a git equivalent of "ls -l" so I can check when all the files in the current directory were last updated in git?	09:38
	← Turicas left	09:38
	← robarell_ left	09:38
	→ grasshopyx joined	09:39
canton7	djh, something like this? http://serverfault.com/a/401450 you might want to skip the -r	09:40
	← deepy left	09:40
djh	canton7: Looks good, ty	09:40
	→ simesy joined	09:40
	← tokik left	09:41
	→ deepy joined	09:41
	deepy → Guest59300	09:42
	← carbon left	09:42
	← kesha left	09:42
	← grasshopyx left	09:43
	→ nnyk_ joined	09:43
	→ blinkdes_ joined	09:43
	← blinkdesign left	09:44
	→ LeMike joined	09:44
	→ luriv joined	09:45
	→ endiruna joined	09:45
	← deens left	09:46
	→ WaReZ joined	09:46
	← variable left	09:47
user258467	Hi I noticed that now when I do a git merge it tells me to identify myself by configuring user.email and user.name before I haven't to do that. Why now it asked me that? is it because the merge is not fast-forward? and there is conflict?	09:48
	← hkon_ left	09:49
	← flexd left	09:49
	→ ezekiel\|work joined	09:49
_ikke_	Yes, probably. If earlier you only did ff merges, and no comitting	09:49
	→ flexd joined	09:50
	→ Gizburdt joined	09:50
	← jluc left	09:50
	← simesy left	09:51
	→ SLY1986 joined	09:52
	← Gizburdt left	09:52
	→ Gizburdt joined	09:52
	← AccessibleWeb left	09:54
user258467	_ikke_, thanks I think I relaized I made a commit for a .gitignore change normally I wouldn't do any commit in this working copy because it is not its purpose (I do only git fetch and git merge on it) but I made the mistake, how do I to merge with fast-forward now, I already git reset --soft to the revision before the commit mistake	09:54
	→ AccessibleWeb joined	09:55
	← Macaveli left	09:55
	← fairuz left	09:55
	→ simesy joined	09:55
	← jmd left	09:55
	→ jluc joined	09:56
	← francisfish left	09:58
user258467	in brief I would like to have an exact working copy of the origin, I know I remove the directory and do a git clone but it is not really a good practice	09:58
	→ kotopies joined	09:59
	→ francisfish joined	10:00
	→ Hounddog joined	10:01
	→ tave joined	10:01
	→ variable joined	10:01
	→ Sicp joined	10:03
	← Sicp left	10:03
	→ Sicp joined	10:03
	← mrjensen left	10:03
	← ilmgb left	10:03
	← soerenbf left	10:04
	→ sdouglas joined	10:04
	gitinfo set mode: +v	10:06
tave	hi - hope someone can help me. i have problems using cygwin with git under windows with changed file permissions. when i am going to checkout another branch were a file has changed file permissions, git tries to add the file again to my working copy instead of changing to file permissions. git is filing with error: unable to create file bar/foo (File exists). I have already tried to set the option core.filemode=false, but nothing changes	10:06
Vampire0	user258467, maybe "git reset --hard @{u}"? It should reset the current branch to its upstream branch.	10:06
	→ hellopat joined	10:06
tave	when i am using windows git client everything works as expected. Has anyone an idea what is going wrong - or can i provide some more information?	10:06
	→ Accessib_ joined	10:07
	← W0rmDr1nk left	10:07
	← m0nkmaster left	10:07
	→ W0rmDr1nk joined	10:07
	← simesy left	10:08
	← Accessib_ left	10:08
Vampire0	tave is this really a permission thing, or do the two files have differences in case?	10:08
	← Raging_Hog left	10:08
Vampire0	As windows is case insensitive, this could be a problem	10:08
	→ Accessib_ joined	10:08
	→ hkon_ joined	10:09
	← sdouglas left	10:09
	← Gizburdt left	10:09
	← jenrzzz left	10:09
	← kotopies left	10:10
	← AccessibleWeb left	10:10
tave	hi Vampire0 - in fact it is a binary file of same size. The only thing i can see is a changed user permission	10:10
qknight	after git push origin :foo i get '- [deleted] foo', running it again it says that it has been deleted. now i run 'git branch -l' and it still shows that branch. also GITLAB still shows it, why?	10:10
	maybe i have to make git init and push -f first to get rid, but that is probably a bit brutal	10:10
	→ kotopies joined	10:11
	← hellopat left	10:11
	← ifdm_ left	10:11
tave	hey qknight - as far as i know git push origin :foo deltes the remote branch. if you want to delete you local branch you have to do git branch -d foo	10:11
	or you can try git fetch -p	10:12
qknight	tave: yes, but git branch -r still shows them ;P	10:12
	← Accessib_ left	10:12
	← dilfridge left	10:13
qknight	solution: http://stackoverflow.com/questions/5094293/git-remote-branch-deleted-but-still-appears-in-branch-a	10:13
Vampire0	qknight, yeah, just as tave advised you ;-)	10:14
	git fetch -p will also do the pruning	10:14
	→ Mrono joined	10:14
Vampire0	hence the -p	10:14
	← WaReZ left	10:14
	→ ilmgb joined	10:15
	→ AccessibleWeb joined	10:15
qknight	Vampire0: but i don't want to delte the local branch	10:15
	Vampire0: i just wanted to delete all the remove branches	10:16
	s/remove/remote	10:16
Vampire0	[12:12:07] <+tave> or you can try git fetch -p	10:16
	That doesn't delete any local branch	10:16
	It prunes the non-existing remote branches	10:16
	man git fetch	10:16
gitinfo	the git-fetch manpage is available at http://jk.gs/git-fetch.html	10:16
Vampire0	You can prune with git fetch and with git remote, doesn't make much difference	10:17
	→ dilfridge joined	10:17
Vampire0	You can of course delte a remote branch manually too, but usually that's not what you want	10:17
	← Sander^home left	10:17
	← jstimm left	10:17
	→ xlinkz0 joined	10:18
	← przemkovv left	10:18
	→ RaptorJesus joined	10:19
	→ Raging_Hog joined	10:20
	→ WaReZ joined	10:20
	→ ORiON-- joined	10:20
	→ przemkovv joined	10:20
tave	shouldn't git ignore file permission for diffs when core.filemode=false is set?	10:22
Vampire0	I think so	10:22
	→ beautifulmind joined	10:22
Vampire0	besides that only the execute permission of the user part is considered anyway	10:22
	that's why I thought it might be a casing problem, not a permissions problem	10:23
tave	the sad story is - the executable flag changed ;) - when i am making a diff on the two different version of the filles git recognizes the different executable permission	10:23
	i think this is what causes me trouble - but i don't get why git is looking at the file permission, because core.filemode is set to false	10:24
	← francisfish left	10:25
	← przemkovv left	10:26
	→ eletuchy joined	10:27
	→ przemkovv joined	10:28
	← nnyk_ left	10:29
	← veebers left	10:30
	→ Sander^home joined	10:31
	← eletuchy left	10:32
	→ Gizburdt joined	10:33
	→ DoniRS joined	10:34
	→ runn joined	10:35
	→ jatt joined	10:35
	→ robarell_ joined	10:35
	← hyperair left	10:36
	→ dgeary2 joined	10:36
	→ ifdm_ joined	10:37
	← Sabbath left	10:37
	→ mrjensen joined	10:37
	← aarapov left	10:37
	← jatt left	10:38
	→ jatt joined	10:38
	→ m0nkmaster joined	10:38
	→ francisfish joined	10:38
	← robarell_ left	10:39
	→ LucasKA joined	10:40
	→ optixx joined	10:41
	→ vtunka joined	10:41
Vampire0	tave, I think core.filemode is only considered when adding changes to the index	10:42
	If there are recorded changes they are still applied	10:42
	but this should work fine usually	10:42
	← buzzybron left	10:42
	→ nayak94 joined	10:42
	← SLY1986 left	10:43
	← HelperW left	10:43
	→ HelperW joined	10:44
	← LucasKA left	10:45
tave	Vampire0: maybe it is not a problem about the file permission. but what still irritates me is that it is working fine for windows git client. but the cygwin git client causes me problems.	10:45
	→ napcae joined	10:45
	→ daedeloth joined	10:45
tave	is there any way to get some more information what causes git trouble - like debug output or something like that?	10:45
	→ Wizek joined	10:46
	← Gizburdt left	10:47
Vampire0	Maybe because windows doesn't care about executable permissions?	10:48
	→ Gizburdt joined	10:48
	← HelperW left	10:48
	→ nnyk_ joined	10:49
tave	at least i have read - that the windows git-client is by default compiled with config.filemode=false	10:49
	so this is one difference i know	10:49
	← daito left	10:49
	→ kesha joined	10:50
	← w41 left	10:50
	→ stamina joined	10:51
	← ilmgb left	10:51
	→ soerenbf joined	10:52
	← jameswlane left	10:53
	← arietis left	10:55
	← Kayra left	10:56
	→ monbro joined	10:56
	← yacks left	10:56
	→ glebihan joined	10:56
	← nayak94 left	10:57
	← thierryp left	10:57
	← AccessibleWeb left	10:57
	→ AccessibleWeb joined	10:58
	← diegoviola left	10:58
	← k_sze[work] left	10:58
	← paulweb515 left	11:00
	← Gizburdt left	11:00
	→ rnsanchez joined	11:00
	→ teran_ joined	11:01
	→ arietis joined	11:01
	← kotopies left	11:01
	← Error404NotFound left	11:01
	← AccessibleWeb left	11:02
	← watabou left	11:02
	← luc_ left	11:03
	→ w41 joined	11:04
	← teran left	11:04
	← shruggar left	11:04
	→ shinnya joined	11:05
	← optixx left	11:06
	→ HelperW joined	11:06
	← Wizek left	11:08
	→ sohail joined	11:10
	→ Wizek joined	11:11
	← astrozyk left	11:11
	← w41 left	11:12
	← k4r1m left	11:14
	→ AccessibleWeb joined	11:14
	← AccessibleWeb left	11:15
	← rockfruit left	11:15
	→ HelperW_ joined	11:15
	← draftqin left	11:15
	→ AccessibleWeb joined	11:15
	→ Gizburdt joined	11:16
	← HelperW left	11:17
	→ yacks joined	11:18
	→ simesy joined	11:18
	← AccessibleWeb left	11:20
	→ moberberger_ joined	11:21
	→ thierryp joined	11:21
	← harobed left	11:21
	← dualmal left	11:21
	→ mellernoia joined	11:21
	← simesy left	11:23
	← moberberger left	11:23
	→ Kayra joined	11:24
	← thierryp left	11:25
	→ VinceZa joined	11:26
	← Entomo left	11:27
	→ chimay joined	11:28
	→ ilmgb joined	11:28
	→ eletuchy joined	11:28
	→ samsamm777 joined	11:28
	← glebihan left	11:29
	← jargon left	11:30
	→ simesy joined	11:30
	← simesy left	11:31
	← ilmgb left	11:31
	→ kriks joined	11:32
	← nuck left	11:32
	← eletuchy left	11:32
	← LeMike left	11:32
	→ rockfruit joined	11:33
	← BadProphet left	11:34
	← Gizburdt left	11:34
	→ nuck joined	11:35
	→ davispuh joined	11:35
	→ BadProph_ joined	11:36
	→ robarell_ joined	11:36
	← VinceZa left	11:36
	→ nkr joined	11:37
	→ simesy joined	11:37
	→ VinceZa joined	11:38
	→ matheus23 joined	11:38
	→ Gizburdt joined	11:39
	← simesy left	11:40
	← Wizek left	11:40
	← robarell_ left	11:41
	→ AccessibleWeb joined	11:41
	→ msafi1 joined	11:41
	← msafi left	11:41
	← zz_chamunks left	11:41
	← mrjensen left	11:42
	← robustus left	11:42
	→ mrjensen joined	11:42
	→ zz_chamunks joined	11:42
	→ Wizek joined	11:43
	→ robustus joined	11:43
	← Joost` left	11:43
	← samsamm777 left	11:44
	← raven-au left	11:45
	→ shruggar joined	11:45
	← voxadam left	11:47
	→ raven-au joined	11:47
	→ Joost` joined	11:47
	→ ignas joined	11:47
	← rfoust left	11:49
	→ jenrzzz joined	11:49
	→ diegoviola joined	11:49
	→ tokik joined	11:50
	→ daito joined	11:50
	← dsdeiz left	11:51
	← pikaren left	11:51
	← jenrzzz left	11:51
	← ni__ left	11:52
	→ Celm joined	11:52
	← Neon1024 left	11:54
	← Luke-Jr left	11:54
	→ Luke-Jr joined	11:55
	→ bwaxxlo joined	11:55
	← teran_ left	11:56
user258467	Vampire0, thanks for answer what is exactly @{u}?	11:56
bwaxxlo	how do I do pattern matching in git?	11:56
	← msafi1 left	11:56
	← Celm left	11:57
	→ jamieshepherd joined	11:57
bwaxxlo	say I have folders "/PersonOne", "/PersonTwo" & "/PersonThree"	11:57
	I want to avoid tracking files in all folders starting with "/Person.."	11:57
	→ msafi joined	11:58
	← daito left	11:58
Vampire0	user258467, man git rev-parse	11:58
gitinfo	user258467: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html	11:58
	→ harobed joined	11:58
bwaxxlo	how do I do pattern matching in git?	11:59
	say I have folders "/PersonOne", "/PersonTwo" & "/PersonThree"	11:59
	I want to avoid tracking files in all folders starting with "/Person.."	11:59
	→ Neon1024 joined	11:59
	← gain left	11:59
	→ watabou joined	11:59
Vampire0	bwaxxlo, man git ignore	11:59
gitinfo	bwaxxlo: the git manpage is available at http://jk.gs/git.html	11:59
	← francisfish left	12:00
Vampire0	hm, no, thats not right	12:00
	← zumba_addict left	12:00
Vampire0	bwaxxlo, man gitignore	12:00
gitinfo	bwaxxlo: the gitignore manpage is available at http://jk.gs/gitignore.html	12:00
Vampire0	ah, that should be it	12:00
	→ goTAN joined	12:00
	→ nbouscal joined	12:00
	← AccessibleWeb left	12:01
	← bl4ckdu5t left	12:01
	← canton7-mac left	12:01
	→ AccessibleWeb joined	12:01
	→ francisfish joined	12:01
	→ canton7-mac joined	12:01
	← dgeary2 left	12:02
	← AccessibleWeb left	12:02
	→ AccessibleWeb joined	12:03
	→ LBV_User joined	12:03
	← diegoviola left	12:03
	→ bartman`` joined	12:03
	← watabou left	12:03
	← m0nkmaster left	12:04
	← aspiers left	12:04
	← j0ran left	12:05
	← ignas left	12:05
	→ tmcmahon joined	12:05
	→ CheckDavid joined	12:07
	← rob_w left	12:07
	← Joost` left	12:07
	→ lasserix joined	12:08
	← Kayra left	12:08
	← talios left	12:08
	← Wizek left	12:09
bwaxxlo	Vampire0: still doesn't help	12:09
	I was actually reading the same page under a different domain	12:09
	→ gua_ould joined	12:09
	← ferreum left	12:10
bwaxxlo	I guess it's using regex like patterns which is slightly complicated when used with git	12:10
	← raven-au left	12:10
bremner	bwaxxlo: it's not regex but "file globs", which are simpler	12:11
jast	/Person*	12:11
	done!	12:11
bremner	and then yeah, there are complications specific to gitignore	12:11
	→ LeMike joined	12:11
bwaxxlo	jast: you fookin genius	12:11
	it's so simple it's stupid	12:12
	← francisfish left	12:12
jast	sorry to disappoint :}	12:12
bwaxxlo	nah! it worked	12:12
	→ fanno joined	12:12
	→ dragon3_ joined	12:12
	← bartman`` left	12:12
bwaxxlo	I tried ** before but never thought * alone would work	12:12
	→ Guest___ joined	12:12
bwaxxlo	jast: cheers man...	12:13
jast	typically the difference is that ** matches arbitrary depths, whereas * matches only one component	12:13
	→ rfoust joined	12:13
jast	in git, whenever a pattern matches some directory, git never even looks at the stuff below it	12:13
	so * is sufficient for most things	12:13
	← vtunka left	12:14
	→ jenrzzz joined	12:14
	← tmcmahon left	12:14
	← mrjensen left	12:15
	→ pwnz0r joined	12:15
	→ meibumei joined	12:15
	→ Macaveli joined	12:15
	← dragon3_ left	12:15
	← rfoust left	12:16
	← jenrzzz left	12:16
	→ mrjensen joined	12:16
	→ teran joined	12:16
	→ bwaxxlo_ joined	12:17
	→ callmeDarwin joined	12:17
	→ armin joined	12:18
armin	is my assumption correct, that the only reason one would do a "git rebase master" after a "git pull origin master" is to kindof hide the merge commit in the log?	12:18
	→ momomomomo joined	12:18
Vampire0	bwaxxlo, this is Git, not Ant. ;-)	12:19
	← pwnz0r left	12:19
	→ juliohm joined	12:19
	← meibumei left	12:19
	← bwaxxlo left	12:19
	→ raven-au joined	12:19
tobiasvl	armin: yes, in a way - you don't create a separate merge commit	12:20
jast	armin: I can't think of any sane reason to use that combination	12:20
tobiasvl	armin: http://git-scm.com/book/ch3-6.html	12:20
	→ Wizek joined	12:20
Vampire0	essentially the rebase will always be a no-op after the merge, wouldn't it?	12:20
	← bwaxxlo_ left	12:20
	→ xunil joined	12:20
	→ sig joined	12:20
Vampire0	s/wouldn't/wont/	12:21
tobiasvl	Vampire0: after the merge, yes, sure	12:21
sig	hi, can I git stash apply -- just_a_single_file ?	12:21
tobiasvl	then there's nothing to merge	12:21
	→ harish joined	12:21
	→ ndngvr joined	12:21
sig	it says no valid stash state found	12:21
	can I cat a file from a revision?	12:21
jast	sure	12:21
sig	something like git cat stash{0} myfile.txt	12:22
jast	git cat-file blob <commit>:path/to/file	12:22
sig	blob...	12:22
tobiasvl	jast: git show vs git cat-file?	12:22
jast	in this case? no difference, except show uses a pager by default if you don't redirect its output	12:22
	→ ferreum joined	12:23
sig	hmmh... how do I get the blob	12:23
	← Kneferilis left	12:23
sig	also, why isn't commit (stash{0}) and path/to/file enough...	12:23
jast	the difference is more interesting for other object types, where cat-file gives you the raw form by default and show formats it	12:24
	sig: the literal word 'blob'	12:24
sig	:D aight	12:24
	← lasserix left	12:25
sig	jast: tanks!	12:26
	→ eletuchy joined	12:26
	→ simesy joined	12:26
	→ paulweb515 joined	12:30
	← moritzs left	12:30
	← paulweb515 left	12:30
	→ paulweb515 joined	12:30
	← eletuchy left	12:31
	→ bwaxxlo joined	12:31
	← Guest___ left	12:32
bwaxxlo	irc was being stubborn	12:32
	→ Lemony joined	12:33
	→ emergion joined	12:34
	← stamina left	12:34
	← emergion left	12:34
	← freestyl3r left	12:35
	→ cgar joined	12:35
	→ davividal joined	12:36
	→ Joost` joined	12:36
	→ IrishPrime joined	12:36
	← VinceZa left	12:37
	→ robarell_ joined	12:37
	← Lemony left	12:40
	→ _tpavel joined	12:40
	← Joost` left	12:41
	← wrouesnel left	12:41
	← robarell_ left	12:41
	← ldiamond_ left	12:41
	← a-l-e left	12:44
	← duckydan left	12:44
	→ ni__ joined	12:45
	→ dsdeiz joined	12:45
	→ francisfish joined	12:46
	← netcarver left	12:47
	→ ayaz joined	12:47
	→ Droolio joined	12:48
	→ Joost` joined	12:48
	→ jackneill joined	12:49
	→ cannonball joined	12:50
	← Xethron left	12:51
	← nkr left	12:52
	→ Xethron joined	12:54
	← shinnya left	12:54
	→ dougsland joined	12:55
	→ thiago joined	12:56
	→ ilmgb joined	12:58
	→ a-l-e joined	12:59
	→ FreezingCold joined	12:59
	← ahf left	12:59
	→ ahf joined	13:01
	← nbouscal left	13:01
	← Guest59300 left	13:02
	→ Guest59300 joined	13:02
	Guest59300 → deepy	13:02
	← ilmgb left	13:03
	→ prosana joined	13:04
	→ rfoust joined	13:04
	→ h0bbit joined	13:04
	→ l_casawi99 joined	13:04
	→ jxpx777 joined	13:05
	← l_casawi99 left	13:06
	→ polyzen joined	13:06
	→ crystal77 joined	13:07
	→ VinceZa joined	13:08
	← matteo left	13:08
	← AccessibleWeb left	13:08
	← pilif left	13:09
	→ pilif joined	13:09
	→ j0ran joined	13:09
	← moberberger_ left	13:09
	→ AccessibleWeb joined	13:09
	← AccessibleWeb left	13:11
	← xificurC_ left	13:11
	→ AccessibleWeb joined	13:11
	→ MattStratton joined	13:11
	← Droolio left	13:12
	← MattStratton left	13:14
	→ livingstn joined	13:15
	→ Kayra joined	13:15
	→ cjwilburn joined	13:15
	→ MattStratton joined	13:15
	→ FortySix2 joined	13:16
	→ vtunka joined	13:17
	→ hellopat joined	13:17
	← FortySix2 left	13:18
	← thiago left	13:18
	→ FortySix2 joined	13:19
	← Devastator left	13:20
	→ Devastator joined	13:20
	← PeterBooker left	13:20
	→ xificurC joined	13:21
	← francisfish left	13:21
	→ PeterBooker joined	13:22
	→ hellopat_ joined	13:23
	→ jcvfen joined	13:23
murosai	im trying to integrate meld into git and i ran git config --global diff.external meld, git diff file still opens the regular diff however	13:24
	→ francisfish joined	13:24
	← kamal_ left	13:25
	← hellopat left	13:25
	→ paul424 joined	13:25
canton7-mac	murosai, were you after man git difftool ?	13:25
gitinfo	murosai: the git-difftool manpage is available at http://jk.gs/git-difftool.html	13:25
	← rockfruit left	13:25
	→ kamal_ joined	13:26
	→ clone1018 joined	13:26
	← Joost` left	13:26
Vampire0	probably :-)	13:26
	→ Mitchbones joined	13:26
paul424	I just don't know how to exchange one file	13:27
	→ eletuchy joined	13:27
canton7-mac	hmm?	13:27
paul424	for another ... I copy pasted the file on the dir	13:27
murosai	well even git difftool --tool=meld file won't work	13:27
canton7-mac	murosai, define 'won't work'	13:27
paul424	but git insist that nothing was aded	13:27
murosai	it opens the regular diff	13:28
	not meld	13:28
canton7-mac	murosai, 'git difftool' won't open a regular diff. it should prompt you whether you want to launch your difftool	13:28
paul424	naah what a f****cker now it says 1 file changed >_>	13:28
	← paul424 left	13:28
murosai	well it's not doing that :P	13:29
canton7-mac	murosai, !repro	13:29
gitinfo	murosai: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	13:29
	← luriv left	13:29
murosai	well git diff file and git difftool file produces exactly the same output, git diff is just scrollable	13:30
	git difftool file \| less and it's the same thing	13:31
	→ hholtmann joined	13:31
	← eletuchy left	13:31
canton7-mac	I find that very odd indeed	13:31
	er, try unsetting diff.external	13:32
	→ moritzs joined	13:32
	→ b4rbz joined	13:34
	→ hafeez3000 joined	13:34
	← BadProph_ left	13:34
	→ topwobble joined	13:34
	← beautifulmind left	13:35
	→ mizu_no_oto joined	13:35
murosai	not working, git mergetool however works	13:36
	→ jargon joined	13:36
	← AccessibleWeb left	13:37
	→ robarell_ joined	13:37
	→ AccessibleWeb joined	13:38
	→ dragon3_ joined	13:38
	← AccessibleWeb left	13:38
	→ AccessibleWeb joined	13:39
	→ chiromante joined	13:39
	← momomomomo left	13:39
	→ ErKa joined	13:39
	→ duckydan joined	13:40
	→ cwillu_at_work joined	13:40
	← hholtmann left	13:42
	← robarell_ left	13:42
	→ jenrzzz joined	13:42
	→ treehug88 joined	13:42
	→ Dougie187 joined	13:43
	→ Neozonz\|Disc joined	13:43
murosai	now i just need to figure out what the heck the meld output means :p	13:44
	← jenrzzz left	13:44
	← m0viefreak left	13:45
canton7	reading diffs is a skill. don't let anyone tell you otherwise	13:45
qknight	Vampire0, tave: i've tried now several things and the only way to remove the branches on the remote was to use: 'git push origin --delete mybranch'. using 'git push origin :mybranch' with 'git fetch -p' deleted it locally and then restored it afterwards thus the remote side was never affected	13:47
	Vampire0: thanks for your hlep btw	13:47
	← lite_ left	13:48
	← francisfish left	13:48
	← VinceZa left	13:49
	→ fatalhalt joined	13:49
	→ jnavila_ joined	13:49
	← b4rbz left	13:50
	→ BadProphet joined	13:50
	→ francisfish joined	13:50
	← kesha left	13:51
	← ni__ left	13:52
	← Pwnna left	13:52
	← ErKa left	13:52
	← jnavila left	13:53
	← papegaaij left	13:53
	→ lavaman joined	13:53
	→ Celm joined	13:53
	← deryni left	13:54
	→ Pwnna joined	13:54
	← mancha left	13:54
	← thoraxe left	13:54
	→ deryni joined	13:55
	← PerlJam left	13:55
	→ daito_ joined	13:55
	→ PerlJam joined	13:55
	→ thoraxe joined	13:55
	→ mancha joined	13:56
murosai	is it possible to get a copy of "their" and "our" copy in merge situation?	13:56
canton7-mac	there's some magic 'git show' syntax iitc	13:56
	*iirc	13:56
	← dragon3_ left	13:56
	→ dragon3_ joined	13:56
	→ CKyle joined	13:56
thegorn	murosai: actually what i find really helpful is merge.conflictstyle=diff3	13:57
canton7-mac	that is really very useful ^^	13:57
	→ GT4066 joined	13:57
thegorn	and then each merge conflict has theirs, yours, original	13:57
xender	Yeah, I wonder why diff3 is not the default	13:57
thegorn	i don't know, i wish it were the default	13:57
	← Celm left	13:57
	← dsdeiz left	13:57
thegorn	but i found it, set it as default and only care a little bit now that it isn't default on out-of-the-box git :)	13:58
canton7-mac	ah there we go, you can show :1:path/to/file, :2:path/to/file and :3:path/to/file	13:58
	and I can't remember which is which	13:58
	→ becks__ joined	13:58
	→ G________ joined	13:58
xender	Also, anyone knows what is the nature of cases when git tells there is conflict that it cannot 3-way merge, but p4merge when ran does it automatically and shows 0 conflicts?	13:58
thegorn	:1 = common ancestor, :2 = current branch :3 = what you are merging	13:59
canton7-mac	cheers	13:59
xender	All you need to do is run mergetool, look around, save, and done. Why Git's doesn't handle it by itself?	13:59
	← soee left	13:59
	← daito_ left	13:59
thegorn	xender: i haven't seen that, maybe next time you see it might be worth sending in the diff to the mailing list as a test-case	14:00
canton7-mac	different 3-way merge tools make different decisions on whether something might be a conflict or not	14:00
	I think if git sees two lines added at the same point, it'll mark it as a conflict. other tools might not	14:00
thegorn	i'm guessing it has more to do with how much context has to match before git vs p4merge assumes ok to merge	14:00
xender	canton7-mac: I think p4merge will show conflict, because order of that lines can matter	14:01
	← AccessibleWeb left	14:01
	→ Accessib_ joined	14:01
xender	Maybe it's when there are different changes in same line that can be 3-way merged?	14:01
	Does git operate line-wise or character-wise?	14:01
	(Git's 3-way merge)	14:01
	← G________ left	14:01
	→ Noldorin joined	14:01
thegorn	i cna't imagine anyone's works character-wise, that sounds like a disastor waiting to happen	14:02
	← sweetyReaper left	14:02
Vampire0	qknight, "--delete foo" and ":foo" are identical :-/	14:02
	← Macaveli left	14:03
	← mizu_no_oto left	14:03
	→ betelgeu1e joined	14:03
	← crystal77 left	14:03
	→ ni__ joined	14:03
	→ G________ joined	14:03
	→ sdouglas joined	14:03
	← endiruna left	14:04
	← JesseCW left	14:05
	← hkon_ left	14:05
	→ JesseCW joined	14:05
	→ JesseC-Work joined	14:07
	JesseCW → Guest48698	14:07
	→ ErKa joined	14:07
	← sdouglas left	14:08
	← becks__ left	14:09
	→ JerryT joined	14:09
	→ becks__ joined	14:09
	→ thiago joined	14:10
	← Guest48698 left	14:10
	← JesseC-Work left	14:11
	→ JesseC-Work joined	14:11
	→ devoldmx joined	14:12
	→ NimeshNeema joined	14:13
	← becks__ left	14:13
	→ alexlindenlevy joined	14:14
	→ b4rbz joined	14:14
	← polyzen left	14:15
	→ dik_dak joined	14:15
	← DoniRS left	14:15
	← thiago left	14:17
	→ shiroyamakota_ joined	14:17
	→ PeterBoo joined	14:18
	← robbyoconnor left	14:18
	← jatt left	14:19
	→ zumba_addict joined	14:19
	← PeterBooker left	14:20
	← rnsanchez left	14:20
	→ thedodd joined	14:22
	→ rockfruit joined	14:23
	→ thiago joined	14:25
	← sanjayu left	14:26
	← Cerise left	14:26
	← Chryyz left	14:27
	→ rgr joined	14:27
	→ telesto joined	14:27
	→ sweetyReaper joined	14:28
	→ eletuchy joined	14:28
	← Luke-Jr left	14:28
	→ Cerise joined	14:28
	← Cerise left	14:28
	→ Cerise joined	14:28
	→ fjfish joined	14:28
	← JesseC-Work left	14:29
	← simesy left	14:29
	→ JesseCW joined	14:29
	← JesseCW left	14:29
	→ rmaximus joined	14:29
	← PeterBoo left	14:29
	→ JesseCW joined	14:30
	← CKyle left	14:30
	→ kesha joined	14:30
	← rockfruit left	14:30
	← francisfish left	14:30
	← kbart left	14:31
	→ CKyle joined	14:32
	→ Luke-Jr joined	14:32
	← Anony987 left	14:32
	← sweetyReaper left	14:32
	→ AccessibleWeb joined	14:32
	← Accessib_ left	14:32
	← sschonert left	14:32
	← eletuchy left	14:32
	→ Anony987 joined	14:32
	→ rnsanchez joined	14:32
	← jrdavid left	14:33
	← _ikke_ left	14:33
	← AccessibleWeb left	14:33
	→ becks__ joined	14:33
telesto	Hey all, had a high level question about best practices on handling production files with Git and Grunt, if anyone has any comments: http://pastebin.com/bqFjpm5s	14:34
	← topwobble left	14:34
	→ AccessibleWeb joined	14:34
	→ Testy-Bot joined	14:35
canton7-mac	don't commit build artifacts to the repository	14:36
	don't deploy using git directly	14:36
	← ferreum left	14:36
	→ akim_ joined	14:36
	→ EminenceHC joined	14:37
	← LBV_User left	14:37
canton7-mac	git is not a deployment mechanism for many reasons, one of which is your issue. it's OK to trigger a deployment by pushing to a git repo, but there needs to be a distinct deployment step, somewhere, which reads in your source code, compiles it, sets up production configuration, packages it up, and sends it to the production machine in an atomic manner	14:37
	akim_ → akim	14:38
	→ LBV_User joined	14:38
	→ doev joined	14:38
	← AccessibleWeb left	14:38
	→ robarell_ joined	14:38
	→ AccessibleWeb joined	14:39
	→ Macaveli joined	14:39
	← thiago left	14:40
	← gabedain left	14:41
	→ gabedain joined	14:42
	→ SocalNick joined	14:42
	← robarell_ left	14:43
	→ macabre joined	14:43
	← Macaveli left	14:43
	→ Macaveli joined	14:44
	→ zq joined	14:45
	→ tyreld joined	14:45
	← _tpavel left	14:45
	← makubi left	14:45
	→ PeterBooker joined	14:47
	→ makubi joined	14:47
	→ jefflyne joined	14:47
	→ hirani joined	14:48
	← JesseCW left	14:48
	← juliohm left	14:49
	← Macaveli left	14:49
	→ Angelous joined	14:50
	← chimay left	14:50
	→ DrShoggoth joined	14:50
	← stodan left	14:50
telesto	Ok. That makes sense. Any recommendations on what handles that deployment step -- is that what people use things like TeamCity and Jenkins for?	14:50
canton7-mac	sure, they can help with the compilation/config/creating a package	14:51
zq	is there a proper way to maintain only patches against a larger repo, without checking in the contents of said repo?	14:51
	→ mizu_no_oto joined	14:51
	→ xlinkz0_ joined	14:51
	← rnsanchez left	14:52
telesto	Alright. That makes a lot of sense and explains why I couldn't find many solutions based on production files in the repo. Thanks.	14:52
	→ maestrojed joined	14:52
canton7-mac	for actually getting that onto the server, rsync is popular (and ln -s for atomically switching the files used), or something like capistrano	14:52
	→ rudisimo joined	14:52
	← LBV_User left	14:52
	→ oodavid joined	14:52
canton7-mac	zq, that's called a branch ;)	14:53
	→ GodPuppet joined	14:53
telesto	Unfortunately a lot of our projects are Windows based so our options there might be more limited, though I'm guessing capistrano could probably work with Ruby in a Windows environment	14:53
	→ LBV_User joined	14:53
lov	telesto: !deploy	14:53
gitinfo	telesto: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	14:53
lov	but yeah, there are Tools for deploying your content.	14:53
	← xlinkz0 left	14:53
bwaxxlo	for git difftool, can you set the tool to be your text editor? Or do you have to use vim/visual studio	14:54
zq	canton7-mac: branching requires that i check in the bigger repo	14:54
lov	You can tie them as a post-build step to jenkins or something, but you should really not be using git for this in nearly every case	14:54
canton7-mac	zq, what?	14:54
zq	canton7-mac: which could be arbitrarily large	14:54
telesto	We're currently using Beanstalk (beanstalkapp.com) which is kind of build around deploying Git via the repo, so that's probably where some of my confusion came from	14:54
	→ lmatteis joined	14:54
bwaxxlo	I tried setting one but couldn't	14:54
canton7-mac	zq, what is "the bigger repo"?	14:54
	← b4rbz left	14:54
	← _5kg left	14:54
	← Guest37155 left	14:54
	→ Guest37155 joined	14:54
	Guest37155 → digifiv5e	14:54
lov	bwaxxlo: any editor that will handle diffs will do.	14:54
	You may need to look at the arguments, etc	14:54
bwaxxlo	lov: I tried but it doesn't allow e.g notepad++	14:55
lov	define "it doesn't allow"	14:55
zq	canton7-mac: i don't understand your question	14:55
	← arietis left	14:55
lov	telesto: my recommendation is to read beanstalk's documentation, since it sounds like your problem is already solved.	14:55
canton7-mac	zq, you said "branching means that I check in the bigger repo". I'm wondering what you meant by "the bigger repo"	14:55
bwaxxlo	I did "git difftool --tool='Path to my editor' "	14:55
	← Sicp left	14:55
lov	bwaxxlo: you may need to give it the arguments to pass in the right order too	14:56
	→ Macaveli joined	14:56
lov	!diff-tool	14:56
	hum.	14:56
	← Tronsha left	14:56
canton7-mac	bwaxxlo, did you read the docs for --tool ?	14:56
lov	bwaxxlo: http://git-scm.com/book/en/Customizing-Git-Git-Configuration#External-Merge-and-Diff-Tools	14:56
canton7-mac	to use a custom tool, you need to add some config to .git/config telling git how exactly to invoke your tool	14:56
bwaxxlo	yep...and I went to check allowed difftools	14:56
zq	canton7-mac: i have a repo, R, for which i'm writing a plugin that would reside inside R's tree. how would i use git to track only the changes of my plugin without having to check in R in its entirety?	14:56
bwaxxlo	using "git difftool --tool-help"	14:57
	→ ojacobson joined	14:57
bwaxxlo	all of that kicks me out	14:57
	← jamieshepherd left	14:57
bwaxxlo	^ignore that plz	14:57
canton7-mac	zq, oh! you're after submodules?	14:57
	!submodule	14:57
gitinfo	git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	14:57
	→ ehmatthes joined	14:57
	→ jenrzzz joined	14:57
bwaxxlo	I meant it only lists vim/visual studio and some other weird tools	14:57
telesto	lov: Huh, I'll check that. I know Beanstalk can trigger web hooks which could then do the production build, if that's what you mean?	14:58
	← oodavid left	14:58
	← freimatz left	14:58
canton7-mac	bwaxxlo, so if you want 'git difftool' to call a tool which isn't in the pre-supported list, you need to configure it in .git/config	14:58
	as the docs for --tool say	14:58
bwaxxlo	cool!	14:58
	← vtunka left	14:58
bwaxxlo	canton7-mac: will do	14:58
	→ oodavid joined	14:58
zq	canton7-mac: but don't submodules strictly reside within a larger source tree?	14:58
canton7-mac	define what you mean by "strictly reside within a large source tree"	14:59
	← mrjensen left	14:59
	← Testy-Bot left	14:59
	→ xlinkz0__ joined	14:59
	← xlinkz0_ left	14:59
canton7-mac	throwing ambiguous and ill-defined terms in your statements don't aid anything :P	14:59
zq	it means exactly what it sounds like	14:59
	← jenrzzz left	14:59
zq	a submodule S of a repo R must live inside R's directory	14:59
canton7-mac	the object database for S is not stored in R	15:00
	that's the entire. point. of. submodules.	15:00
	← nnyk_ left	15:00
	← JohnBat26 left	15:00
zq	you're assuming that i can modify R, which i can't	15:00
	→ _ikke_ joined	15:00
	← tokik left	15:00
canton7-mac	I'm really lost as to what you want, then	15:00
	→ teran_ joined	15:00
	→ shuaib joined	15:01
canton7-mac	you were keeping a set of patches, and wanted to know how to manage them	15:01
	→ koell joined	15:01
canton7-mac	a set of patches is a branch. you can have a local branch which doesn't have impact at all on any other repos apart from the one on your machine, if you want	15:01
	← FilipNortic left	15:01
	← soerenbf left	15:01
qknight	Vampire0: i wonder why it didn't do the same here ;P	15:02
jast	FWIW I don't understand the question either	15:02
	← shiroyamakota_ left	15:02
	← Raging_Hog left	15:02
	← teran_ left	15:02
jast	the initial question sounds like it's about patch queueing	15:02
	← ArSn left	15:02
	→ ethlor joined	15:02
lov	telesto: sure? I've never used beanstalk so I don't know, but since they bill themselves as providing a way to deploy I assume it's possible.	15:02
	← tave left	15:02
	→ shiroyamakota_ joined	15:02
	← Gizburdt left	15:02
	→ teran_ joined	15:02
telesto	Gotcha	15:03
	→ DoniRS joined	15:03
	← teran left	15:04
	← rath left	15:04
	→ GuestO1102 joined	15:04
	← CodePulsar left	15:05
	← maestrojed left	15:05
	← shuaib left	15:06
	→ luriv joined	15:06
	→ rnsanchez joined	15:07
	← xificurC left	15:08
	← h0bbit left	15:08
	→ pweaver_ joined	15:08
Vampire0	qknight, you should probably report it as bug. According to the man page it does the same	15:09
	← lavaman left	15:09
	→ robarell_ joined	15:09
	← raven-au left	15:09
	→ fr33 joined	15:09
	← kesha left	15:10
	← dragon3_ left	15:10
	← luriv left	15:10
	→ kesha joined	15:10
	← bbloom left	15:10
	→ raven-au joined	15:10
	← LBV_User left	15:10
	→ luriv joined	15:10
	→ LBV_User joined	15:11
	→ cllamas joined	15:11
	← xlinkz0__ left	15:11
	→ Destos joined	15:11
	→ xlinkz0__ joined	15:11
	← jefflyne left	15:12
	← user258467 left	15:12
	← cbreak-work left	15:12
	← koell left	15:12
	→ koell joined	15:13
	→ soerenbf joined	15:14
	← CKyle left	15:14
	← john2x left	15:14
	← LeMike left	15:15
	← yacks left	15:15
	← kesha left	15:15
	→ bbloom joined	15:16
	→ DolphinDream joined	15:16
	→ hholtmann joined	15:17
	→ PeterBoo joined	15:18
	→ jenrzzz joined	15:18
	← AccessibleWeb left	15:19
	→ beyondcreed joined	15:19
	← beyondcreed left	15:19
	→ beyondcreed joined	15:19
	→ Accessib_ joined	15:19
	← ErKa left	15:19
	← fragamus left	15:19
	→ planB joined	15:19
	← jenrzzz left	15:20
	→ nbouscal joined	15:20
	→ vijay13 joined	15:20
	← Evanlec left	15:20
	← Angelous left	15:20
	→ Angelous joined	15:20
	→ FortySix_ joined	15:20
	→ ErKa joined	15:20
	← soerenbf left	15:21
	→ arietis joined	15:21
	→ CodePulsar joined	15:21
	→ Evanlec joined	15:22
	← PeterBooker left	15:22
	← paulweb515 left	15:22
	→ danman_ joined	15:22
	→ obert joined	15:22
	← dik_dak left	15:22
	← nilg left	15:23
	→ jenrzzz joined	15:23
	→ starkhalo joined	15:23
	→ recycle joined	15:23
	← FortySix2 left	15:24
	← jenrzzz left	15:24
	← goTAN left	15:24
	← ayaz left	15:26
	← brisbin left	15:28
	← jceb left	15:28
	→ nilg joined	15:29
	→ eletuchy joined	15:29
	← DoniRS left	15:30
	← zoso left	15:30
	← ghostlines left	15:30
	→ rockfruit joined	15:31
	← rockfruit left	15:31
	→ teran joined	15:31
	→ tang^ joined	15:31
	← kermit left	15:31
	→ aboba joined	15:32
	← Dudi left	15:32
	← Garheade\|AFK left	15:32
	→ matteo joined	15:32
	← hafeez3000 left	15:33
	← eletuchy left	15:33
	→ paulweb515 joined	15:33
	→ lavaman joined	15:33
	← thevishy left	15:34
	← teran_ left	15:34
	→ bwreilly joined	15:35
	→ whitby joined	15:35
	← arietis left	15:35
	← gua_ould left	15:36
	← Lunatrius left	15:37
	→ nayak94 joined	15:37
	→ mf___ joined	15:38
	→ dik_dak joined	15:38
	→ _5kg joined	15:38
	← alorence left	15:38
	→ Raging_Hog joined	15:38
	← mf_ left	15:38
	→ infynyxx joined	15:38
	← Macaveli left	15:38
	← Xethron left	15:38
	← Sonderblade left	15:39
	→ CKyle joined	15:39
	→ eletuchy joined	15:39
	→ GtaTg joined	15:39
	→ arietis joined	15:40
	→ simesy joined	15:40
	→ brisbin joined	15:40
	← Accessib_ left	15:41
	← Evanlec left	15:41
	→ AccessibleWeb joined	15:41
	→ chrisshattuck joined	15:42
	← infynyxx left	15:42
	← chrisshattuck left	15:43
	← Balliad left	15:43
	← eletuchy left	15:43
	→ rainmanjam joined	15:43
	→ Accessib_ joined	15:44
	← simesy left	15:44
	← jagob left	15:44
	→ lolmaus joined	15:44
	← GtaTg left	15:44
	→ hooper joined	15:45
	← jargon left	15:45
	← AccessibleWeb left	15:45
	← SocalNick left	15:45
	← mbrgm left	15:46
	→ Droolio joined	15:47
	← pduin left	15:47
	← macabre left	15:47
	→ rockfruit joined	15:47
	→ Lunatrius joined	15:47
	→ macabre joined	15:47
	← ehmatthes left	15:48
	← cjwilburn left	15:48
	→ Harzilein joined	15:49
Harzilein	hi	15:49
	is there an existing script to "check out" blob references as if they were files?	15:49
	→ maestrojed joined	15:49
	→ SocalNick joined	15:49
Harzilein	i.e. it should work like checkout but the files should only contain the relevant hash	15:49
	→ Celm joined	15:50
	→ GtoPk joined	15:50
canton7	slightly confused if I'm honest	15:50
	← Wizek left	15:50
ojacobson	"work like checkout" implies things like moving HEAD and updating the staging area	15:51
Eugene	Harzilein - man git-show	15:51
gitinfo	Harzilein: the git-show manpage is available at http://jk.gs/git-show.html	15:51
canton7	so if foo/bar existed in the tree, the file foo/bar would be created containing a single line, which was its blob hash?	15:51
ojacobson	is that _really_ what you mean?	15:51
Harzilein	Eugene: yeah, i'm quite sure the script would involve git show	15:51
	canton7: yes	15:51
canton7	git ls-tree -r would be the tool here, I think?	15:52
	→ cjwilburn joined	15:52
	→ jenrzzz joined	15:52
Harzilein	well, i was just wondering if someone had this idea before	15:52
canton7	or actually, let's do this with a smudge filter	15:52
Harzilein	canton7: that sounds promising	15:52
	← naxin left	15:53
Harzilein	canton7: it would be ideal if i could even add a new blob through the command line, then change the hash in some file, then add and commit that change	15:53
	← Raging_Hog left	15:53
	→ Gizburdt joined	15:53
	← macabre left	15:53
canton7	Harzilein, you could probably do that with a clean filter	15:53
	← jenrzzz left	15:53
	→ dreiss joined	15:53
	→ infynyxx joined	15:53
	→ Dudi joined	15:53
	→ vtunka joined	15:54
jast	!xy...	15:54
gitinfo	Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	15:54
	← GtoPk left	15:54
jast	in the meantime I'm gonna head home :}	15:54
Eugene	Harzilein - man git-hash-object; man git-write-tree; man git-commit-tree ;-)	15:54
gitinfo	Harzilein: the git-hash-object manpage is available at http://jk.gs/git-hash-object.html	15:54
	Harzilein: the git-write-tree manpage is available at http://jk.gs/git-write-tree.html	15:54
	Harzilein: the git-commit-tree manpage is available at http://jk.gs/git-commit-tree.html	15:54
Harzilein	yeah, okay, let me tell you the background	15:54
grawity	and `man git mktree` while you're at it	15:54
gitinfo	the git-mktree manpage is available at http://jk.gs/git-mktree.html	15:54
grawity	but generally what jast said	15:54
Eugene	Oh yeah, that one too.	15:54
	← LBV_User left	15:54
Eugene	In fact, write-tree is for the index. mktree is the right one.	15:54
	← doev left	15:54
Harzilein	let me dump those urls to a file	15:55
Eugene	It's just the git man pages	15:55
	← infynyxx left	15:55
canton7	Harzilein, so a smudge filter could be something like 'git ls-tree -r HEAD %f \| awk '{print $3}'	15:55
	← recycle left	15:55
	→ infynyxx joined	15:56
	← Gizburdt left	15:56
	← koell left	15:57
	← gabedain left	15:57
	→ jagob joined	15:57
canton7	and the clean filter something like 'git cat-file -p < $(cat %f)', although that's a bit fugly	15:57
Harzilein	so, about the background, i cloned the slightly massive RosettaCodeData repository, and would like to avoid the waste of disk space of actually checking it out, while still having a relatively sane way to browse it. of course once i get that way, i might want to apply it to projects where i'd actually want to change stuff, and this seems like a neat solution to me. clearly filters are the way to go, because that way git won't get confused by the different s	15:58
	← hooper left	15:59
	→ hooper joined	15:59
canton7-mac	"relatively sane" is relative :P	15:59
	← coasterz left	16:00
	← Accessib_ left	16:00
	→ dmnd joined	16:00
	→ AccessibleWeb joined	16:00
	← dreiss left	16:01
	← callmeDarwin left	16:01
	→ dkpi joined	16:02
	→ Exancillatus joined	16:03
	← brisbin left	16:03
	→ brisbin joined	16:04
	→ sirchopsalot joined	16:04
sirchopsalot	guys, whats the opposite to 'git add <file>' ?	16:04
	as in I want to stop tracking a file	16:05
	← AccessibleWeb left	16:05
ojacobson	sirchopsalot: man git-rm	16:05
gitinfo	sirchopsalot: the git-rm manpage is available at http://jk.gs/git-rm.html	16:05
	← jnavila_ left	16:05
sirchopsalot	thanks ojacobson	16:05
	← alexlindenlevy left	16:05
	→ xmj joined	16:05
	← pweaver_ left	16:05
xmj	moin	16:06
	noob question: how do i create a new branch inside some repo that is completely empty?	16:06
	→ freestyl3r joined	16:06
sirchopsalot	says it 'has changes staged in the index' and wont let me remove the file	16:06
xmj	i.e. master is full of stuff, and 'newbranch' should be completely clean without a delete commit	16:06
canton7-mac	pastie the output of 'git status'	16:06
	sirchopsalot, ^^	16:06
	xmj, should it have a parent, or not?	16:07
Harzilein	canton7: hmm... is there a way to avoid having to use .gitattributes for this?	16:07
canton7-mac	Harzilein, for the smudge/clean stuff? no	16:07
Harzilein	canton7: can i somehow specify the filter in .git/config?	16:07
canton7-mac	well, you can use .git/info/attributes	16:07
Harzilein	:/	16:07
canton7-mac	which isn't tracked	16:07
xmj	canton7-mac: nop	16:07
sirchopsalot	canton7-mac: http://pastie.org/9053447 the audiobus stuff is what im trying to remove	16:07
	← oodavid left	16:08
Harzilein	canton7: that helps, thanks	16:08
canton7-mac	xmj, git checkout --orphan newbranch; git rm -rf .; git commit --allow-empty -m "New empty commit"	16:08
xmj	brilliant	16:08
canton7-mac	sirchopsalot, like git status says, 'git reset HEAd audiobus'	16:08
	→ Gizburdt joined	16:08
Harzilein	canton7-mac: looks like it works.	16:09
canton7-mac	sirchopsalot, it looks like you've git added audiobus, but not committed that add (in which case the operation you want is un-add, rather than remove :P)	16:09
	Harzilein, woop!	16:09
Harzilein	of course it is still massive:	16:09
	harzilein@debian:~/Projects/Git/github.com/RosettaCodeData$ git checkout	16:09
	Checking out files: 35% (26508/75735)	16:09
	← dkpi left	16:09
xmj	canton7-mac: thanks!	16:09
canton7-mac	oh lovely	16:09
	:)	16:09
sirchopsalot	canton7-mac: ahh I see. Yeah the audiobus stuff is stopping me from committing in xcode cause its not acutally in the project, its just in a header file search directory. So if i do git reset head is it branch or the last committ that I need to put after that?	16:10
	canton7-mac: also said un-add is not a command.. :(	16:10
canton7-mac	sirchopsalot, huh? like I said, put 'audiobus'	16:10
	sirchopsalot, and yeah, un-add isn't a command. you use reset for it here	16:11
	git reset HEAD audiobus	16:11
	see the top of the 'git status' output where it says 'git reset HEAD <file>... to unstage'?	16:11
	← mishok13 left	16:11
	→ coasterz joined	16:11
canton7-mac	well you can also pass a whole folder	16:11
	which is what you're doing	16:11
	← dmnd left	16:11
sirchopsalot	canton7-mac: ahh I see!	16:12
	canton7-mac: yes that did exactly what I wanted	16:12
	canton7-mac: the weird thing is that there is more than just those files in the audiobus directory	16:12
	← Gizburdt left	16:12
sirchopsalot	so I wonder why it doesnt' want to track them	16:12
canton7-mac	define 'doesn't want to track them'	16:12
	← coasterz left	16:12
	← ni__ left	16:13
sirchopsalot	ok	16:13
	thats not what I meant	16:13
	as far as I know they're already being tracked	16:13
	which is why it doesnt want to track them	16:13
	so the reset HEAD wont have removed them also, correct?	16:13
	just the ones I staged for commit?	16:13
canton7-mac	really very confused	16:13
sirchopsalot	LOL sorry	16:13
	← blinkdes_ left	16:14
canton7-mac	what are 'they'	16:14
	← rockfruit left	16:14
sirchopsalot	previously I added audiobus header files fine	16:14
canton7-mac	right	16:14
sirchopsalot	and have been committing no problem	16:14
canton7-mac	cool	16:14
sirchopsalot	i tried to add those	16:14
	xcode gave me an error	16:14
canton7-mac	what error?	16:14
sirchopsalot	something about not being able to find them in the project	16:14
	→ el3ctron joined	16:14
sirchopsalot	I can get the actual error, but I'l have to git add one of those files agai	16:14
	→ blinkdesign joined	16:14
sirchopsalot	n	16:14
	→ dreiss joined	16:14
canton7-mac	odd that it does that - just adding a file shouldn't cause that :P	16:15
sirchopsalot	let me get the error hang on	16:15
	← Luke-Jr left	16:15
sirchopsalot	hmm	16:16
	ok that worked?!	16:16
	let me try adding those files again then	16:16
Harzilein	canton7: 40k files in i have only one error with your script. wonder what happened. should add some logging i guess	16:16
sirchopsalot	what can I do to revert the last committ I just made so I can make some changes and recommit?	16:16
	→ Luke-Jr joined	16:16
sirchopsalot	rather than make lots of shitty commits while i test	16:16
milki	sirchopsalot: amend and read !fixup	16:16
gitinfo	sirchopsalot: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	16:16
canton7-mac	Harzilein, I'm impressed! completed untested, that was	16:17
milki	sirchopsalot: or maybe !perfect	16:17
gitinfo	sirchopsalot: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.	16:17
	→ PeterBooker joined	16:18
sirchopsalot	git reset HEAD^ looks like what I need	16:18
canton7-mac	there are nicer ways though :P	16:18
	git commit --amend for starters	16:18
	git commit --fixup (and git rebase -i --autosquash)	16:18
sirchopsalot	ok sounds good	16:18
	← blinkdesign left	16:19
	→ Gamecubic joined	16:19
	← lolmaus left	16:19
	→ Gizburdt joined	16:20
	→ lolmaus joined	16:20
	→ Sample joined	16:20
	← Luke-Jr left	16:20
sirchopsalot	canton7-mac: could I do git reset HEAD^ and then --amend the 'final commit' I made just before that?	16:21
	→ Luke-Jr joined	16:21
	→ AaronMT joined	16:21
sirchopsalot	right now im trying to make a 'real final commit to commit untracked files' commit	16:21
	→ soerenbf joined	16:21
sirchopsalot	which makes me big speech in the last commit message about it being the final look kinda silly	16:21
	my*	16:21
	← soerenbf left	16:22
	← PeterBoo left	16:22
	→ soerenbf joined	16:22
canton7-mac	if you git reset HEAD^, you throw away the last commit. if you then commit --amend, you edit the commit before that one	16:22
	→ acharlieh joined	16:23
canton7-mac	if you've created a load of temporary commits, just rebase -i them all, fixup the ones you want to chuck, and reword the final one	16:23
	→ Evanlec joined	16:23
	→ dkpi joined	16:23
canton7-mac	the links you were given go into a lot of detail	16:23
sirchopsalot	im going to try this reset HARD^ as I didnt expect that commit to work, i was just trying to get the error message to show you	16:23
canton7-mac	HARD^ what?	16:24
	you meant HEAD^ ;)	16:24
sirchopsalot	yeah, but its 2:24am and im trying frantically to upload this before sleep :)	16:24
	yes sorry	16:24
canton7-mac	don't :)	16:24
	late-night commits are the ones that break the build	16:24
sirchopsalot	but im sooo close!	16:24
	← CKyle left	16:24
canton7-mac	if it's a personal project, go for it :P	16:24
sirchopsalot	it is	16:24
canton7-mac	but it's way more efficient to do it tomorrow haha	16:24
sirchopsalot	but its going to the appstore lol	16:25
	yeah i know	16:25
	← Luke-Jr left	16:25
	← welly left	16:25
sirchopsalot	but i just wanna get my spot in that queue	16:25
	→ Luke-Jr joined	16:25
sirchopsalot	but either way	16:25
	I gotta sort this	16:25
	even if i dont upload tonight	16:25
	← zumba_addict left	16:25
ojacobson	sleep dep is known to be _exactly_ as bad for your judgement as alcohol	16:25
sirchopsalot	so im gonna git reset HEAD^	16:25
	then git commit --amend the extra files	16:25
ojacobson	except that people acknowledge their own drunkenness and generally believe that sleep deprivation isn't interfering with their thoughts.	16:26
	→ nnyk_ joined	16:26
ojacobson	Stop.	16:26
	Go to bed.	16:26
	Deal with it in the morning.	16:26
sirchopsalot	im not tired	16:26
ojacobson	Future you thanks you for not blowing his face off.	16:26
	See, there you go	16:26
sirchopsalot	bed time for me is normally 4am	16:26
	haha	16:26
	trust me	16:26
	i fucked up my time zone a long time ago	16:26
ojacobson	yes, I'm going to trust _you_ over well-documented sleep research. That happens.	16:26
	→ zumba_addict joined	16:26
sirchopsalot	the hours or 10pm to 3am are my primetime coding hours	16:26
	→ Chryyz joined	16:26
bwaxxlo	sirchopsalot: welcome to the club of faulty sleeping schedules	16:26
sirchopsalot	bwaxxlo: thanks	16:27
ojacobson	That you can't reliably tell us what commands you're going to run or, apparently, understand what commands people are telling you to run and why, suggests that you're not as awake as you think you are.	16:27
sirchopsalot	bwaxxlo: hoping to take a break from the club after being living it for over a year	16:27
	← canton7-mac left	16:27
sirchopsalot	ojacobson: you would assume I know anything about git	16:27
	and I really dont	16:27
	im still not going to know anything about git tomorrow	16:27
	→ LucasKA joined	16:27
sirchopsalot	but at least now I have people I can ask questions to	16:27
	so here goes nothing anyway	16:28
	→ tonythomas joined	16:28
	→ dmnd joined	16:29
	← lb1a left	16:29
	→ eletuchy joined	16:29
	→ codeman joined	16:29
	← Kayra left	16:29
	← Neon1024 left	16:30
	← shruggar left	16:30
	← Lunatrius left	16:31
	→ CKyle joined	16:32
	→ kukks joined	16:32
	→ Lunatrius joined	16:33
	→ rockfruit joined	16:35
sirchopsalot	canton7: ok all done :)	16:35
	did git reset head^	16:35
	readded the files	16:35
	then did git commit --amend	16:35
	all seemed to work	16:35
	→ goTAN joined	16:36
	← mikecmpbll left	16:36
	→ jceb joined	16:36
	← goTAN left	16:36
sirchopsalot	now to merge this sucker onto the master branch	16:36
	← cllamas left	16:37
	→ cllamas joined	16:37
	← Naeblis left	16:37
	→ Sabbath joined	16:38
	→ kesha joined	16:38
	← kesha left	16:39
	← Devastator left	16:39
	→ coasterz joined	16:39
	→ Wizek joined	16:40
	← harobed left	16:40
	← Wizek left	16:41
	← cllamas left	16:41
	→ sq-one joined	16:42
sirchopsalot	If i say: git checkout master; git merge dev; that will bring the master branch up to date with the changes in dev, yes?	16:42
	← Sabbath left	16:42
sirchopsalot	thinking I might take ojacobson's advice once this is all sorted	16:43
	← eaj left	16:47
	← JanC left	16:47
	← kylef left	16:49
	← monbro left	16:49
	→ ni__ joined	16:49
	← Droolio left	16:50
	→ kylef joined	16:50
	← dreiss left	16:51
	← CodePulsar left	16:51
	← mizu_no_oto left	16:51
	→ alexlindenlevy joined	16:53
	→ doev joined	16:54
	→ hyperair joined	16:55
	← sq-one left	16:55
	→ jrajav joined	16:55
	→ Skrypter joined	16:56
	→ LBV_User joined	16:56
sirchopsalot	wooo	16:57
	7 long months finally merged dev into master :D	16:57
	← FortySix_ left	16:58
	→ Fretta joined	16:59
	← MattStratton left	16:59
	→ mikecmpbll joined	16:59
	→ Sonderblade joined	16:59
	← Gizburdt left	16:59
lov	sirchopsalot: excellent	16:59
sirchopsalot	\o/	17:00
	→ FortySix2 joined	17:00
	→ Gizburdt joined	17:00
	← FreezingCold left	17:00
	→ m0viefreak joined	17:01
	← FortySix2 left	17:01
	← sohail left	17:01
	→ pweaver_ joined	17:01
	← infynyxx left	17:02
	→ looper joined	17:03
	→ sohail joined	17:03
	← LBV_User left	17:03
	→ infynyxx joined	17:04
	→ LBV_User joined	17:04
	← Gizburdt left	17:04
	← ScottE left	17:04
	← NimeshNeema left	17:04
	→ lindenle joined	17:04
sirchopsalot	ok	17:04
	→ Nicholas_Rishel joined	17:05
sirchopsalot	gonna take the advice and get some sleep	17:05
	I'll upload in the morning	17:05
	thanks for your help!	17:05
	← sirchopsalot left	17:05
	← einonm left	17:05
	← beyondcreed left	17:05
	→ ScottE joined	17:05
	← cagedwisdom left	17:06
	→ zorbash joined	17:06
	→ koell joined	17:07
Harzilein	canton7: it works ^^	17:08
	← arunpandianp_ left	17:08
	← Nicholas_Rishel left	17:08
Harzilein	canton7: http://paste.debian.net/92756	17:08
	canton7: :)	17:08
	← fjfish left	17:08
canton7	looks good!	17:09
	← dmnd left	17:09
	← matteo left	17:09
canton7	what was the bug the first time around?	17:09
Harzilein	canton7: oh, i don't know. let me check if git status can tell	17:09
	→ arunpandianp_ joined	17:10
	← koell left	17:10
	← shiroyamakota_ left	17:10
	← eletuchy left	17:10
	→ dmnd joined	17:10
Harzilein	canton7: harzilein@debian:~/Projects/Git/github.com/RosettaCodeData$ time git status	17:10
	→ francisfish joined	17:10
	→ koell joined	17:10
	→ Nicholas_Rishel joined	17:11
	→ Kayra joined	17:11
Harzilein	canton7: i'm not sure if git status also needs to invoke the smudge/clean filter... that ought to take a wile then	17:11
	while*	17:11
	→ bartman`` joined	17:11
	← el3ctron left	17:12
	← vtunka left	17:12
	→ axl_ joined	17:12
	→ eletuchy_ joined	17:13
	→ pikaren joined	17:14
	← pikaren left	17:14
	→ pikaren joined	17:14
	← francisfish left	17:14
	← St_Marx left	17:14
Harzilein	canton7: hmm... it claims the working directory to be clean. that shouldn't be the case if one checkout failed...	17:15
	is there a naming convention for filter scripts?	17:16
	→ hahuang65 joined	17:16
	← moritzs left	17:16
Harzilein	i think when i add debugging output, i ought to make it an external script	17:16
	← dmnd left	17:16
	← doev left	17:16
	→ St_Marx joined	17:17
	→ Joost` joined	17:17
	→ pen joined	17:17
	← lov left	17:19
	→ lov joined	17:19
	→ moritzs joined	17:19
	→ lavaman1 joined	17:20
	← lavaman left	17:20
	→ khmarbaise joined	17:20
	← PeterBooker left	17:21
	→ Lemony joined	17:22
	→ mrjensen joined	17:23
	→ bluesm joined	17:24
	→ yacks joined	17:25
	→ kermit joined	17:25
	← sohail left	17:26
	→ cvanball joined	17:26
	→ beyondcreed joined	17:27
	→ glebihan joined	17:28
	→ KWhat_Work joined	17:29
KWhat_Work	is there a simple guide for creating a fork from what will now be an upstream repo?	17:30
	← hyperair left	17:30
	→ hyperair joined	17:31
	→ sohail joined	17:31
	← sohail left	17:31
	→ sohail joined	17:31
_ikke_	What?	17:32
	→ dreiss joined	17:32
	← HelperW_ left	17:32
	→ crystal77 joined	17:33
	← moritzs left	17:33
	→ kayloos joined	17:33
	← SocalNick left	17:33
	← ni__ left	17:33
	← koell left	17:33
	→ mahmoud joined	17:34
mahmoud	do you guys recommend git with binary files? and why?	17:34
ashooby	mahmoud: !binary	17:35
gitinfo	mahmoud: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	17:35
	← Riobe left	17:35
ashooby	and I guess !annex too	17:35
gitinfo	git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media	17:35
	→ cff joined	17:35
	→ jxpx777_ joined	17:35
	← jxpx777 left	17:35
	← vurma left	17:35
	← thedodd left	17:36
mahmoud	i don't understand	17:36
_ikke_	Each change to a binary file causes git to store the entire content of the file	17:37
	← khmarbaise left	17:37
_ikke_	and binary files aren't very compressable	17:37
mahmoud	_ikke_: oh so usually git only stores diffs with texts?	17:38
	← decotii left	17:38
	→ ril joined	17:38
	← Exancillatus left	17:38
mahmoud	how can git know if a file is text or binary?	17:38
ojacobson	mahmoud: no, git stores the entire file for text, too	17:38
	it's just that (a) text files are small, and (b) for long-term storage, loose objects are delta-encoded into packs, which goes much better for text generally	17:39
_ikke_	mahmoud: It has certain heuristics to determine if a file is text or binary	17:39
mahmoud	so delta encoding is only for text and only for texts that are packed/archived?	17:39
blueyed	Why isn't 1.9.1 not listed on http://code.google.com/p/git-core/downloads/list ?	17:39
mahmoud	i don't get why should git care if it's text or non-text. to me it seems it should be octets/bytes irrespective of whether they are text/bin	17:40
	s/get/gir/	17:40
_ikke_	mahmoud: git doesn't really make a difference, but delte-compression (just like any other compression) doesn't help much for binary files	17:40
mahmoud	so git tries to delta-compress except that delta-compress isn't helpful?	17:40
_ikke_	mahmoud: correctg	17:40
	→ kesha joined	17:41
mahmoud	then why does git need that heuristic to determine whether a file is text?	17:41
_ikke_	mahmoud: Because it doesn't try to calculate diffs for binary files for example	17:41
mahmoud	i see	17:42
	why doesn't git use non-diff compression methods that work with binaries and possibly even better with txts?	17:42
_ikke_	mahmoud: binary files aren't compressable in general. It has nothing to do with the specific compression methods git uses	17:43
	→ khmarbaise joined	17:43
	← khmarbaise left	17:43
	→ khmarbaise joined	17:43
	← KWhat_Work left	17:44
	→ KWhat_Work joined	17:44
	← dkpi left	17:44
mahmoud	aren't most bins compressable?	17:44
_ikke_	Depends on the type of data	17:44
mahmoud	perhaps encrypted stuff are non-compressible	17:44
Harzilein	mahmoud: as in "code binaries"?	17:44
mahmoud	pdf files, images (png)	17:45
_ikke_	Most of them are already compressed	17:45
	→ toomanysecrets joined	17:45
Harzilein	pdf and png both use compression	17:45
mahmoud	i see	17:45
Harzilein	i guess you _could_ convert the pdfs to not contain compressed sections, but then images would likely still be compressed	17:46
_ikke_	As long as most of the file stays the same when changing things, delta-compression helps a lot. But if one change cause the complete file to be different, nothing can help mutch	17:46
Harzilein	if one only has pdfs that use a known subset of the format, one could have relatively efficient storage	17:46
	← Angelous left	17:47
	→ garomero joined	17:47
Harzilein	i.e. the drawing operations should delta compress well	17:47
	→ Angelous- joined	17:47
	← Angelous- left	17:47
	→ Angelous joined	17:48
	← Angelous left	17:48
	← garomero left	17:48
	→ faBimon joined	17:48
	← Lemony left	17:48
	→ Angelous joined	17:48
	← Angelous left	17:48
	→ Angelous joined	17:49
	← Angelous left	17:49
	→ Angelous joined	17:49
	← Angelous left	17:49
	→ shortest_path joined	17:49
	← shortest_path left	17:49
	→ shortest_path joined	17:49
	→ Angelous joined	17:50
	← Angelous left	17:50
	← khmarbaise left	17:50
	→ Angelous joined	17:50
	← Tuna-Fish left	17:50
	← Angelous left	17:50
	→ Lemony joined	17:50
	→ Angelous joined	17:51
	← Angelous left	17:51
	→ ignas joined	17:51
zq	urgh	17:51
	→ Angelous joined	17:51
	← Angelous left	17:51
zq	what the heck is the proper way to check in an llvm backend	17:51
	i seriously do not want to clone the whole damn repo just for a few relatively tiny modifictions	17:52
	→ Angelous joined	17:52
	← Angelous left	17:52
	← chiromante left	17:52
	→ Angelous joined	17:53
	← Angelous left	17:53
	→ Angelous joined	17:53
	← Angelous left	17:53
_ikke_	Why do you need to clone the whole repo?	17:54
	→ Angelous joined	17:54
	← Angelous left	17:54
	← Kayra left	17:54
	→ Angelous joined	17:54
	← Angelous left	17:54
	→ Angelous joined	17:55
	← Angelous left	17:55
zq	_ikke_: because of the monolithic nature of the llvm build process	17:55
	→ jenrzzz joined	17:55
	→ Angelous joined	17:55
	← Angelous left	17:55
blueyed	zq: try "git clone --depth 10 ..."	17:55
	← zorbash left	17:56
_ikke_	consensus is not to commit build artifacts anyway	17:56
	→ zorbash joined	17:56
zq	_ikke_: what?	17:57
	blueyed: i could, but then i'd have a really impossible time rebasing since llvm is a moving target	17:57
_ikke_	zq: The problem is that I'm not really understand what the exact problem is you are facing	17:58
Harzilein	canton7: it appears the error is benign, it's just caused by the child process not consuming its stdin	17:58
	→ aard_ joined	17:58
canton7	fair enough :P	17:59
mahmoud	is there any command to anonymize my git activities when i commit stuff?	17:59
	← zorbash left	17:59
mahmoud	i think git puts my name and email address. does it put other stuff?	18:00
osse	it doesn't	18:00
	← telesto left	18:00
	→ Angelous joined	18:00
	← Angelous left	18:00
_ikke_	mahmoud: You have complete control over what git puts there	18:00
	mahmoud: git config --global user.name "foo"; git config --global user.email "foo@bar.org"	18:01
	→ FortySix2 joined	18:01
	→ Angelous joined	18:01
	← Angelous left	18:01
mahmoud	will git by default take stuff form variable names? like my username?	18:01
	← GT4066 left	18:01
_ikke_	Yes	18:01
mahmoud	like?	18:01
	→ Angelous joined	18:01
	← Angelous left	18:01
	→ doev joined	18:01
	← lindenle left	18:01
	→ Angelous joined	18:02
	← Angelous left	18:02
osse	they're all in man git	18:02
gitinfo	the git manpage is available at http://jk.gs/git.html	18:02
osse	and they all start with GIT_	18:02
	it doesn't use $USER or $HOME or anything crazy like that	18:02
	→ khmarbaise joined	18:02
mahmoud	i think you didn't understand my question	18:03
	← cjwilburn left	18:03
	← vijay13 left	18:03
mahmoud	(possibly as i didn't explain it well, or that i mistakingly think u didn't understand while you actually did)	18:03
	→ cjwilburn joined	18:03
_ikke_	osse: It uses you username and host when there are no username and email set	18:03
	→ pbrobst_ joined	18:03
osse	_ikke_: oops, you're right. But you get a big warning then, at least :P	18:03
	← rgr left	18:03
_ikke_	yup	18:04
mahmoud	i don't mean if git uses environment variables for its own data. i mean, does git eventually read some values from my local machine and then store it in the git repository? stuff that could potentially leak my username, system host name, or time zone?	18:04
	← kesha left	18:04
_ikke_	mahmoud: Like I said, only when you don't have a username and email set	18:04
	← glebihan left	18:04
mahmoud	so the only local stuff that i'm leaking is 1) username 2) email?	18:04
	(otehr than the actual code that i commit)	18:05
_ikke_	mahmoud: If I recall corectly it user your username and hostname	18:05
mahmoud	period?	18:05
	nothing more?	18:05
_ikke_	Perhaps your timezone in commit dates	18:06
	Not sure though	18:06
	→ Tuna-Fish joined	18:06
	← xlinkz0__ left	18:06
mahmoud	kinda offtopic, but does the tar command store my time zone info too?	18:06
	or is it just utc?	18:06
_ikke_	No clue	18:06
	← khmarbaise left	18:07
	→ MithrilTuxedo joined	18:07
osse	Git stores a unix epoch time thingy, plus a time zone, represented as an offset (no city names or anything like that)	18:07
	But it's easy to commit with a bogus time stamp	18:08
	← totte left	18:08
mahmoud	osse: sounds wrong. why not just UTC?	18:08
	← jenrzzz left	18:08
	→ dvide joined	18:08
	→ denisMone joined	18:08
	→ denis_ joined	18:09
osse	no diea	18:09
	← doev left	18:09
	← Harzilein left	18:09
mahmoud	i think all times in the world should be stored/processed/delivered as UTC and only locale stuff should process that info +/- offset for UI purposes to appease humans so that everytime they wake up in the morning they see it 9AM	18:09
osse	maybe the git guys thought it would be useful to be able to see if a commit was made in the morning or in the evening	18:09
	→ jnavila joined	18:09
_ikke_	It is stored in UTC, but it also contains an offset	18:09
	→ jenrzzz joined	18:09
	→ roymiloh joined	18:09
	→ jamieshepherd joined	18:09
	→ msafi1 joined	18:10
mahmoud	offset for what? to tell other developers that "yo, he did it in UTC 23:32, but guess what? his offset is 4 hours LOL!"	18:10
_ikke_	timezone offset	18:10
	← jxpx777_ left	18:10
	← kukks left	18:10
	→ jxpx777 joined	18:10
mahmoud	why	18:10
	→ totte joined	18:11
mahmoud	why should other developers know my time-zone offset	18:11
_ikke_	Because people are used to see times in a timezone offset way	18:11
mahmoud	i hope you are wrong	18:11
	← msafi left	18:11
_ikke_	mahmoud: Is your watch set to utc?	18:11
	or your phone	18:11
	← shortest_path left	18:11
mahmoud	or i hope that you are misunderstanding me	18:11
_ikke_	or your computer	18:11
osse	The only reason I can think of is so that the log can show "human-readable" (ie. reasonable) times of day	18:12
mahmoud	err, actually set to bios clock cause windows is screwing me up	18:12
	set to local. sorry	18:12
	→ Zifre joined	18:12
	← LBV_User left	18:12
mahmoud	(i'm on linux, but on the abandoned partition that has windows, it screws me occasionally)	18:12
osse	But the main Git guys don't seem to care much about anonymity	18:12
	→ LBV_User joined	18:12
osse	Security yes, anonymity no	18:12
mahmoud	i think you'are misunderstanding me	18:13
	cause git folks can't be that stupid	18:13
	→ il joined	18:13
	→ SHyx0rmZ joined	18:13
osse	E.g. if you contribute to git they require you to commit with a proper name (they can't tell if you're lying of course)	18:13
	← Sander^home left	18:13
mahmoud	yeah that's fine. i can put a nickname and an email id with signed stuff	18:13
	but let's first discuss this time thingy. i don't get it	18:14
_ikke_	https://gist.github.com/Ikke/54d7c6c040f5c2633457	18:14
	That's a raw commit file	18:14
	mf___ → mf_	18:14
_ikke_	You can see I'm in UTC+2	18:15
mahmoud	suppose this example: i am living in uae, and you are in usa. i send you some code that is written in 10:00 UTC + 4GMT (so to me its 14:00). when you read my code, you should see it as 10:00 UTC -8 i guess, or something..... but why on earth do you care how the clock looked like in my country uae?	18:15
	← iamntz left	18:15
osse	your commit in that example will show up as 14:00 +0400	18:16
mahmoud	but why do you care if it was +4 in my part of the world?	18:16
osse	I wouldn't	18:16
mahmoud	why would anyone care?	18:16
	← Dudi left	18:16
	← jxpx777 left	18:16
	→ jxpx777_ joined	18:16
osse	No clue	18:16
mahmoud	is this from linus torvalds or other people who took over?	18:17
osse	I just know how it is, not why it is like it is	18:17
_ikke_	I think this is from the beginning	18:17
mahmoud	damn linus torvalds.... jeez how can i trust to use his kernel	18:17
	← eletuchy_ left	18:17
_ikke_	mahmoud: How can you trust any OS?	18:17
	Or your hardware	18:17
lov	mahmoud: send an email to the mailing list and ask if there's a reason why it's there. If there's no good reason, and you can make a compelling argument to remove it, and a patch, then you've solved your problem.	18:18
osse	the very first commit has timestamp: Thu Apr 7 15:13:13 2005 -0700	18:18
mahmoud	none but this dude is scary.	18:18
	→ pantsman joined	18:18
	← pantsman left	18:18
	→ pantsman joined	18:18
_ikke_	Only because a commit store a timezone offset?	18:18
mahmoud	yeah. probably if i'm seeing shit at the surface, this must be the tip of the iceburg	18:18
_ikke_	meatmanek: https://stackoverflow.com/a/7651782/20261	18:18
	← jagob left	18:19
	→ JanC joined	18:19
	← soerenbf left	18:19
mahmoud	oh	18:19
osse	according to some e-mail on the mailing list: "We store seconds since UTC epoch, we add the author's or committer's timezone as auxiliary data so that dates can be pretty-printed in the original timezone later if anyone cares."	18:19
	→ shiroyamakota_ joined	18:19
	← SHyx0rmZ left	18:20
	→ thedodd joined	18:20
	→ Not_Whatever joined	18:20
	→ dkpi joined	18:21
osse	mahmoud: this seems to be the original discussion on how to do it: http://thread.gmane.org/gmane.comp.version-control.git/52	18:21
	→ Grum joined	18:21
mahmoud	_ikke_: as for your uploaded file, question: is 1397067210 the UTC time when you write it, or is it the time + the offset already?	18:21
osse	mahmoud: there someone raised the exact same question you did	18:21
	→ Snowball64 joined	18:21
	← nbouscal left	18:21
mahmoud	osse: thanks, i'm reading..	18:21
_ikke_	mahmoud: unix timestamp is always in UTC	18:22
	→ nbouscal joined	18:22
mahmoud	i see	18:22
	← anry left	18:23
	→ SHyx0rmZ joined	18:24
_ikke_	That timestamp converts to: Wed, 09 Apr 2014 18:13:30 GMT	18:24
	← Gamecubic left	18:24
	→ eletuchy joined	18:24
_ikke_	while I'm not in GMT	18:24
	← kriks left	18:24
	→ anry joined	18:25
	← Tuna-Fish left	18:25
cbreak	that's why git stores time stamps and offsets separately	18:25
	→ macabre joined	18:25
osse	After reading through that thread my impression is that people generally didn't care. "Yaay, pretty printing!" and that was it	18:26
	→ cllamas joined	18:26
mahmoud	look at this idiocity: I'd prefer not to lose the information. If someone has committed a	18:26
	change at 2am, I like to know that it was 2am for _them_. It helps me	18:26
	← denisMone left	18:26
	← denis_ left	18:26
mahmoud	decide where to look first for the cause of problems. :)	18:26
	http://thread.gmane.org/gmane.comp.version-control.git/52	18:26
_ikke_	It's usually not a problem, unless you absolutely want to prevent any information about your location	18:26
	← dkpi left	18:26
	→ Sander^home joined	18:27
cbreak	you can change that easily	18:27
_ikke_	mahmoud: If git stored it in utc with no tz info, git can't know how late it was for them	18:27
mahmoud	lol	18:27
	who cares?	18:27
_ikke_	People care	18:27
	gitinfo set mode: +v	18:27
mahmoud	why, cause they want to assume that it was shitty code cause it was in 2AM? or it was a marvilous code at 5PM?	18:28
_ikke_	UTC is pretty abstract for most people	18:28
	→ tmcmahon joined	18:28
_ikke_	That's what people usally care about, yes	18:28
mahmoud	you make me feel sad cause you're defening nonsense. i think you're probably non-human. you should kill yourself cause killing you is not worth the cost	18:28
	→ Balliad joined	18:28
_ikke_	mahmoud: You sound paranoid :-)	18:28
mahmoud	or stay alive while you help me with other stuff :p	18:29
	← amcsi_work left	18:29
_ikke_	git is not created for anonimity as osse already said	18:29
mahmoud	it's not about anonymity.... it's about sanity	18:29
	→ msafi joined	18:29
cbreak	mahmoud: please, don't be an idiot.	18:30
	← arietis left	18:30
	← cllamas left	18:30
	← msafi1 left	18:30
mahmoud	enlighten me why the offset is needed? don't tell me "cause it helps us to predict the psychology of the developer cause usually developers are sleepy at 2AM"	18:31
	→ arietis joined	18:31
cbreak	mahmoud: because it is part of the time stamp, duh	18:31
mahmoud	it's not. the offset is part of the locale stuff to pretty stuff to your eyes so that it looks 9AM when it's morning in your place	18:31
cbreak	it's part of the time stamp, no matter how much you whine around	18:31
	→ blackmesa joined	18:32
cbreak	mahmoud: check git cat-file -p HEAD for an example	18:32
_ikke_	cbreak: His question is why it is part of it	18:32
	→ nobitanobi joined	18:32
mahmoud	^	18:32
cbreak	that's easy: because time stamps are local to the developer that committed	18:32
	just like everything in git	18:32
_ikke_	cbreak: timestamps are stored in UTC	18:32
	→ PeterBooker joined	18:33
cbreak	_ikke_: nope. They are stored in utc + offset	18:33
nobitanobi	Hi guys. My git push is hanging at 6%. I guess I might have some big file in the commit I am trying to push. Is there any way I can find the file sizes of the files that are about to be pushed?	18:33
cbreak	why? Because unix timestamps alone can't represent local time.	18:33
	← lavaman1 left	18:33
	← Skrypter left	18:33
	→ sq-one joined	18:33
	→ lavaman joined	18:33
_ikke_	That's circular reasoning	18:33
mahmoud	cbreak: only i care about my local time. why would you see how the clock looked like in my part of the world?	18:33
	→ yosito joined	18:34
	→ pwnz0r joined	18:34
cbreak	_ikke_: nope	18:34
	_ikke_: it's quite linear.	18:34
	commits are local.	18:34
	unix time stamps are not enough.	18:34
	let's add offsets.	18:34
	done.	18:34
_ikke_	Only because the offsets are added	18:34
	← Joost` left	18:34
cbreak	mahmoud: so? Don't commit.	18:34
mahmoud	lol	18:34
	such a fuckhead	18:35
	← yosito left	18:35
	→ yosito joined	18:35
	→ Xethron joined	18:35
	ChanServ set mode: +o	18:35
	cbreak kicked mahmoud (Please think more.)	18:35
osse	mahmoud: the only reason for storing offsets seems to be: "because people would find it useful"	18:35
cbreak	such a rude person.	18:36
	→ lindenle joined	18:36
	→ Skrypter joined	18:36
	← alexlindenlevy left	18:36
	→ nicoulaj joined	18:36
	→ mahmoud joined	18:36
_ikke_	http://article.gmane.org/gmane.comp.version-control.git/110	18:36
	"If someone has committed a	18:37
	change at 2am, I like to know that it was 2am for _them_. It helps me	18:37
	decide where to look first for the cause of problems. :)"	18:37
	→ dkpi joined	18:37
_ikke_	"It also helps disambiguate certain comments, especially those involving	18:37
	words or phrases such as "yesterday" or "this afternoon". "	18:37
	→ endiruna joined	18:37
skorgon	hmm, that is actually bogus. with rebase etc. the authorship timestamp is pretty much useless	18:37
cbreak	commits are local. Seems natural that the dates are also local.	18:37
	→ Gamecubic joined	18:37
cbreak	skorgon: nope. It's still the date of authorship.	18:38
_ikke_	skorgon: you mean comitter timestamp	18:38
	skorgon: author timestamp doesn't change	18:38
cbreak	the committer timestamp is the one the commit was created	18:38
	← axl_ left	18:38
cbreak	the authorship timestamp is when it was authored	18:38
	← lindenle left	18:38
skorgon	cbreak, but it might have gone through so many iterations that took place at different times, that it doesn't say anything anymore	18:38
	→ Joost` joined	18:38
cbreak	skorgon: it says as much as any time stamp	18:38
osse	skorgon: when you rebase the author timestamp doesn't change unless the patch itself changes.	18:38
cbreak	skorgon: it's just a point in time.	18:38
skorgon	osse, exactly my point	18:39
cbreak	skorgon: if you want a proper time tracking, you'd need a range anyway.	18:39
	but git doesn't do time tracking	18:39
	it tracks commits	18:39
	→ Exancillatus joined	18:39
osse	skorgon: but the commit timestap changes. So you have both pieces of info	18:39
	→ lindenle joined	18:39
skorgon	osse, if i rebase -i and amend and fix stuff in my commit	18:39
	← dfarler left	18:39
	← dkpi left	18:39
cbreak	the commit was authored at time X. That doesn't change.	18:39
skorgon	tihngs change but the authorship stays	18:39
cbreak	why does it not change?	18:39
	because authorship doesn't change	18:40
	you can --reset-author, then it will change	18:40
	skorgon: your choice.	18:40
	it's local after all. :)	18:40
	→ dfarler joined	18:40
mahmoud	how about adding even more auxilary data? like time stamp format "234234223555 +0400 For me, it was the Friday evening after beer bust checkin"	18:40
	cbreak set mode: -o	18:40
	→ dkpi joined	18:40
_ikke_	mahmoud: That's part of the commit	18:40
	← yosito left	18:40
_ikke_	message ;-)	18:40
osse	skorgon: huh, you're right. I didn't expect that	18:40
	→ eaj joined	18:40
	→ Angelous joined	18:40
	← Angelous left	18:40
	→ yosito joined	18:41
osse	mahmoud: I think we've said all we have to say about it (I have at least). If you're not happy with our answers feel free to raise the question on the mailing list. I would be interested in reading the responses	18:41
	Because deep down I sort of agree with you	18:42
	← jxpx777_ left	18:42
osse	But I can also see the usefulness of identifying the time of day for a commit	18:42
	→ jxpx777 joined	18:42
mahmoud	i think we shouldn't plug anything there just in case it might be useful. may be that's why we have the message option -m	18:43
	anywayy. will create an email account and send the stuff to the mailing list	18:44
	→ recycle joined	18:45
osse	What I am wondering now is why it's shown by default :p	18:45
	← ril left	18:45
	← paulweb515 left	18:46
osse	I guess it's because it conforms to some standard date format	18:46
	→ Kayra joined	18:46
	← pwnz0r left	18:46
	← Exancillatus left	18:47
	Guest45082 → spaceone	18:47
mahmoud	how about daylight saving offsets?	18:47
	→ b4rbz joined	18:48
	← jenrzzz left	18:48
	← maestrojed left	18:48
_ikke_	mahmoud: As long as you computer observes them, it's part of the offset automatically	18:48
	+2 is dst for me	18:48
	← prosana left	18:48
	← arietis left	18:49
mahmoud	it seems this whole discussion ended in vain http://thread.gmane.org/gmane.comp.version-control.git/52	18:49
	→ prosana joined	18:49
	→ amcsi joined	18:49
cbreak	it ended in facts.	18:49
	→ boombatower joined	18:49
mahmoud	s/t/k/	18:50
cbreak	you can see the facts multiplying every time you commit	18:50
_ikke_	mahmoud: You linked to the general topic, not to a specific e-mail	18:50
	→ einonm joined	18:50
	→ jagob joined	18:50
	osse is happy he lives in a highly populated time zone	18:50
mahmoud	_ikke_: i know. i read the full thread	18:50
	i think git also relies on some assumptions cause they don't happen often. like being happy that sha hashes won't collide anytime soon	18:51
_ikke_	Oh, that discussion again	18:51
mahmoud	i really tried to forget it but this time-stamp thing triggered me again	18:52
	mahmoud blames _ikke_	18:52
_ikke_	In the mean-time everyone hapilly uses git without problem	18:52
osse	at least it's Y2K safe	18:52
	→ soerenbf joined	18:52
mahmoud	i'm certainly not happy	18:52
rawtaz	https://github.com/Lekensteyn/pacemaker	18:53
	git is listed	18:53
_ikke_	rawtaz: I'm sure the maintainers are aware	18:53
rawtaz	great	18:53
	perhaps now some user who didnt know is aware too :-)	18:53
mahmoud	isn't this the official git channel? i guess me saying it here is enough	18:54
osse	I'd rather see Git's allergy to network drives fixed	18:54
skorgon	there is no "official" git channel	18:54
_ikke_	the mailing-list is the official channel	18:54
skorgon	the !mailinglist is where development etc. takes place	18:54
_ikke_	This is just for user support	18:55
osse	!list	18:55
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	18:55
	← MafooUK left	18:55
skorgon	that's what i meant :) thx osse	18:55
	← ignas left	18:55
	→ dmsuperman joined	18:55
	← dkpi left	18:55
	→ Dudi joined	18:55
osse	Apparently '!list' is some sort of warez thing	18:56
	← CKyle left	18:56
_ikke_	It is	18:56
	← bwaxxlo left	18:56
cbreak	why?	18:56
	→ dkpi joined	18:57
	← soerenbf left	18:57
_ikke_	why what	18:57
	← treehug88 left	18:58
osse	when how	18:58
mahmoud	jeez can't i make an aemail account without gmail asking my name and family name...	18:58
	→ rfoust__ joined	18:58
_ikke_	You don't need a gmail account	18:59
mahmoud	how can i post to the mailing list	18:59
_ikke_	just send an e-mail the e-mail address just posted here	18:59
	← rfoust left	18:59
mahmoud	ohh telnet?	18:59
osse	https://www.hushmail.com/signup/	18:59
dmsuperman	I'm having some confusing behavior with a submodule. My .gitmodules file points to a particular repository (my fork), and on my dev machine my .git/modules/.../config file also points to my fork. On my server, however, the .git/modules/.../config file points to the original, not my fork, despite the .gitmodules file pointing to teh correct repository (my fork)	19:00
	→ leeN joined	19:00
dmsuperman	I've run git submodule sync && git submodule update --init --recursive on the server	19:00
lov	mahmoud: you're a pretty bad troll.	19:00
mahmoud	i'm not trolling	19:00
dmsuperman	but it's still pulling files from the original repo, not my fork. Especially confusing is when I run a "git log" from within the submodule, it shows the log from my fork, not the original repository	19:00
	how can I update the server properly to use the path in .gitmodules?	19:00
	→ alorence joined	19:01
osse	mahmoud: use this: http://post.gmane.org/post.php?group=gmane.comp.version-control.git - supply a mailinator address. open the mailinator's inbox (disposable)	19:01
	http://mailinator.com/	19:01
cbreak	dmsuperman: sync should do it...	19:01
dmsuperman	That's what I thought too	19:02
cbreak	dmsuperman: the submodule URL in .git/config should be updated	19:02
dmsuperman	Yeah, that URL is up to date	19:02
	it's only the one in the .git/modules/.../config that's out of date	19:02
	and when it fetches the file contents that's where git appears to be reading from	19:02
	← l0x3py left	19:03
	← yosito left	19:03
mahmoud	504 Connect to mailinator.com:80 failed: SOCKS error: TTL expired	19:03
	now what... can't tor it..	19:03
	→ Exancillatus joined	19:03
	→ glebihan joined	19:03
cbreak	mahmoud: sounds like you fucked up your proxy	19:03
dmsuperman	even if I specifically git checkout $commit_id_from_my_fork, it's successful, but the file contents are still from the non-fork repository	19:03
	→ earth joined	19:04
dmsuperman	I can just change the .git/modules/.../config file manually but this has come up in the past so I'm hoping to find a more correct fix	19:04
	← dkpi left	19:04
	← c74d left	19:04
mahmoud	lol @ [email@hidden.address]	19:04
	← supermat left	19:04
	← Dudi left	19:04
	→ cored joined	19:04
	← nnyk_ left	19:05
	→ digiv joined	19:05
cbreak	dmsuperman: file contents don't matter	19:05
cored	hi I want to remove a file from a commit message; I also did a rebase before pushing but I used git add . and got some unrelated files	19:05
cbreak	dmsuperman: all that matters is history	19:05
	dmsuperman: if current state is not the same as history, it'll show as local changes in git status	19:06
cschneid	can I set a private key per git remote? I have several heroku accounts, each with a different key, but all at heroku.com, so I can't just use a Host record in .ssh/config	19:06
cbreak	you can deal with it as normal	19:06
cschneid	or do I have to do the silly alias dance in ssh/config	19:06
	→ upene joined	19:06
cbreak	cschneid: git doesn't handle keys	19:06
	ssh does.	19:06
cschneid	cbreak: ok, figured it didn't.	19:06
	→ c74d joined	19:07
_ikke_	cschneid: You don't need to create aliases	19:07
cschneid	_ikke_: is there an easier way to do it?	19:07
_ikke_	No	19:07
osse	sounds like you could generate the ssh/config using mad leet scripting	19:07
	← Exancillatus left	19:07
cschneid	what? so I have app1, which is [email@hidden.address] and I have app2 which is [email@hidden.address] but the key is different.	19:08
	hmm, I wonder if I can repeat the key directive in .ssh/config's format?	19:08
cbreak	cschneid: just let it try all keys?	19:08
	→ saustin__ joined	19:08
cschneid	"try all these"	19:08
	→ el3ctron joined	19:08
cbreak	load all into ssh-agent	19:08
	→ btree_ joined	19:08
cbreak	done.	19:08
dmsuperman	cbreak: that's why it's so confusing. it doesn't show up as local changes. I ran git checkout 21c9c94aa (which only exists in my fork), and then git status shows no local changes, but when I view the file itself, it doesn't reflect the changes introduced in 21c9c94aa	19:08
osse	{ for i in ~/.ssh/*_rsa; do printf 'Host %s\n\tHostname foo\n\tIdentifyFile %s' "${i#.ssh/}" "$i"; done } > ~/.ssh/config	19:09
cbreak	dmsuperman: did you ever do something stupid like git update-index --assume-unchanged?	19:09
	→ mdhopkins joined	19:09
dmsuperman	nothing like that	19:09
	→ khmarbaise joined	19:09
dmsuperman	I changed the URl found in .gitmodules once but that shouldn't cause this right	19:09
cbreak	dmsuperman: does git update-index --really-refresh help?	19:09
mahmoud	can you guys tor into mailinator	19:09
cbreak	dmsuperman: did you ever compare git diff HEAD?	19:09
	← teran left	19:10
	← saustin left	19:10
dmsuperman	that git update-index command followed by git status still shows no modifications despite me still being on my fork's commit	19:11
	git diff HEAD returns nothing	19:11
osse	mahmoud: how about this then: http://10minutemail.com/10MinuteMail/index.html	19:11
cbreak	dmsuperman: then nothing changed and the local files are correct	19:11
	← btree left	19:11
cbreak	dmsuperman: you can git cat-file -p HEAD:path/to/file > newfile	19:12
	that'll show what is in HEAD	19:12
mahmoud	osse: works	19:12
	→ Dudi joined	19:12
	← EminenceHC left	19:13
	← pbrobst_ left	19:13
	← codeman left	19:13
	→ EminenceHC joined	19:13
dmsuperman	aha cbreak we're getting somewhere. that shows the correct file contents. but when I just do a simple "git checkout HEAD" it doesn't update the file with those contents found from the cat-file command	19:14
	what does that indicate?	19:14
cbreak	dmsuperman: you did something weird	19:14
	something very weird...	19:14
	sparse checkout, assume unchanged...	19:14
mahmoud	osse: so predictible. you can know the next mail in sequence	19:14
	← fanno left	19:14
cbreak	can't think of something else	19:14
	dmsuperman: you can just delete all files, then git reset --hard HEAD	19:14
dmsuperman	I haven't done anything weird I promise... this is on a server where we don't run any weird commands, it's a staging area. all that happens is a git pull and git submodule update --init --recursive	19:15
cbreak	but no idea why they aren't showing up as changes	19:15
osse	mahmoud: so what?	19:15
dmsuperman	cbreak: do that from within the submodule?	19:15
	→ jenrzzz joined	19:15
cbreak	dmsuperman: a pull from a script? Now that sounds dumb.	19:15
	dmsuperman: yes	19:15
mahmoud	osse: should be randomly generated	19:15
dmsuperman	why is it dumb? I push changes, I wnat to see those changes on the staging server, so on the staging server I pull those changes	19:16
	→ CKyle joined	19:16
mahmoud	osse: specially that it doesn't hurt to do it right	19:16
	→ ril joined	19:16
	← CKyle left	19:16
osse	mahmoud: the whole thing gets nuked in 10 minutes...	19:16
	→ VinceZa joined	19:16
osse	it doesn't matter	19:16
	← Xethron left	19:16
cbreak	dmsuperman: because pull can fail. Do you want your script to fail?	19:16
	← FortySix2 left	19:17
mahmoud	osse: i know, but anyone can jump in and distrub me	19:17
cbreak	in a script you should fetch, then reset --hard	19:17
osse	mahmoud: how?	19:17
	I don't knw	19:17
	your email	19:17
mahmoud	osse: everyone knows that the email ID in sequence now is a1205098	19:17
	← tonythomas left	19:17
	← buu left	19:17
osse	here it's different	19:17
mahmoud	what is it?	19:18
dmsuperman	I run git pull by hand cbreak -- on production we rsync and avoid git entirely	19:18
osse	mahmoud: a1205067	19:18
	→ treehug88 joined	19:18
	→ buu joined	19:18
mahmoud	sorry, i forgot to erase my cookies... my fault	19:18
	the site is neat. i approve it.	19:18
	← EminenceHC left	19:18
	→ PeterBoo joined	19:18
osse	but they seem to be sequential though	19:18
	→ Tuna-Fish joined	19:18
mahmoud	hmm yeah	19:19
	guess it gets more random the more people use it	19:19
osse	I still think it doesn't matter	19:19
mahmoud	can anyone read the email other than me?	19:19
	→ rq60 joined	19:20
mahmoud	guess no.. you're right. it doesn't matter	19:20
_ikke_	It would be useless if that was possible	19:20
mahmoud	mailinator.com does that	19:20
	← cored left	19:20
osse	mailinator's emails last forever I think. Or just appear and disappear as needed	19:21
	it's a different mechanism	19:21
_ikke_	http://mailinator.com/inbox.jsp?to=foobar	19:21
	hmm	19:21
	→ khmarbaise_ joined	19:21
	← PeterBooker left	19:22
	← acharlieh left	19:22
	→ tcstar joined	19:22
tcstar	so I have a symfony application,	19:22
	→ Zematix joined	19:22
	← khmarbaise left	19:23
	← Zematix left	19:24
	← ril left	19:24
	→ acharlieh joined	19:24
tcstar	so i have a symfony application, and i created a private repo on github... i also have my development environment that has a git repo on there as well... so, what i'm trying to figure out with git is if on my local machine i run: git push dev master to have it include everything but if i run git push gh master it only includes src/* and web/themes/* -- is that possible, if so what would i do?	19:25
	→ mixandgo joined	19:26
	← akiva left	19:26
cbreak	tcstar: nope	19:27
	tcstar: push pushes history	19:27
_ikke_	Only by separating it into two repositories	19:27
cbreak	tcstar: you'll have to rewrite it manually if you want different history	19:28
	← zacts left	19:28
tcstar	Not a problem thanks for the quick answer	19:28
mixandgo	hello, I’m wondering if there’s a nice way to handle this scenario: I have a <branch1> forked from master with a few commits, and I have <branch2> forked from master. <branch2> needs a few commits from <branch1> but the code review is not done yet on <branch1>. Is there another way besides waiting for <branch1> to be merged and then rebase ?	19:29
	→ jottr joined	19:29
tcstar	any way to list everything that's being tracked so i can set this up properly from the get go and not have to fix it later?	19:29
_ikke_	git ls-files	19:29
	← neunon left	19:30
tcstar	thanks _iike	19:30
	→ neunon joined	19:31
	← rfoust__ left	19:31
	← macabre left	19:32
	← glebihan left	19:32
	→ rfoust joined	19:32
	→ coredump joined	19:32
cbreak	mixandgo: you can cherry-pick, which will copy the commits	19:32
	mixandgo: you can merge branch 1 completely too	19:33
	← coredump left	19:33
cbreak	mixandgo: or you can rebase branch 2 onto branch 2	19:33
	(that's history rewriting though, so be sure you understand what that means)	19:33
mixandgo	cbreak: so with the cherry-pick what happens when I need to merge <branch2> back onto <master> ? given <branch1> was also merged into <master>	19:34
	← toomanysecrets left	19:34
	← Nevik left	19:34
cbreak	mixandgo: you get to resolve the conflicts if git doesn't.	19:35
	→ Nevik joined	19:35
	← b4rbz left	19:35
mixandgo	so you get 2 identical commits ? (the ones you cherry picked)	19:36
	← G________ left	19:36
	← devoldmx left	19:36
_ikke_	mixandgo: No	19:36
	← khmarbaise_ left	19:36
cbreak	mixandgo: they aren't identical	19:36
	they only result in identical changes	19:37
	→ ascarter joined	19:37
	← ascarter left	19:37
	→ kotopies joined	19:38
	→ snql joined	19:38
	→ G________ joined	19:38
	→ alvaro_o joined	19:38
	← hoschi left	19:38
mixandgo	so even tho the commit is copied, after both branches are merged into <master> there will only be on commit (of the one copied) ?	19:38
	→ macabre joined	19:39
_ikke_	mixandgo: No, you will have two, unless you rebase one branch onto the other	19:39
	← macabre left	19:39
	← upene left	19:40
	→ psoo joined	19:40
	← hholtmann left	19:40
cbreak	mixandgo: merging doesn't change history	19:41
	mixandgo: if you have two commits before the merge, then you'll have three afterwards :)	19:41
	→ ascarter joined	19:41
	← jackneill left	19:41
mixandgo	yeah but it sounds useless to have the same commits	19:41
	→ vurma joined	19:41
mixandgo	so I guess my only option is to start <branch2> from <branch1>…	19:42
	→ AccessibleWeb joined	19:42
	← Lemony left	19:43
	→ zacts joined	19:44
_ikke_	cherry-pick is used when you have two branches, where you need a certain fix in both branches	19:44
	→ paulweb515 joined	19:44
mixandgo	_ikke_: and they will never be merged together… ?	19:44
_ikke_	eventually	19:44
	Or rebased	19:44
	← luft_ left	19:45
mixandgo	rebase will get rid of the dupes ?	19:45
	→ luft_ joined	19:46
	→ akiva joined	19:46
_ikke_	it will	19:46
	← prosana left	19:46
	← ErKa left	19:46
	→ koell joined	19:47
	← freeman42 left	19:47
mixandgo	I see so, if I merge <branch1> into <branch2> and then later (after <branch1> was merged into <master>) I rebase from master… I should have no dupes	19:47
	is that correct ?	19:47
_ikke_	rebasing after merging is not advisable	19:49
	→ nilg` joined	19:49
	→ nikb joined	19:49
	nikb → nikb_	19:50
	← koell left	19:50
	→ koell joined	19:51
	→ Angelous joined	19:51
mixandgo	so what would be my best bet ? cherry-pick then rebase ?	19:51
	→ axl_ joined	19:51
	→ khmarbaise joined	19:51
	← lmatteis left	19:51
	→ FortySix2 joined	19:52
	← hooper left	19:53
	← axl_ left	19:53
	→ ni__ joined	19:53
	← khmarbaise left	19:54
	← lithiumjake left	19:54
	← lindenle left	19:54
	← hahuang65 left	19:54
mahmoud	fatal: bad default revision 'HEAD'	19:55
	→ freeman42 joined	19:55
mahmoud	nvm.. solved.	19:55
	← delight left	19:56
	← G________ left	19:56
	← luft_ left	19:56
	→ shashank_rs joined	19:56
	→ luft_ joined	19:57
	→ pbrobst joined	19:57
	← nilg left	19:58
mahmoud	what does 'created mode 100644 file.txt' mean after 'git commit'	19:58
tang^	it's a new, non-executable file	19:58
	→ Guest_ joined	19:59
	← mikecmpbll left	19:59
mahmoud	did git change stuff? or is it just reporting file's mode?	19:59
	→ hahuang65 joined	19:59
	← p8952 left	19:59
tang^	reporting	19:59
	→ mikecmpbll joined	19:59
_ikke_	Note that git only knows 755 and 644	20:00
mahmoud	what... non-configured git says 'm@test.org'... what is going on?	20:00
	→ p8952 joined	20:00
	← jnavila left	20:01
	→ blinkdesign joined	20:01
_ikke_	"system user name and the hostname used for outgoing mail (taken from /etc/mailname and falling back to	20:02
	the fully qualified hostname when that file does not exist)"	20:02
mahmoud	is -a already assumed there by default in git commit?	20:02
	→ delight joined	20:02
	→ Exancillatus joined	20:02
_ikke_	No	20:03
mahmoud	so everytime i modify a file, i must manually git add it or use git commit -a?	20:03
	← VinceZa left	20:03
lov	yes?	20:04
mahmoud	i thought that i only need to add files/dirs when i create them	20:04
	i.e. add once, and that's it	20:04
lov	not quite. You're staging your changes.	20:04
	This sounds like an obnoxious extra step, but it allows really powerful workflows	20:04
	e.g. only staging and committing part of the changes you make in a file	20:04
	→ francisfish joined	20:04
	← pikaren left	20:05
	← francisfish left	20:05
mahmoud	parts of changes in a single file?	20:05
lov	yes	20:05
	modify a few distinct parts of a file of yours, then use git add -p	20:05
mahmoud	lemme try. sounds cool]	20:05
lov	git will ask you if you want to stage each part	20:05
	← aretecode left	20:06
mahmoud	do i make a new branch everytime i make git commit?	20:06
lov	It also lets you do things like modify configuration files for testing, but not commit that change with your other changes	20:06
	no	20:06
	you probably want to make a new branch for each feature (or even each bug!)	20:06
	→ netcarver joined	20:06
	← Balliad left	20:06
lov	but you don't have to, and could just work off of master.	20:06
mahmoud	ok will continue watching that awsome youtube tutorial..	20:07
lov	you might want to read the !book if you haven't yet	20:07
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	20:07
mahmoud	_ikke_: how did you generate that text file that had the commit head	20:07
	no way. i won't read a book for this	20:07
lov	there's also Git For Ages 4 and Up which kind of hammers home how git is really just a graph internally	20:07
mahmoud	interesting. you mean like visually it works like a graph?	20:08
	→ Balliad joined	20:08
	→ devoldmx joined	20:08
	→ khmarbaise joined	20:09
lov	Internally, git is a Directed Acyclic Graph, a !dag	20:09
	really? no trigger for that?	20:09
mahmoud	i know dag	20:09
lov	!graph	20:09
gitinfo	[!lol] A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	20:09
lov	bleh	20:09
	← crystal77 left	20:09
mahmoud	yeah dag is cool	20:09
lov	point is, branching is super cheap because you're just moving pointers.	20:09
	→ aretecode joined	20:09
_ikke_	!gcs	20:09
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	20:09
	→ Gizburdt joined	20:09
mahmoud	how does svn or other code managers branch?	20:09
_ikke_	svn creates seperate directories	20:10
lov	^^	20:10
	→ polyzen joined	20:11
mahmoud	so that just makes branches expensive space-wise?	20:11
_ikke_	yes	20:11
lov	well, "yes"	20:11
mahmoud	is that the only problem of svn?	20:11
_ikke_	for some values for problems, yes	20:11
mahmoud	i thought git makes branching cheaper cause of addressing non-space related issues too	20:11
	→ EminenceHC joined	20:12
	→ teran joined	20:12
_ikke_	Well, svn used to not track merge information, causing every consecutive merge to be a full 2-way merge again, causing all sorts of merge conflicts	20:12
	But newer versions do track it	20:12
lov	not to say that merges are easy.	20:13
	← mellernoia left	20:13
	→ erikruthven joined	20:13
lov	ESPECIALLY when people "branch" by just fucking copying all of their files, and don't include the metadata	20:13
	lov rages	20:13
	← Snowball64 left	20:13
lov	ESPECIALLY when they merge changes by doing that too	20:13
	→ VinceZa joined	20:14
	→ doomlord_ joined	20:14
mahmoud	copying it into some directory and then push?	20:14
lov	basically, if you have branch A and branch B, and branch A has a commit you want to copy to branch B, SVN has a special flow for merging that change over.	20:14
	← ezekiel\|work left	20:14
mahmoud	_ikke_: did you just paste the output from git log?	20:14
	→ cllamas joined	20:14
lov	Because SVN expects you to have a different physical directory for every branch, unlike git, people will lazily just copy files from A to B	20:15
_ikke_	when?	20:15
	← xsbeats left	20:15
lov	and then make a duplicate commit	20:15
	and then merge conflicts occur because the goddamned metadata isn't there	20:15
_ikke_	I didn't	20:15
mahmoud	_ikke_: previously when i was farting about timers	20:15
lov	Ask me about why I never want to work with SVN with subpar professionals again.	20:15
_ikke_	mahmoud: git cat-file -p <commit>	20:15
lov	incidentally, the worst offenders were the same people that would commit a week's changes with a message of "fixed"	20:15
	← IrishPrime left	20:16
lov	and didn't understand why they couldn't just copy directories on their local computer as source control	20:16
	← Cork left	20:16
	→ lithiumjake joined	20:16
mahmoud	_ikke_: interesting... to me it seems its redundant too	20:16
_ikke_	What is redundant?	20:17
mahmoud	is that timestamp read from logs? or is it read from the commit object?	20:17
_ikke_	mahmoud: the log is built from commit objects	20:18
	git doesn't keep a seperate log	20:18
DolphinDream	anybody using git subtree ?	20:18
mahmoud	so the timestamp is stored in the objects?	20:18
_ikke_	yes	20:18
	→ PeterBooker joined	20:18
	→ Xueqi joined	20:18
	← AccessibleWeb left	20:18
mahmoud	_ikke_: when i push stuff to others, do i give them my log too?	20:18
grawity	git doesn't keep a separate log	20:19
_ikke_	^	20:19
grawity	you push commits, and `git log` just shows you all the commits, sorted	20:19
	→ AccessibleWeb joined	20:19
mahmoud	so everyone has his own logs and we only merge objects from others?	20:19
	← cllamas left	20:19
	→ gkze joined	20:19
_ikke_	there is no 'log' people have	20:19
mahmoud	i do have log....	20:19
	← Kayra left	20:20
	→ Guest46478 joined	20:20
_ikke_	There is a command called git log, which just reads all commits objects	20:20
	← jrajav left	20:20
	← Xueqi left	20:20
ashooby	if you currently have a detached head checked out is there a way to find out what branches are at that point?	20:20
	→ ril joined	20:20
_ikke_	The only 'log' being stored is the reflog, but that is for different purposes	20:20
mahmoud	_ikke_: lies. i have .git/logs/refs/heads/master with all stuff listed there too including comments of commits	20:21
grawity	ashooby: git describe --all --exact-match	20:21
	→ moritzs joined	20:21
_ikke_	git branch --contains	20:21
ashooby	grawity: ty	20:21
	→ talios joined	20:21
	← jceb left	20:21
	← PeterBoo left	20:21
grawity	though mine only prints one name, I guess	20:21
	try `git branch...`	20:21
	← netcarver left	20:21
_ikke_	git branch --contains	20:21
	← khmarbaise left	20:21
	← a-l-e left	20:22
	← Guest46478 left	20:22
	→ Guest46478 joined	20:22
	Guest46478 → Cork	20:22
ashooby	_ikke_: ty as well	20:22
mahmoud	how can i partially commit changes to a file?	20:23
_ikke_	mahmoud: git add -p	20:23
	← AccessibleWeb left	20:23
mahmoud	how about git commit -a?	20:23
	someone talked about it being part of a powerful workflow	20:23
_ikke_	that's basically the complete opposite	20:24
	← ril left	20:24
_ikke_	git commit -a says, I don't care, just commit all	20:24
	→ shortest_path joined	20:24
mahmoud	so when i commit stuff, i only change the current trunk?	20:25
	or current branch	20:25
	← sohail left	20:26
_ikke_	yes	20:26
	→ travisstaton joined	20:26
	→ harobed joined	20:26
	← akiva left	20:26
	→ Entomo joined	20:27
	→ Xueqi joined	20:27
	→ jfarrell joined	20:28
	← moritzs left	20:28
	← Xueqi left	20:28
	← teran left	20:28
	→ draftqin joined	20:29
jfarrell	is there a command to extract the subject and email from a patch file without applying it?	20:30
	← snql left	20:30
	→ soerenbf joined	20:30
	→ GeoAleyPerMer joined	20:31
	← infynyxx left	20:32
	← EdGruberman left	20:32
PerlJam	jfarrell: grep? :)	20:32
	← c74d left	20:32
	→ snql joined	20:32
	→ EdGruberman joined	20:34
	← rnsanchez left	20:34
	→ teran joined	20:34
	→ infynyxx joined	20:35
	→ saustin_ joined	20:35
	→ AccessibleWeb joined	20:36
	→ c74d joined	20:36
	← saustin__ left	20:37
	→ marcjs joined	20:38
	← yacks left	20:38
	→ Not_Whatever2 joined	20:39
	→ ril joined	20:39
	→ Sabbath joined	20:39
	→ moritzs joined	20:39
	→ rnsanchez joined	20:40
ashooby	jfarrell: awk '/Subject:/,/---/' <file>	20:40
	probabl'	20:40
	y	20:40
	travisstaton → foldr	20:41
	← Gizburdt left	20:41
jfarrell	ashooby: yeah, was hoping that i has just missed something in apply or am that would show the nicely rather than having to use awk, oh well	20:41
	← Not_Whatever left	20:41
	← SHyx0rmZ left	20:42
	← doener left	20:42
	→ nephyrin` joined	20:42
	← foldr left	20:42
	→ Gizburdt joined	20:42
	→ MattStratton joined	20:42
	← davividal left	20:43
	← Arokh left	20:43
	→ Kayra joined	20:43
	← Sabbath left	20:43
	← ril left	20:43
ashooby	jfarrell: why do you need it? could maybe work the awk line into a git alias? or just a shell alias	20:43
	← VinceZa left	20:43
	← JerryT left	20:43
	→ travisstaton joined	20:44
	← travisstaton left	20:44
	← nephyrin` left	20:45
shashank_rs	guys i'm in deep trouble , my friend push the changes and all the changes i commited where gone .. ?? how to recover the commit plz help ?? plz help	20:45
	→ JerryT joined	20:46
	→ dannixon_ joined	20:46
	← JerryT left	20:47
SamB	shashank_rs: do you still have a local copy that had the changes before?	20:48
	→ JerryT joined	20:48
SamB	if so, back it up now	20:48
shashank_rs	yes	20:48
	→ crystal77 joined	20:48
shashank_rs	i have done it ..	20:48
	SamB: I can recover my commit ..	20:49
	← vurma left	20:49
SamB	ah, well, that's good	20:49
	shashank_rs: wait, was that a statement or a question?	20:49
shashank_rs	SamB: I can recover my commit ??	20:50
	sory	20:50
	← kotopies left	20:50
shashank_rs	SamB: i'm little nervous	20:50
SamB	hmm, well, try running "git reflog"	20:50
	→ blinkdes_ joined	20:51
shashank_rs	SamB: It shows the recent commit ...	20:51
	← infynyxx left	20:52
	← jagob left	20:52
SamB	shashank_rs: including the most recent of the ones you are looking for?	20:52
shashank_rs	yes	20:52
	→ foldr joined	20:53
	← cannonball left	20:53
	→ tpollard joined	20:53
	→ veebers joined	20:53
shashank_rs	its showing here but on github all my changes have been removed ..	20:53
	← endiruna left	20:54
	→ nephyrin joined	20:54
	← zajn left	20:54
	← Exancillatus left	20:54
	← mixandgo left	20:54
mahmoud	osse: done. how long does it take for the post on the mailing list to appear?	20:54
	← AccessibleWeb left	20:54
SamB	well, you can put them in a branch using e.g. "git branch lostchanges <hash-from-reflog>", where <hash-from-reflog> is replaced by the hash from that reflog line	20:54
	← blinkdesign left	20:55
	← veebers left	20:55
	← _iron left	20:55
	← sq-one left	20:55
SamB	shashank_rs: got that?	20:55
	→ ignas joined	20:55
	← dannixon_ left	20:55
shashank_rs	SamB: something like this git branch lostchanges c8c76aa 1d7c9c9 ??	20:56
mahmoud	osse: done http://article.gmane.org/gmane.comp.version-control.git/245998	20:56
SamB	shashank_rs: er, no, only one hash at a time	20:56
	so probably just take the one for the most recent commit	20:56
	← m0viefreak left	20:56
shashank_rs	SamB: it means i have to do this 12 times... :(	20:57
SamB	shashank_rs: aren't your commits all in a chain?	20:57
	→ cored joined	20:57
	← mdhopkins left	20:57
shashank_rs	SamB: yes they are in one chain ....	20:57
SamB	try "git log c8c76aa", assuming that c8c76aa was the highest-listed commit	20:58
shashank_rs	SamB: oohh k ...	20:58
	→ snql\|bad_interne joined	20:58
SamB	if that displays all the commits you were looking for, then you just need to run "git branch lostchanges c8c76aa"	20:58
	→ Exancillatus joined	20:58
	← GuestO1102 left	20:58
	← roymiloh left	20:58
shashank_rs	SamB: done .. now ??	20:59
	← snql left	20:59
lov	shashank_rs: now you get up	21:00
	get up and dance	21:00
SamB	shashank_rs: well, either tell your friend not to force push, or start pushing to a repository that he can't push to	21:00
lov	o>-<	21:00
SamB	shashank_rs: also presumably you'll want to do some kind of merge	21:00
	← xunil left	21:00
	→ GuestO1102 joined	21:00
	→ xunil joined	21:00
	← W0rmDr1nk left	21:01
	← Kicer86 left	21:01
	→ monbro joined	21:01
	← lavaman left	21:02
	→ W0rmDr1nk joined	21:02
	→ lavaman joined	21:02
SamB	shashank_rs: but at least now you don't have to worry about your changes being garbage collected or anything	21:02
monbro	do you know any repo / open source search engine which enables easily a full text search for all of my accounts on various services like getpocket / asana or basecamp or ira / github issues ?	21:03
	← DolphinDream left	21:03
	← cff left	21:03
	→ FreezingCold joined	21:03
mahmoud	i think git's timestamp should include gender too	21:03
	or somewhere in the commits	21:04
	→ tanath joined	21:04
SamB	easy, just be German	21:04
	← cjwilburn left	21:04
mahmoud	like "23423423424 +offset male mood:happy"	21:04
	german has no gender differences?	21:04
lov	mahmoud: patches welcome	21:04
mahmoud	i'm ranting. i mean someone please remove the offset :3	21:04
SamB	mahmoud: german names are required by law to refer unambiguously to a specific gender	21:05
	mahmoud: the offset is important!	21:05
mahmoud	oh, so genders care more about genders	21:05
	SamB: why?	21:05
	← JonasF left	21:05
	← BadProphet left	21:05
	→ infynyxx joined	21:05
SamB	well, unless you mean "just use UTC for all the times"	21:06
mahmoud	yeah	21:06
	and let my locale handle the utc time to make it look pretty on my machine	21:06
	← mrjensen left	21:06
	← zumba_addict left	21:06
mahmoud	i guess you agree too	21:07
	:) 3 ppl agree with me	21:07
SamB	well, obviously some people will probably prefer it be known what local time they committed at, but it certainly wouldn't hurt to have an option to just use a zero offset ...	21:07
	← infynyxx left	21:07
	← timmi_qt left	21:08
mahmoud	i think it's there	21:08
	← jcvfen left	21:08
	← polyzen left	21:09
mahmoud	well i take it back...	21:09
	→ lmat joined	21:09
shashank_rs	SamB: Since i'm not good in git ... the final conclusion is that i can't commit my changes back to the repo ...	21:09
	:(	21:09
mahmoud	i ws thinking of git log --date=... but that doesn't change what's stored	21:09
lmat	I'm trying to merge branch A and B into master. I basically want git checkout master; git merge A; git merge B -s recursive -X theirs; can this be done with git merge A B -s recursive -X theirs; ?	21:10
	← treehug88 left	21:10
lmat	(there are no conflicts merging A, but B conflicts with A and I want to keep A's changes)	21:10
	→ soerenbfff joined	21:10
	→ kotopies joined	21:10
	→ amunak joined	21:10
	→ timmi_qt joined	21:10
amunak	hello, some time ago my friend branched a git-revisioned project, made tons of changes (without a repository) and now we use our own git repo and we'd like to merge the changes with the original. Is there any possibility of doing that? Especially if I don't even know what commit he originally downloaded from?	21:11
mahmoud	hmm it seems iso time includes the offset too	21:12
	→ infynyxx joined	21:12
	→ mixandgo joined	21:12
	← livingstn left	21:13
	→ treehug88 joined	21:13
	← soerenbf left	21:14
	← rfoust left	21:14
lmat	Without this solution, I'll have to man-handle each conflict that B brings ?	21:14
	← snql\|bad_interne left	21:14
lmat	eye-balling it, there are 6 files, it looks like the first file has some 40 conflicts ?	21:15
	That's a bit much for me old point-n-click!	21:15
	the others seem to be similar :-O	21:15
	← MattStratton left	21:15
	← josePhoenix left	21:15
	← zeroknowledge left	21:16
	→ ErKa joined	21:17
	← Sonderblade left	21:20
	→ Arokh joined	21:21
	→ sdouglas joined	21:21
	→ BadProphet joined	21:21
	← marthinal left	21:22
	← ignas left	21:22
	→ Samual joined	21:22
	← PeterBooker left	21:23
	← Gizburdt left	21:23
	→ Gizburdt joined	21:24
	← mixandgo left	21:25
	→ rnsanchez_ joined	21:26
	→ pr0ton joined	21:26
	→ cYmen joined	21:27
	→ mishok13 joined	21:27
	→ PeterBooker joined	21:27
	← rnsanchez left	21:27
	→ pwnz0r joined	21:28
	← ErKa left	21:28
	← nicoulaj left	21:28
	← Gizburdt left	21:29
	→ maestrojed joined	21:29
	← hellopat_ left	21:29
	← thedodd left	21:30
	← moritzs left	21:30
	→ dkpi joined	21:31
	← faBimon left	21:31
	→ CKyle joined	21:32
	→ lambda joined	21:32
	→ thedodd joined	21:32
	← Gamecubic left	21:33
	← alorence left	21:33
	→ infynyxx_ joined	21:34
	← lambda left	21:35
	← shashank_rs left	21:36
	→ diminoten joined	21:36
	← dkpi left	21:36
	→ dsdeiz joined	21:36
	← earth left	21:37
	← infynyxx left	21:37
	→ kukks joined	21:39
	← Luke-Jr left	21:39
	← jottr left	21:40
	→ ril joined	21:40
	→ Luke-Jr joined	21:40
	← brisbin left	21:41
	← infynyxx_ left	21:41
	→ jstimm joined	21:42
	→ axl_ joined	21:42
	→ byte48 joined	21:42
	→ infynyxx joined	21:42
	← tmcmahon left	21:42
	→ ErKa joined	21:44
	← eaj left	21:44
	← lmat left	21:44
	← jstimm left	21:44
	← bwreilly left	21:44
	→ eaj joined	21:44
	← descala left	21:45
	← ril left	21:45
	→ descala joined	21:46
	→ rgr joined	21:46
	→ Gamecubic joined	21:47
	← Pwnna left	21:47
	← kermit left	21:48
	→ ilmgb joined	21:49
	→ dkpi joined	21:49
	← eaj left	21:49
	← freestyl3r left	21:50
	→ kermit joined	21:50
	→ gamera joined	21:51
	→ endiruna joined	21:51
	← nbouscal left	21:52
	→ unknwn- joined	21:52
	← Luke-Jr left	21:53
	→ Luke-Jr joined	21:53
	← Luke-Jr left	21:53
	→ Luke-Jr joined	21:53
	← matheus23 left	21:55
	← bluesm left	21:55
	← pr0ton left	21:55
	← aard_ left	21:55
	← gamera left	21:56
	→ nbouscal joined	21:57
	← JerryT left	21:59
	← cYmen left	21:59
	→ maslowbeer joined	21:59
	← Dougie187 left	21:59
	→ pr0ton joined	22:00
	← Exancillatus left	22:00
	→ xsbeats joined	22:01
	← zackiv31 left	22:01
	← cvanball left	22:01
	← danman_ left	22:02
	← elbeardmorez left	22:02
	← sdouglas left	22:02
	← gkze left	22:02
	→ cvanball joined	22:02
	← BadProphet left	22:02
maslowbeer	hello. I'm having an issue with a remote I created for some reason. I usually git remote add new_server ssh://user@server/var/gitfolder - then i git remote show new_server and git fetch -a. Then I can git diff origin/develop new_server/master for example to see what the diffs are, or git (log\|whatchanged) new_server to see what's been done, etc. Now I keep getting fatal: ambiguous argument 'new_server/master' unknown revision or path not	22:02
	in working tree. What am I doing wrong?	22:02
	→ tmfsd joined	22:03
	→ polyzen joined	22:03
	→ cllamas joined	22:03
	← ngladitz left	22:03
	← OnkelTem left	22:04
ojacobson	is new_server/master listed in 'git branch -a'? If not, is it after 'git fetch --all' ?	22:05
	← CKyle left	22:05
	← LBV_User left	22:05
	→ LBV_User joined	22:05
	← marcjs left	22:05
	← LBV_User left	22:05
	← pr0ton left	22:05
	← fatalhalt left	22:05
	→ OnkelTem joined	22:06
	→ bwreilly joined	22:06
maslowbeer	ojacobson, it isn't, even after fetching. however git remote show new_server shows all the right info	22:06
ojacobson	'git ls-remote new_server' will tell you what, if any, refs exist in the remote	22:06
	→ BadProph_ joined	22:06
ojacobson	which will probably do a lot to explain why 'git fetch' isn't retrieving the ref you expected	22:06
	← monbro left	22:07
maslowbeer	result is two lines with the same SHA - one HEAD the other refs/head/master	22:07
	→ pbrobst_ joined	22:07
maslowbeer	ojacobson,	22:07
	← soerenbfff left	22:08
	← jakob_ left	22:08
	← pbrobst left	22:08
	← DrShoggoth left	22:08
	← rudisimo left	22:08
ojacobson	can you !repro 'git fetch --all' and 'git branch -a', then	22:08
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	22:08
	→ brisbin joined	22:08
ojacobson	At this point I need to see over your shoulder, not just hear what you're seeing :)	22:08
	← cllamas left	22:08
	← Mrono left	22:08
	→ sdouglas joined	22:08
	← Neozonz\|Disc left	22:09
	← ErKa left	22:09
	← talios left	22:09
maslowbeer	oh wait lol git fetch --all did the trick I was git fetch -a . . . :-/	22:10
	→ bhldev__ joined	22:11
	← bhldev_ left	22:11
	← ORiON-- left	22:12
	← FortySix2 left	22:13
	→ danman_ joined	22:13
	← Matrixiumn left	22:14
	→ ORiON-- joined	22:14
	→ alansaul-laptop joined	22:14
	← treehug88 left	22:15
	→ eaj joined	22:15
	→ Dreadnaught joined	22:15
	← Dreadnaught left	22:15
	→ Dreadnaught joined	22:15
	← thedodd left	22:15
	← draftqin left	22:15
	← unknwn- left	22:17
amunak	hello, some time ago my friend branched a git-revisioned project, made tons of changes (without a repository) and now we use our own git repo and we'd like to merge the changes with the original. Is there any possibility of doing that? Especially if I don't even know what commit he originally downloaded from?	22:17
	→ nnyk_ joined	22:18
	← endiruna left	22:19
	← cored left	22:19
thegorn	amunak: magic, not much else you can do	22:20
	you could try to determine from the date what he branched off of	22:20
	← pantsman left	22:20
	→ jakob_ joined	22:20
amunak	well It doesn't matter all that much - just if I could avoid doing diff on all the files separately	22:21
	and if I could then just keep merging every update	22:21
	→ PeterBoo joined	22:21
thegorn	amunak: he just has a zip of changed files now?	22:21
	← polyzen left	22:21
amunak	thegorn we have a repository now	22:21
	git	22:21
thegorn	amunak: yea, but what does he have	22:21
	← skorgon left	22:21
amunak	he has git now too	22:22
	← PeterBoo left	22:22
	← ojacobson left	22:22
	→ Rastus_Vernon joined	22:22
	← dkpi left	22:22
	← pairofdice left	22:22
amunak	but there's no trace of the commit it was taken from... but even then, I could guess it and it should more or less be fine	22:22
	→ bhldev joined	22:23
thegorn	did he use git from the start?	22:23
	← Destos left	22:23
	→ joelm joined	22:23
thegorn	like import your original project into a new git repo?	22:23
	→ skorgon joined	22:23
	→ FortySix2 joined	22:23
	← ilmgb left	22:24
	← xsbeats left	22:24
	← bhldev__ left	22:24
	← PeterBooker left	22:24
	← kayloos left	22:24
	← bwreilly left	22:24
amunak	thegorn, no, that's the problem. There was a repo, he downloaded the code, made edits for several months and now I forced him to use git instead of dropbox	22:25
	and he wants to merge with the original code	22:25
	which has changed a lot of course	22:26
	→ alexlindenlevy joined	22:26
	→ treehug88 joined	22:26
thegorn	so i'd clone your repo, then	22:26
osse	the easiest solution is to make him merge them and give the result to you	22:27
thegorn	git remote add his <url> && git fetch his	22:27
amunak	it's not my repo the original	22:27
	so I'd have to clone it first	22:27
	→ Xack joined	22:27
amunak	then merge his?	22:27
thegorn	git branch wag <sha1 of your wild guess as to where he branched off at, use the date to get close>	22:27
amunak	thanks, I'll try that	22:28
thegorn	git checkout wag	22:28
	← eaj left	22:28
amunak	and is it better to start a new repo completly now (I had to clone the original first), or can I create it as branch or something?	22:28
	I guess not	22:28
	← bhldev left	22:28
thegorn	git read-tree --empty && git read-tree <sha1 of his root commit> && git commit -m "my friend is a retard"	22:29
	← nbouscal left	22:29
	→ monbro joined	22:29
amunak	read-tree?	22:29
	← kotopies left	22:30
thegorn	git checkout -b unfsck his/master && git rebase --onto wag <sha1 of his root>	22:30
amunak	sheesh that seems complicated	22:30
	← warthog9 left	22:30
	← mitsuhiko left	22:30
	← Luke-Jr left	22:31
	→ Luke-Jr joined	22:31
thegorn	well, it is, but if you want a merge to work, you have to rebase his repo as changes to your repo	22:31
	← treehug88 left	22:31
	→ thiago joined	22:32
	← sdouglas left	22:32
	← cvanball left	22:33
thegorn	i'm pretty sure you can cut down the steps with git filter-branch and .git/info/grafts	22:33
	→ mitsuhiko joined	22:33
	→ bwreilly joined	22:34
	← nfk left	22:34
amunak	well I have no idea what that is	22:34
	→ CKyle joined	22:34
amunak	so far I've been only using friendly GUIs and commands I found when I screw up	22:34
	→ Exancillatus joined	22:34
	← mitsuhiko left	22:35
	← GeoAleyPerMer left	22:35
	← Luke-Jr left	22:35
	← jluc left	22:36
thegorn	amunak: ok so the grafts thing is easier	22:36
amunak	yea mean that git branch wag?	22:37
	→ warthog9 joined	22:37
	← monbro left	22:37
	← anry left	22:37
thegorn	well, i don't know, where are you in the instructions	22:37
	or not at all?	22:37
	see, the whole issue is you need to get his first commit as a child commit of one of your commits, that's the only way merges work	22:38
amunak	I've only just cloned the original repo	22:38
thegorn	ok	22:38
	→ vijay13 joined	22:38
thegorn	so add his repo : git remote add his <url> && git fetch his	22:38
amunak	as I understand you can do that in a number of ways	22:38
	ok	22:38
osse	wouldn't it be simpler to merge the stuff he has commited?	22:38
	← Silmarilion left	22:38
cgar	So, let's say you got a pull request fixing only whitespace. Do you accepted?	22:39
osse	instead of messing with grafts?	22:39
thegorn	osse: he took a tarball of the original git repos	22:39
	← axl_ left	22:39
thegorn	he made a billion changes	22:39
osse	ahh	22:39
thegorn	then imported that into a new git repo as his root commit	22:39
amunak	yep.	22:39
	← leeN left	22:39
thegorn	now wants to merge	22:39
	→ Luke-Jr joined	22:39
osse	I'd go with my original suggestion then: Give him your code, make him do the work, then copy it over and commit it	22:39
	and then nuke his repo	22:40
thegorn	amunak: ok, so you got his remote added with those commands?	22:40
amunak	well it's our repo now, so...	22:40
	nope, adding now	22:40
	it is huge.	22:40
	→ ril joined	22:41
	← aboba left	22:42
	→ lowkeyliesmyth joined	22:42
thegorn	amunak: afterwards git checkout -b unfsck his/master	22:42
	← bambams_ left	22:43
	← Luke-Jr left	22:43
	← nnyk_ left	22:43
	← infynyxx left	22:44
	thegorn falls asleep	22:44
	← thiago left	22:44
	← JanC left	22:44
	→ dkpi joined	22:44
amunak	fetching now	22:44
	→ chris_thomson joined	22:44
	← KWhat_Work left	22:45
thegorn	this is taking too long so i'm going to type out the rest of the directions and i'll be back on later after i drive home	22:45
	← ril left	22:45
thegorn	it is pretty easy, and i appoint osse as my backup :-P	22:45
amunak	thank you	22:45
thegorn	so run git log, get the sha1 of his first commit	22:46
	the nrun git log master, get the sha1 of your guess as to where he might have copied from	22:46
	← brisbin left	22:46
thegorn	echo "1234abc 5678def" > .git/info/grafts	22:47
	→ mitsuhiko joined	22:47
thegorn	where 1234abc = the full sha1 of your guess, 5678def = the full sha1 of his root commit	22:47
	whoop, had that backwards	22:47
amunak	can't I use rebase or something?	22:47
	← dik_dak left	22:47
thegorn	1234abc = full sha1 of his root commit, 5678def = full sha1 of your guess where he started with	22:48
	no	22:48
	(no to the rebase)	22:48
	← tureba left	22:48
	→ Lemony joined	22:48
thegorn	and then after that run git filter-branch 5678def..HEAD	22:49
	→ kballou joined	22:49
thegorn	your unfsck branch should now be a regular branch and you can switch back to master and merge as normal	22:49
amunak	ok, thanks, will try	22:49
thegorn	amunak: the problem with rebase is that you have to somewhere generate the change from your code -> his first commit	22:50
amunak	oh	22:50
	why the hell does the fetch take ages	22:52
	→ bwreilly_ joined	22:53
	→ Luke-Jr joined	22:54
	→ zajn joined	22:54
thegorn	amunak: the fact that it is that big makes me fear that he put all the compiled results or something else dumb in the repo	22:54
amunak	no, I've cleaned that.	22:54
nobitanobi	Hi guys. In my main repository I have a folder in flash/controllers/ that contain lots of files. I have another repo in the same server that has a symlink in flash/controllers pointing at the main repository flash/controllers/	22:54
amunak	It has like 50MBs	22:54
	→ ilmgb joined	22:54
thegorn	amunak: did you clean it from history too?	22:54
nobitanobi	Right now when I do a git diff origin/master, I see that the file flash/controllers will be deleted. Does that mean that my folder flash/controllers/ will be gone?	22:55
	← Exancillatus left	22:55
	← robarell_ left	22:55
amunak	thegorn, I created the repo for him, it wasn't there in the first place. He used dropbox until now	22:55
	→ nnyk_ joined	22:55
thegorn	oh ok	22:55
	← bwreilly left	22:56
	← dilfridge left	22:56
	← Kayra left	22:56
	← uu1101 left	22:57
	← harobed left	22:57
	→ MacWinner joined	22:58
	→ simesy joined	22:58
	→ JanC joined	22:58
	→ NotproN joined	22:59
	← NotproN left	22:59
	← genehack left	22:59
	← FortySix2 left	22:59
	← blackmesa left	22:59
	← pbrobst_ left	23:00
	→ dilfridge joined	23:00
	→ dirt_ joined	23:01
	← ilmgb left	23:03
mahmoud	why tags? why not just branches	23:05
	→ mtrovilho joined	23:05
	→ tureba joined	23:06
	→ pbrobst joined	23:06
	→ nb_bez_ joined	23:06
	← harish left	23:06
	← Sample left	23:07
	→ genehack joined	23:07
	← bwreilly_ left	23:08
	→ cagedwisdom_ joined	23:08
	← dmsuperman left	23:08
	→ pierre1_ joined	23:09
	→ iaaah joined	23:10
	→ pr0ton joined	23:11
offby1	nobitanobi: my guess is 'no', but you can safely !tias by simply copying your git repository, and doing the merge there.	23:12
gitinfo	nobitanobi: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	23:12
nobitanobi	offby1: I agrre with !tias. Just didn't want to screw up in production environment :)	23:12
gitinfo	offby1: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	23:12
nobitanobi	thanks though.	23:12
lov	mahmoud: like, in general?	23:12
	or in particular?	23:13
	← nobitanobi left	23:13
lov	tags are really meant as annotations, while branches are meant to be potentially mutable	23:13
	→ brisbin joined	23:13
lov	when you make a release, you mark the commit you built off of with a tag, so that there's a record of where that build came from, even if you modify your release branch.	23:14
	You can have release branches that have patches put into them for point fixes, etc.	23:14
	→ infynyxx joined	23:14
lov	knowing what 17.0.1 was built off of compared to 17.0.3 can be helpful.	23:15
	← dkpi left	23:15
	← rq60 left	23:16
	→ kotopies joined	23:17
	← kotopies left	23:17
	← rainmanjam left	23:18
	→ akim__ joined	23:18
	← amcsi left	23:19
	→ trovilho joined	23:20
	← warthog9 left	23:20
	← mtrovilho left	23:21
	Keridos → Keridos_off	23:21
	→ vr4679 joined	23:21
	← akim left	23:21
	← vr4679 left	23:22
	← descala left	23:23
	trovilho → mtrovilho	23:23
mahmoud	lov: why not make branches of version names?	23:23
	→ eaj joined	23:24
	→ blinkdesign joined	23:24
	← infynyxx left	23:24
	→ warthog9 joined	23:24
mahmoud	hmm	23:24
	→ fatalhalt joined	23:24
lov	you could, there's no reason you couldn't	23:24
	but it would clutter up the list of branches	23:24
	→ yosito joined	23:25
mahmoud	that's all?	23:25
	^elf^ → elf	23:25
lov	tags can also be signed, which is an important factor in certain cases	23:25
	← blinkdesign left	23:25
mahmoud	can't i sign branches?	23:25
	→ descala joined	23:25
lov	what would signing a branch mean?	23:25
mahmoud	use rsa stuff to sign that this is the branch from me	23:25
lov	that doesn't really mean anything, since branches are just pointers to commits	23:25
mahmoud	so when some dude merges it, it can verify that the commits in the branch are truely mine	23:25
lov	tags have messages, authors, etc	23:26
	→ robarelli joined	23:26
mahmoud	yeah i mean commits	23:26
	can i sign commits	23:26
lov	yes	23:26
mahmoud	why would i need to sign a tag...	23:26
lov	for the same reason you'd sign a commit	23:26
mahmoud	sounds redundant to me	23:26
	→ zumba_addict joined	23:26
lov	the use cases are limited but they exist	23:26
mahmoud	so a tag is a name for a group of commits?	23:27
kadoban	no, for a particular commit	23:27
	← blinkdes_ left	23:27
	← c74d left	23:28
mahmoud	and a commit by definition implies that it is preceded by a bunch of previous commits?	23:28
	← eaj left	23:28
offby1	mahmoud: I think people intend tags to be statements about which commits were _released_.	23:28
kadoban	it can be, yes, but i suppose you could tag the first commit if you wanted to	23:28
offby1	Signing a commit means that you have to refer to the commit's sha1 hash in messages, etc; but signing a tag lets you refer to just that tag, with equal reliability.	23:29
mahmoud	offby1: i see... while a branch is a different league (bunch of comments some of which are not released)	23:29
offby1	mahmoud: the thing about branches is that they change all the time.	23:29
kadoban	a branch is moving history, a tag is a fixed point	23:29
	→ ilmgb joined	23:29
mahmoud	yeah, makes sense no w. tags are neat. i approve them :3	23:29
offby1	mahmoud: today, "master" points at abcde0123. Tomorrow, who knows.	23:29
	→ dkpi joined	23:29
	← kukks left	23:30
mahmoud	how to switch where master is pointing at?	23:30
	← mtrovilho left	23:30
	← TheFuzzball left	23:30
	← robarelli left	23:30
offby1	lots of ways	23:30
	← jenrzzz left	23:31
kadoban	mahmoud: you just commit and master moves forward...or you can reset or any of several other ways	23:31
offby1	most common is "git checkout master; vi some-file.c; git commit -a"	23:31
mahmoud	but this way master is master i'm just doing stuff to it	23:31
	i don't get how can master point to non-master	23:31
kadoban	it by definition can't, but that doesn't mean that what it points to is the same over time	23:32
	← Guest_ left	23:32
mahmoud	yeah now it's OK	23:32
	← hirani left	23:32
	→ Segfault_ joined	23:33
	← alexlindenlevy left	23:33
	← maqr left	23:34
	← jfarrell left	23:34
	← Not_Whatever2 left	23:34
	→ jenrzzz joined	23:34
	← ilmgb left	23:34
	→ VinceZa joined	23:36
	→ monbro joined	23:36
	← VinceZa left	23:37
	→ VinceZa joined	23:37
	→ ErKa joined	23:37
mahmoud	i said git rm file.txt; how to undo th e removal?	23:37
osse	git stTuz	23:38
	→ snuffeluffegus joined	23:38
osse	git status will tell you	23:38
mahmoud	git reset..	23:38
	← danman_ left	23:39
mahmoud	wut..	23:40
	→ ril joined	23:41
mahmoud	if i revert to a very old commit, will get automatically walk all the down? or should i revert one by one until i reach that old commit ?	23:42
	← wakd left	23:42
	→ hellome joined	23:43
SamB	mahmoud: you want to rollback?	23:43
	→ fatalhalt_ joined	23:43
osse	up to you	23:43
Vampire0	mahmoud, is this a fresh question or related to the git rm question?	23:43
SamB	I think you can pass a revspec?	23:43
mahmoud	fresh	23:44
SamB	mahmoud: or, well, with git reset you just get to wherever you said to go	23:44
mahmoud	so when i move backward, i can jump and git will revert one by one until i reach that old point	23:44
	but when i move forward i cannot jump or merge conflicts may happen	23:44
	← akim__ left	23:45
osse	do you want to revert the changes introduced by a commot, or revert to tbe state of a certain commit?	23:46
	→ akim joined	23:46
offby1	mahmoud: !cs	23:46
gitinfo	mahmoud: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	23:46
	← ril left	23:46
	← fatalhalt left	23:47
mahmoud	neat..	23:47
	← jenrzzz left	23:47
	← acharlieh left	23:47
	← AaronMT left	23:48
	← monbro left	23:48
	→ jenrzzz joined	23:49
	← pr0ton left	23:49
	← Balliad left	23:49
	→ maxime__ joined	23:49
amunak	oooh fuuuck that filter-branch rewrites 15000 commits	23:49
	I think I'll let it run overnight -_-	23:50
	→ pr0ton joined	23:50
	← pr0ton left	23:50
	→ Kayra joined	23:50
osse	!bfg	23:50
	hmm	23:50
	→ c74d joined	23:50
offby1	I assume that filter-branch, if it touches any commit C, must necessarily therefore touch every commit "downstream" of C.	23:51
	← Lemony left	23:51
offby1	So if C is, say, the first commit, it'll touch every commit.	23:51
	← Kayra left	23:51
	→ Kayra joined	23:52
	→ cllamas joined	23:52
	← fatalhalt_ left	23:53
	← pen left	23:54
	← yosito left	23:55
	← Kayra left	23:56
	← maxime__ left	23:56
	← lavaman left	23:57
	→ maxime__ joined	23:57
	← cllamas left	23:57
	← jenrzzz left	23:57
	← becks__ left	23:57
	← cephalostrum left	23:57
	← pbrobst left	23:58
	→ shinnya joined	23:58
	← jcw4 left	23:59
	→ john2x joined	23:59
	→ cephalostrum joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation