IRCloggy #git 2016-05-04

Provider of IRC logs since 2005.

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

	2016-05-04
	← dreiss left	00:00
	→ jaguarmagenta joined	00:00
	→ mwhooker joined	00:02
	← armin left	00:02
	→ s00pcan joined	00:03
	→ ryoshu joined	00:04
	← dmto left	00:04
ryoshu	I have pushed -f bad commit to github, can I recover the original remote branch?	00:04
	← dadada left	00:04
	→ dadada joined	00:04
	← jaguarmagenta left	00:05
	← kilo_bravo left	00:05
	dadada → Guest70094	00:05
	← bgamari left	00:05
	← arooni left	00:05
	→ dmto joined	00:06
	→ Gitzilla joined	00:06
osse	git reflog remote/branch	00:06
	→ arooni joined	00:06
osse	Assuming it was fetched.	00:06
	← ahr3n left	00:07
ryoshu	it worked, thanks!	00:08
	→ clumpyy joined	00:08
	→ dodobrain joined	00:10
	→ flaguy48 joined	00:10
	← dmto left	00:11
	→ dreiss joined	00:11
	← hahuang65 left	00:12
	→ Gsham joined	00:13
	← aandrew left	00:13
	← githogori left	00:14
	→ hahuang65 joined	00:14
	← IWishIKnew left	00:15
	→ rkazak joined	00:15
	→ bgamari joined	00:17
	← sdothum left	00:17
	← bronson left	00:17
	← ReenignE left	00:21
	← pwnawannab[NE] left	00:23
	→ ReenignE joined	00:23
	← ReenignE left	00:23
	→ ReenignE joined	00:23
	→ mischat joined	00:24
	→ mar77i_ joined	00:25
	← mar77i left	00:26
	← sgen left	00:26
	← imachuchu left	00:28
	← fracting left	00:29
	→ olpery joined	00:29
	olpery → Guest14839	00:30
	→ kus joined	00:30
	← kus left	00:30
	→ tomog999_ joined	00:30
	→ kus joined	00:32
	← tomog999 left	00:32
	→ printline joined	00:32
	← kalz left	00:35
sbeller_	KellerFuchs: yeah a post-commit hook in the child repos sounds sane to me	00:36
	← desbest left	00:36
	→ ahr3n joined	00:36
	← tristanp_ left	00:37
	← printline left	00:37
KellerFuchs	sbeller_: M'kay. That would be slightly annoying (it pollutes the history a lot), but I guess that's it	00:37
	→ tristanp joined	00:37
	→ blur3d joined	00:37
	→ fahadash joined	00:38
sbeller_	KellerFuchs: if you don't mind a rewritten history, you could also script that it amends to the last commit (in case that is one of the submodule updates only, maybe)	00:38
	← go1111111 left	00:39
KellerFuchs	Yes, I was considering that	00:39
	I'm starting to suspect I might use evil hackery instead :>	00:40
	→ ahr3n_ joined	00:40
	→ fracting joined	00:41
	← ToBeCloud left	00:43
	→ bronson joined	00:43
	← ahr3n left	00:44
	→ adron joined	00:45
	← fscala left	00:46
	→ rominronin joined	00:46
	← raven-au left	00:46
	→ Mixologic_ joined	00:47
	← mofai left	00:47
	→ raven-au joined	00:48
	→ fscala joined	00:49
	← Mixologic left	00:49
	← adron left	00:50
	→ oncall-pokemon joined	00:50
	← johnny56_ left	00:50
	← rominronin left	00:51
	→ go1111111 joined	00:52
	→ johnny56_ joined	00:53
	← jagob left	00:53
	← sgambino left	00:53
	→ andyhoang joined	00:54
	← dreiss left	00:57
	← rkazak left	00:57
	→ githogori joined	00:57
	← aax left	00:58
	← durham left	00:58
	← SpeakerToMeat left	01:00
	→ a_thakur joined	01:00
	← EvilPeng1 left	01:00
	← githogori left	01:02
	← bronson left	01:02
	→ githogori joined	01:03
	→ SwiftMatt joined	01:03
	← bollullera left	01:04
	← stantonk left	01:06
	← ahr3n_ left	01:07
	→ ochorocho__ joined	01:07
	→ tvon joined	01:11
	→ ril joined	01:14
	→ akitada joined	01:15
	← githogori left	01:16
	→ pneuma joined	01:17
	→ githogori joined	01:17
	← jbitdrop left	01:18
	← thiago left	01:20
	→ danhuynh______ joined	01:22
	← Gsham left	01:24
	→ Gsham joined	01:26
	→ bronson joined	01:26
	← githogori left	01:27
	→ sagerdearia joined	01:28
	← keyan left	01:28
	→ mablae__ joined	01:30
	← dermoth__ left	01:30
	→ stantonk joined	01:30
	→ dermoth__ joined	01:30
	→ nettoweb joined	01:31
	→ rkazak joined	01:31
	← bronson left	01:31
	← Guest70094 left	01:32
	← mablae_ left	01:33
	→ Tanger joined	01:33
	→ printline joined	01:33
	← pks left	01:33
	dm7freek_ → dm7freek	01:33
	← mwhooker left	01:33
	→ danhuynh_______ joined	01:34
	← nettoweb left	01:34
	→ pks joined	01:35
	← stantonk left	01:35
	→ nettoweb joined	01:35
	→ mwhooker joined	01:35
	← raininja left	01:35
	← anohigisavay left	01:35
	→ githogori joined	01:36
	← nettoweb left	01:36
	→ nettoweb joined	01:37
	← nettoweb left	01:37
	← danhuynh______ left	01:37
	← printline left	01:38
	← pneuma left	01:38
	← rkazak left	01:39
	← whitby left	01:40
	← ril left	01:41
	← raven-au left	01:45
	← a_thakur left	01:45
	→ a_thakur joined	01:46
	← bitkiller left	01:46
	→ adron joined	01:46
	→ rkazak joined	01:46
	→ ril joined	01:47
	← ojdo left	01:47
	← akushner left	01:49
	← joki left	01:49
	← cdg left	01:50
	→ cdg joined	01:51
	→ michelangelo joined	01:51
	← mellernoia left	01:52
	→ ensyde joined	01:53
	← a_thakur left	01:54
	→ ojdo joined	01:54
	← SwiftMatt left	01:54
	← rkazak left	01:55
	← donmichelangelo left	01:55
	← cdg left	01:55
	→ joki joined	01:55
	→ gaen joined	01:56
	← adron left	01:56
	→ durham joined	01:56
	→ raven-au joined	01:58
	→ Saylen joined	01:59
	→ radsy joined	01:59
	← dermoth__ left	02:00
	← gaen left	02:00
	→ dermoth__ joined	02:00
	← Sasazuka left	02:01
	→ mofai joined	02:01
	→ jaguarmagenta joined	02:01
	← mischat left	02:02
	→ diegoaguilar joined	02:04
	← fracting left	02:06
	← jaguarmagenta left	02:06
	→ nettoweb joined	02:09
	← mwhooker left	02:10
	← d4rklit3 left	02:11
	→ xcesariox joined	02:11
	← Noldorin left	02:11
	→ mwhooker joined	02:13
	← ril left	02:14
	→ dreiss joined	02:16
	→ govg joined	02:17
	← nettoweb left	02:17
	→ nitin joined	02:18
	→ pmort joined	02:18
	← raven-au left	02:21
	← nitin left	02:22
	← ceaucari left	02:22
	→ ceaucari joined	02:23
	→ tmcmahon joined	02:24
	← dreiss left	02:26
	→ Goplat joined	02:27
	← Gsham left	02:29
	→ stantonk joined	02:30
	→ eletuchy_ joined	02:30
	→ dreiss joined	02:31
	← ajf- left	02:31
	← mwhooker left	02:31
	→ ajf- joined	02:32
	← eletuchy left	02:33
	← ajf- left	02:33
	← stantonk left	02:35
	← durham left	02:38
	→ durham joined	02:40
	← fahadash left	02:42
	→ Gsham joined	02:42
	← staticshock left	02:42
	← hexagoxel left	02:43
	→ hexagoxel joined	02:45
	→ stantonk joined	02:45
	← digidog left	02:46
	→ rominronin joined	02:47
	← mattp_ left	02:49
	← pmort left	02:50
	→ eletuchy joined	02:50
	→ mattp_ joined	02:51
	← chachasmooth left	02:52
	→ adron joined	02:52
	→ chachasmooth joined	02:52
	← durham left	02:52
	← a3Dman left	02:52
	← rominronin left	02:52
	→ pmort joined	02:53
	→ a3Dman_ joined	02:54
	→ pneuma joined	02:54
	← eletuchy_ left	02:54
	← adron left	02:56
	→ gaen joined	02:57
	← arooni left	02:58
	← tmcmahon left	02:59
	→ nettoweb joined	03:00
	← tinanoo left	03:00
	← gaen left	03:01
	→ cova joined	03:01
	→ printline joined	03:02
	NeverDie → BasedGodDonald20	03:02
	← cova left	03:03
	→ ahr3n joined	03:03
	BasedGodDonald20 → BasedGodDonald	03:03
	← pmort left	03:04
	→ fossify joined	03:05
	→ aavrug joined	03:06
	← nettoweb left	03:07
	← printline left	03:09
	→ stonerfish joined	03:10
	← pneuma left	03:11
	→ arescorpio joined	03:13
	← inflames left	03:14
	BasedGodDonald → NeverDie	03:14
	→ inflames joined	03:14
	← inflames left	03:14
	→ inflames joined	03:15
	← aidalgol left	03:15
	→ durham joined	03:15
	← dreiss left	03:17
	→ aidalgol joined	03:19
	→ adron joined	03:19
	→ mehola joined	03:21
	→ b1tchcakes joined	03:22
	← aavrug left	03:23
	→ gaurav_ joined	03:23
	→ aavrug joined	03:23
	← aavrug left	03:23
	← gaurav_ left	03:23
	→ gaurav_ joined	03:23
	→ aavrug joined	03:23
	← gaurav_ left	03:23
	← aavrug left	03:23
	→ aavrug joined	03:23
	→ cite_ joined	03:23
	← aavrug left	03:24
	← adron left	03:25
	← yqt left	03:25
	→ anuvrat joined	03:25
	→ aavrug joined	03:27
	→ musca joined	03:27
	→ bronson joined	03:28
	→ arooni joined	03:28
	→ marko__ joined	03:30
	← noser left	03:30
	→ rkazak joined	03:32
	← sangy left	03:33
	← bronson left	03:33
	← durham left	03:35
	← anuvrat left	03:35
	→ rchavik joined	03:35
	← marlun left	03:35
	← rchavik left	03:35
	→ rchavik joined	03:35
	→ marlun joined	03:35
	← marlun left	03:35
	→ marlun joined	03:35
	← robogoat left	03:36
	→ anuvrat joined	03:36
	→ hwoarang joined	03:36
	→ themill joined	03:36
	→ r_rios joined	03:37
	← r_rios left	03:37
	→ r_rios joined	03:37
	← Mateon1 left	03:38
	→ d4rklit3 joined	03:40
	→ Mateon1 joined	03:40
	Mateon1 → Guest95361	03:40
	→ staticshock joined	03:41
	← stantonk left	03:41
	→ dreiss joined	03:42
	→ stantonk joined	03:42
	→ ahr3n_ joined	03:43
	← Gsham left	03:44
	← stantonk left	03:44
	→ muthu joined	03:46
	← ahr3n left	03:47
	→ NimeshNeema joined	03:47
	← johnwhitton left	03:48
	→ johnwhitton joined	03:49
	← drewo left	03:50
	→ jfelchner joined	03:51
	← fossify left	03:51
	← Guest95361 left	03:51
	→ Guest95361 joined	03:51
	Guest95361 → Mateon1	03:52
	← xcesariox left	03:52
	← kus left	03:52
	→ kus joined	03:53
	→ fedexo joined	03:54
	← radsy left	03:55
	← ensyde left	03:55
	→ thiago joined	03:57
	→ pmort joined	03:58
	← lindenle left	03:59
	← italoacasas left	04:01
	→ nnyk_ joined	04:01
	→ jaguarmagenta joined	04:02
	→ SwiftMatt joined	04:02
	→ printline joined	04:04
	← jaguarmagenta left	04:07
	← printline left	04:09
	→ robotroll joined	04:10
	← SwiftMatt left	04:10
	→ shinnya joined	04:11
	→ rscata joined	04:11
	← shinnya left	04:18
	← nnyk_ left	04:19
	→ durham joined	04:19
	→ nnyk_ joined	04:20
	← fedexo left	04:20
	→ adron_ joined	04:20
	← rkazak left	04:21
	← adron_ left	04:25
	← robotroll left	04:25
	→ a_thakur joined	04:27
	← Orbitrix left	04:28
	→ Orbitrix joined	04:31
	← Orbitrix left	04:31
	→ fedexo joined	04:31
	→ Orbitrix joined	04:31
	→ armin joined	04:32
	→ pelegreno joined	04:32
	← jfelchner left	04:37
	← pelegreno left	04:40
	← clemf left	04:40
	→ pelegreno joined	04:42
	← sarbs left	04:42
	→ stantonk joined	04:45
	→ OnBrokenWings joined	04:45
	← nnyk_ left	04:46
	← pelegreno left	04:48
	→ rominronin joined	04:48
	→ clemf joined	04:48
	← clemf left	04:49
	← stantonk left	04:49
	→ pelegreno joined	04:50
	← rominronin left	04:53
	← arooni left	04:54
	→ audio joined	04:55
	→ subhojit777 joined	04:55
	← Gamecubic left	04:55
audio	i am in a new (git checkout -b mynewbranch) branch with unstaged changes from another branch (oldbranch) that is not master. my problem is that this new branch contains code from the oldbranch. I dont want the code from oldbranch. How can I move these unstaged changes (but not the changes from oldbranch) into a new branch?	04:57
	← durham left	04:58
	→ clemf joined	04:58
	← fscala left	04:59
	← Cabanossi left	04:59
	← a_thakur left	05:00
	→ circ-user-iSXQf joined	05:00
	→ fscala joined	05:00
	→ Cabanossi joined	05:01
	→ nnyk_ joined	05:01
	← prsn left	05:03
	→ bronson joined	05:04
	→ nardev joined	05:04
	→ printline joined	05:05
	→ durham joined	05:06
	→ sauvin joined	05:06
	← ahr3n_ left	05:07
	← aidalgol left	05:08
	← bronson left	05:08
	← iooner left	05:08
	← r_rios left	05:09
	→ r_rios joined	05:09
	← r_rios left	05:09
	→ r_rios joined	05:09
	→ iooner joined	05:09
	← printline left	05:10
	← pmort left	05:10
	→ shadwick joined	05:10
	audio → gooby	05:11
shadwick	Hello. Does anyone know about how to read the "latest state" of a repo during an update hook as if the commit "had been applied"?	05:12
	I'd like to check the contents of a specific file to ensure that I can reject a push if I don't like the contents of said file.	05:12
	← eletuchy left	05:15
	→ pantsman- joined	05:17
	→ adron joined	05:21
	→ a_thakur joined	05:22
Seveas	shadwick: the update hook gets the name of the new head and its old and new object id's as parameters. You can use that to find the blob you're after	05:22
	→ dopesong joined	05:25
	← adron left	05:27
	→ duderonomy joined	05:28
shadwick	Seveas: But I'm looking to see the state of everything in the repo as if the update were applied, not just the diff of the update. Is this still what you mean?	05:28
	→ raven-au joined	05:29
	→ jaguarmagenta joined	05:29
	→ emPi joined	05:30
	→ pmort joined	05:31
nevyn	shadwick: I think you'd need to make a temp checkout then examine the file then destroy it?	05:33
	← tyreld left	05:34
	← durham left	05:34
	← d0nn1e left	05:35
	→ durham joined	05:35
	← alexsystemf__ left	05:36
	← bazz left	05:36
	→ testild joined	05:36
	→ alexsystemf__ joined	05:37
	→ bazz joined	05:38
shadwick	nevyn: That's sounding more likely. Checkout the $GIT_DIR, then apply the update diff to that checkout. Then examine the working tree	05:38
	→ ThomasLocke joined	05:39
	← testild left	05:40
Seveas	shadwick: yes it is, and no you don't need a checkout. Remember: a commit is not a patch but a full snapshot of your files.	05:42
	so if you want to see the content of a file at a particular commit, something like git show commit_sha1_here:path/to/file will work	05:42
	← rchavik left	05:43
	→ larrybolt joined	05:44
	← arescorpio left	05:44
	→ eletuchy joined	05:47
nevyn	ooh right.	05:47
	← ceaucari left	05:49
	→ [pabu] joined	05:49
	→ Prawnzy joined	05:49
	→ rominronin joined	05:49
shadwick	Seveas: Thanks! That's perfect	05:50
	← eletuchy left	05:51
	← rgrinberg left	05:54
	← rominronin left	05:54
	← __xor left	05:55
	← pmort left	05:55
	← nidr0x left	05:56
	← jaafar left	05:56
	→ _xor joined	05:56
	→ mehola_ joined	05:56
	→ stantonk joined	05:57
	← johnwhitton left	05:58
	← diogenese left	05:58
	→ adron joined	05:59
	→ nadim joined	05:59
	← mehola left	05:59
	← JCaesar left	05:59
	mar77i_ → mar77i	06:00
	← dermoth__ left	06:00
nevyn	in my travels today in teaching a new colegue who claimed to know git but couldn't rebase I found this useful: http://pcottle.github.io/learnGitBranching/	06:00
	→ Smirnov joined	06:00
	← Smirnov left	06:00
	→ Smirnov joined	06:00
	← adron left	06:00
nevyn	it's a webgame for learning git with a visual of the DAG beside it.	06:00
	→ dermoth__ joined	06:00
	→ adron joined	06:01
	← durham left	06:01
	→ PCatinean joined	06:01
	← stantonk left	06:02
	← nnyk_ left	06:02
	← _nadim left	06:02
	← OnBrokenWings left	06:03
	→ printline joined	06:06
	← leprechau left	06:07
	← b1tchcakes left	06:08
	← stonerfish left	06:08
	→ nidr0x joined	06:08
	→ LucaTM joined	06:09
	→ d0nn1e joined	06:09
	← printline left	06:11
	→ diogenese joined	06:11
	→ rominronin joined	06:14
	→ boombatower joined	06:15
	→ raijin joined	06:15
	← shadwick left	06:16
	→ Liudvikas joined	06:16
	→ rkazak joined	06:17
cbreak	nevyn: very limited	06:17
	← a_thakur left	06:18
cbreak	real git with !lol and co, or sourcetree, or what ever GUI, seems more powerful and more true to reality :)	06:18
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	06:18
	→ weox joined	06:18
	→ lamppid joined	06:18
	→ OnBrokenWings joined	06:20
	← Tylak left	06:21
	→ a_thakur joined	06:21
	→ EvilPeng1 joined	06:21
_xor	Stupid question: Which git command(s) would I look into if I want to pull files from another branch but NOT have it show in the history (i.e. merge)?	06:22
	← NimeshNeema left	06:22
_xor	cherry-pick?	06:22
	I'm basically building several starter templates. The master branch just has some basic files that are common to all branches. Then I have branch A which has some initial work. Then I'm going to create branch B off of master and want to pull most (if not all) files from branch A in to use as a starting point for modifications.	06:23
	However, branch B doesn't have any real direct relation to A (semantically), so I don't want it to show B as branching off of A.	06:24
	← nardev left	06:24
	← bgamari left	06:25
_xor	Oh wait, I guess I can just use git checkout, lol.	06:25
	← Pulp left	06:26
	← EvilPeng1 left	06:27
	→ leehambley joined	06:27
	← pelegreno left	06:27
	→ aidalgol joined	06:30
	→ pelegreno joined	06:30
	→ rchavik joined	06:31
	← dodobrain left	06:31
	← soerenb left	06:32
	← Guest14839 left	06:32
	→ soerenb joined	06:32
	← jaguarmagenta left	06:35
	→ Alienpruts joined	06:36
	← govg left	06:38
	→ harish_ joined	06:38
	→ tvw joined	06:38
cbreak	_xor: yes, if you just want the state. I'd be weary of giving up history lightly though	06:38
	especially if you want to keep the other branch	06:38
	_xor: if B is a separate thing, why is it in the same repository?	06:39
	← madewokherd left	06:39
cbreak	if there's a good reason, consider git checkout --orphan B to create it, instead of branching off of an existing one	06:39
	→ DWestCoast joined	06:40
	← Saylen left	06:41
	→ nardev joined	06:41
	→ Raging_Hog joined	06:41
	← nardev left	06:41
	← adron left	06:42
	← soerenb left	06:42
	← aidalgol left	06:42
	← OnBrokenWings left	06:43
	→ exprosic joined	06:44
	← exprosic left	06:44
	→ govg joined	06:45
	← theskillwithin left	06:45
	← runlevl4 left	06:46
	← rinwa__ left	06:47
	→ dan2k3k4 joined	06:47
	→ runlevl4 joined	06:47
	→ Sceorem joined	06:48
	← kadoban left	06:48
	→ zeroed joined	06:50
	← przemoc left	06:53
	← cagmz left	06:55
	→ leprechau joined	06:57
	→ dopesong_ joined	07:00
	→ przemoc joined	07:00
	← PryMar56 left	07:01
	← dopesong left	07:02
	→ johnwhitton joined	07:03
	→ hahuang61 joined	07:03
	← hahuang65 left	07:03
	→ b1tchcakes joined	07:04
	← Ardethian\\work left	07:04
	→ Ardethian\\work joined	07:04
	→ Phanes joined	07:04
	← Phanes left	07:04
	→ Phanes joined	07:04
	→ encod3 joined	07:05
	← Ardethian\\work left	07:05
	← Phanes left	07:05
	→ bronson joined	07:05
	→ Ardethian\work joined	07:05
	← dopesong_ left	07:08
	← gooby left	07:10
	← bronson left	07:10
	→ jceb joined	07:11
	→ soerenb joined	07:11
	→ JCaesar joined	07:11
	← clemf left	07:12
	→ cyan__ joined	07:14
	← a_thakur left	07:15
	→ hahuang65 joined	07:17
	← hahuang61 left	07:19
	→ a_thakur joined	07:21
	→ josuebrunel joined	07:24
	← tchan left	07:24
	→ fees joined	07:25
	← johnwhitton left	07:26
	→ Balliad joined	07:26
	→ isxek joined	07:27
	→ dopesong joined	07:28
	→ twem2 joined	07:29
	← zeroed left	07:29
	→ zeroed joined	07:29
	← Prawnzy left	07:31
	← thiago left	07:32
	→ printline joined	07:32
	← dopesong left	07:32
	→ kulyzu joined	07:33
	→ kuly-zu joined	07:33
	← kuly-zu left	07:33
	← kulyzu left	07:33
	→ eletuchy joined	07:35
	← printline left	07:37
	→ udm joined	07:37
	→ Gonzo89 joined	07:39
	→ p4trix joined	07:39
	→ ahmedelgabri joined	07:39
	← dreiss left	07:40
	→ quenode joined	07:40
	← eletuchy left	07:40
	→ postsneakernet joined	07:41
	← hahuang65 left	07:41
	→ p4trick joined	07:41
	→ Fijit joined	07:43
	→ Anupkumar joined	07:44
	→ infra-red joined	07:44
	← infra-red left	07:44
	→ nnyk_ joined	07:45
	→ chll joined	07:47
	← rkazak left	07:48
	→ anu1_ joined	07:51
	← anu1 left	07:54
	→ hahuang65 joined	07:55
	→ dreiss joined	07:56
	← anth0ny left	07:56
	→ saedelaere joined	07:58
	→ afuentes joined	08:00
	← subhojit777 left	08:02
	→ garethdaine joined	08:04
	← d4rklit3 left	08:04
_xor	cbreak: I considered orphaning branches, but having a common branch across all projects would/could be useful.	08:05
	→ al-damiri joined	08:05
	→ clmsy joined	08:05
cbreak	sounds stupid to me :)	08:06
	if they are unrelated, you don't need a common branch	08:06
_xor	cbreak: It's more about having a merge from another branch that's not really related. The branches themselves all relate to the same project.	08:06
cbreak	if they are related, then they are related	08:06
_xor	Well, for instance, there are a couple of files that are common across all branches. Aside from that though, most other stuff is going to be different.	08:06
	I might however make changes to those common files.	08:07
	I'd like to be able to fast-forward the changes easily.	08:07
	← zeroed left	08:07
cbreak	_xor: sounds like you abuse branches	08:08
	→ xcesariox joined	08:09
cbreak	how about doing it properly? :)	08:09
	→ zeroed joined	08:09
	← zeroed left	08:09
	→ zeroed joined	08:09
cbreak	i.e. a separate dependency repo, integrated via submodules, or subtree merging	08:09
	← nnyk_ left	08:09
_xor	Why would that be better?	08:10
cbreak	_xor: you can merge	08:10
_xor	Yes, and you can with branches too.	08:11
cbreak	branches with common history belong to the same project	08:11
	→ troulouliou_div2 joined	08:11
	→ freimatz joined	08:11
	→ leeN joined	08:11
	← saedelaere left	08:11
	→ _pix joined	08:12
	← FuzzySockets left	08:12
	← DWestCoast left	08:12
_xor	These do have a common history, they are related and have a chance to share files in the future. Some initial files are shared as is. I'm just trying to keep the history neat so that looking at the DAG someone can say, "Oh, ok this branch is meant for this functionality and has pulled from this other branch because it's already there."	08:12
	That type of stuff.	08:12
	→ dopesong joined	08:12
_xor	I just don't necessarily want to have the initial copies to show up as merges, as they'll be changed quite a bit. I could create them from scratch, but it's just a bit easier to copy from another branch.	08:13
	→ luzy joined	08:13
	→ nnyk_ joined	08:14
	← dopesong left	08:15
	→ SwiftMatt joined	08:15
	→ dopesong joined	08:15
	→ dodobrain joined	08:16
	← dodobrain left	08:18
	→ doener joined	08:18
	→ dodobrain joined	08:19
	→ raininja joined	08:21
	← raijin left	08:21
	← dreiss left	08:22
	→ marcogmonteiro joined	08:23
	→ bongjovi joined	08:23
	← fedexo left	08:26
	← jonno11 left	08:26
	← chll left	08:27
	← garethdaine left	08:28
	→ Sound joined	08:29
	→ eletuchy joined	08:29
	← danhuynh_______ left	08:30
	← nnyk_ left	08:31
	→ ahmed_elgabri joined	08:31
	← govg left	08:32
	← mikiones left	08:34
	← ahmedelgabri left	08:34
	← eletuchy left	08:34
	→ _28_ria joined	08:35
	→ jaguarmagenta joined	08:35
	→ kurkale6ka joined	08:37
	→ subhojit777 joined	08:37
	← fees left	08:38
	→ fees joined	08:39
	→ adron joined	08:39
	← staticshock left	08:40
	← jaguarmagenta left	08:40
	→ garethdaine joined	08:41
	→ nnyk_ joined	08:41
	→ evanvarvell joined	08:42
	← a_thakur left	08:44
	← adron left	08:44
	← freimatz left	08:45
	→ a_thakur joined	08:45
	← Goplat left	08:46
	← luzy left	08:47
	→ rnat_ joined	08:47
	← rnat_ left	08:48
	→ luzy joined	08:48
	← r00twrh left	08:48
	→ rnat joined	08:48
	→ r00twrh joined	08:48
	→ danhuynh______ joined	08:49
	→ chll joined	08:51
	← a_thakur left	08:53
	→ johnny56 joined	08:54
	→ bgamari joined	08:55
	→ yn5___ joined	08:55
	← johnny56_ left	08:56
	← bket left	08:58
	→ acetakwas joined	09:00
	← p4trick left	09:01
	← p4trix left	09:01
	← Sound left	09:01
	← a3Dman_ left	09:02
	→ a_thakur joined	09:02
	→ a3Dman joined	09:03
	→ nettoweb joined	09:07
	→ bronson joined	09:07
	→ bket joined	09:09
	← mehola_ left	09:11
	→ bulliby joined	09:11
	← bronson left	09:12
	← xcesariox left	09:12
	→ atrigent joined	09:13
	← Tanger left	09:13
	→ b1tchcak_ joined	09:15
	← garethdaine left	09:16
	← bgamari left	09:17
	← b1tchcakes left	09:18
b_jonas	Hi. When I give a command like 'git show somecommit somefile' to show the changes in that comment to a particular path in diff format, how do I give the filename as relative to the top of the repository, as opposed to relative to my working directory?	09:18
	→ apprentice joined	09:19
	→ anth0ny joined	09:20
	→ ewet joined	09:22
	→ akushner joined	09:23
	→ eletuchy joined	09:23
	→ mischat joined	09:24
	← a_thakur left	09:25
	← quenode left	09:27
	→ bouncy_ joined	09:27
	← josuebrunel left	09:27
	HelloShitty → HelloAtMega	09:28
	← bouncy_ left	09:28
	← eletuchy left	09:28
	→ a_thakur joined	09:28
	→ bgamari joined	09:28
	→ bouncy_ joined	09:28
	→ vigilancer joined	09:29
	← vigilancer left	09:29
	→ govg joined	09:30
	→ achadwick joined	09:30
	→ daftano joined	09:30
	← bouncy_ left	09:31
	→ br0kenman joined	09:31
	← bgamari left	09:31
	→ bouncy_ joined	09:31
	→ bgamari joined	09:32
	← cyphase left	09:33
	← ewet left	09:34
	← leeN left	09:34
	← daftano left	09:35
	→ cyphase joined	09:38
	← mrkat left	09:39
	→ mrkat joined	09:40
	→ sgambino joined	09:40
	← bouncy_ left	09:41
	→ bouncy_ joined	09:41
	→ ewet joined	09:43
	← bouncy_ left	09:43
	→ bouncy_ joined	09:43
	← boudiccas left	09:45
	← Waskeend left	09:46
Juri_Agarin	b_jonas: you could probably use git --work-tree=<your_repo_root> diff somecommit -- somefile	09:46
	And as explained in "man git", you can also set GIT_WORK_TREE environment variable to achieve the same.	09:47
gitinfo	the git manpage is available at http://jk.gs/git.html	09:47
	→ aidalgol joined	09:47
	→ mikiones joined	09:47
	→ printline joined	09:47
	→ tuxlu_ joined	09:48
	→ Waskeend joined	09:48
	← mikiones left	09:48
	→ mikiones joined	09:49
	← bouncy_ left	09:49
	← dopesong left	09:50
	→ Bvan joined	09:50
Juri_Agarin	If you use that often, a shell or a git-alias might be helpful.	09:51
	← tuxlu_ left	09:51
	← MattMaker left	09:52
	← printline left	09:52
	→ garethdaine joined	09:52
	gitinfo set mode: +v	09:52
Bvan	Hi, someone saw this error before: The fingerprint of this host is not registered by putty	09:52
	→ King_Hual joined	09:53
	← King_Hual left	09:53
	→ King_Hual joined	09:53
	→ boudiccas joined	09:55
	→ star_prone joined	09:55
	→ DrIranian joined	09:55
	← Liudvikas left	09:56
	← DrIranian left	09:56
	← Bvan left	09:56
	← acetakwas left	09:57
	← sgambino left	09:57
atrigent	b_jonas: it looks like git-show is delegating those paths to git diff-tree	09:57
	→ acetakwas joined	09:57
atrigent	the documentation for that command says: If provided, the results are limited to a subset of files matching one of these prefix strings. i.e., file matches /^<pattern1>\|<pattern2>\|.../ Note that this parameter does not provide any wildcard or regexp features.	09:57
	but that doesn't actually seem to be true...	09:58
	it definitely does take your cwd into account	09:58
	→ stantonk joined	09:59
	→ jungsubk joined	09:59
	→ Darcidride joined	10:00
	Darcidride → Guest60129	10:00
	← stantonk left	10:04
	→ dsdeiz joined	10:04
	→ Gloomy joined	10:05
	→ sgambino joined	10:06
	→ MattMaker joined	10:07
	→ ferr joined	10:10
	→ mehola joined	10:11
	← a_thakur left	10:11
	← jungsubk left	10:13
	→ a_thakur joined	10:13
	→ tchan joined	10:15
	→ quenode joined	10:16
	← mehola left	10:16
	→ dopesong joined	10:16
	← aidalgol left	10:16
	→ aidalgol joined	10:17
	→ eletuchy joined	10:17
	← star_prone left	10:18
	→ EY joined	10:19
	← SwiftMatt left	10:19
	← piling left	10:19
	→ piling joined	10:20
b_jonas	Juri_Agarin: ouch. in that case, how do I ask git the path to the repository root?	10:21
	atrigent: thanks for checking.	10:21
	← tvw left	10:22
	← EY left	10:22
	→ EY joined	10:22
	← zero85 left	10:22
	→ scribe joined	10:22
	← EY left	10:23
	→ EY joined	10:23
	← eletuchy left	10:23
	→ zero85 joined	10:23
	← dan2k3k4 left	10:24
	→ adron joined	10:25
	← zero85 left	10:25
	→ eletuchy joined	10:26
	→ zero85 joined	10:27
	→ dan2k3k4 joined	10:27
	→ sdothum joined	10:28
	← Impaloo left	10:29
	→ Impaloo joined	10:29
	← adron left	10:30
	→ aax joined	10:30
	← zero85 left	10:30
	← andyhoang left	10:30
	→ xelxebar joined	10:31
	← Impaloo left	10:31
	→ settermjd joined	10:32
	→ Impaloo joined	10:32
	→ zero85 joined	10:32
	← Impaloo left	10:33
	→ Impaloo joined	10:33
	← apprentice left	10:34
	← zero85 left	10:35
	→ jaguarmagenta joined	10:36
	→ zero85 joined	10:38
	→ Sonderblade joined	10:40
	← jaguarmagenta left	10:41
	→ mdw joined	10:41
	← zero85 left	10:41
	← danhuynh______ left	10:42
Seveas	b_jonas: git rev-parse --git-dir (or --show-toplevel)	10:42
	→ Sendoushi joined	10:44
	→ zero85 joined	10:44
	← neanderslob left	10:44
b_jonas	Seveas: thanks	10:46
	→ xcesariox joined	10:47
	→ mar77i_ joined	10:47
b_jonas	Seveas: the latter (git rev-parse --show-toplevel) seems to work	10:47
	so if this comes up more often, I can build a shell alias that runs a git in the top level directory	10:47
	mar77i_ → mar77	10:47
	← zero85 left	10:48
	← mar77i left	10:49
	→ zero85 joined	10:50
	→ daftano joined	10:52
	← zero85 left	10:54
osse	alias topgit='git -C "$(git rev-parse --show-toplevel)"'	10:54
	b_jonas: you can also prefix paths with :/	10:55
	→ zero85 joined	10:56
	mar77 → mar77i	10:57
	← cagedwisdom left	10:57
	← bgamari left	10:58
atrigent	osse: is that documented anywhere?	10:59
	← boombatower left	10:59
	← Sceorem left	11:00
osse	atrigent: man gitglossary	11:00
gitinfo	atrigent: the gitglossary manpage is available at http://jk.gs/gitglossary.html	11:00
osse	see pathspec	11:00
	← zero85 left	11:00
	← rominronin left	11:03
	→ zero85 joined	11:03
	→ codepilot joined	11:04
	← zeroed left	11:04
	→ rominronin joined	11:04
atrigent	I see, thanks	11:05
	not very discoverable, unfortunately	11:05
	→ bgamari joined	11:05
codepilot	hello... I have a question: my git project has two submodules. If I say git submodules, it gives me only one, but in the file .gitmodules are two submodules. If I do 'git submodule init' it only initializes the one given with 'git submodules' but not the other one. What is wrong here? I get such problems recently....	11:06
	→ zeroed joined	11:06
	← settermjd left	11:06
jast	it's also in man gitrevisions btw	11:06
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	11:06
atrigent	jast: where?	11:07
	← sgambino left	11:07
atrigent	I see some things in there that are similar, but not actually relevant afaict	11:07
	← zero85 left	11:07
atrigent	plus, it wouldn't make sense for it to be in gitrevisions, since it's not a way of specifying a revision	11:08
	→ zero85 joined	11:09
	→ bronson joined	11:09
jast	it lists a number of related things, and they're actually for object lookup, not revisions specifically	11:10
	← aidalgol left	11:10
jast	the same text is included in a number of other manpages, too	11:10
	← mdw left	11:11
jast	anyway, disregard, it does not mention pathspecs. I was thinking about something different.	11:11
	← bahar left	11:12
	← zero85 left	11:13
	← daftano left	11:14
	→ zero85 joined	11:14
	← bronson left	11:14
b_jonas	osse: oh, let me try that	11:14
	→ fsvehla joined	11:14
osse	atrigent: Definitely agree.	11:15
	→ daftano joined	11:15
b_jonas	osse: thank you, prefixing the path with ":/" works	11:17
	(git syntax is confusing)	11:17
	← zeroed left	11:17
	← zero85 left	11:18
	→ johnmilton joined	11:18
	← johnnyfive left	11:18
	→ printline joined	11:18
	→ deadnull_ joined	11:19
	→ zero85 joined	11:20
	← acetakwas left	11:21
	→ shiriru joined	11:22
osse	b_jonas: It's part of a larger set of syntax to specify paths	11:23
	Without context it doesn't make much sense	11:23
	← zero85 left	11:24
	→ zeroed joined	11:24
	← zeroed left	11:24
	→ zeroed joined	11:24
	→ mase-tech joined	11:25
	← daftano left	11:25
	→ zero85 joined	11:26
	→ rnsanchez joined	11:26
	→ adron joined	11:27
	→ mohabaks joined	11:29
	→ jbitdrop joined	11:30
b_jonas	osse: yes, and I think I read about the part where after a revision, I can write ":foo" to give a path relative to the repository top or ":./foo" for a path relative to the wd, but not ":/foo" because that's syntax for something else,	11:30
	← zero85 left	11:30
	→ ceaucari joined	11:30
	← Gloomy left	11:30
b_jonas	osse: but I didn't know that I can give a path this way	11:31
	← algae left	11:31
b_jonas	osse: so I think ":/foo" does something completely different as a path and as an object argument	11:31
	very confusing	11:31
	→ zero85 joined	11:32
b_jonas	Now where did my MERGE_HEAD disappear? I thought I did a merge	11:32
	← adron left	11:32
b_jonas	I think the git checkout cleared it	11:33
	→ TomyLobo joined	11:33
	← printline left	11:33
	→ sgambino joined	11:33
	← dopesong left	11:34
	→ averell joined	11:34
atrigent	b_jonas: yeah, the things described in gitrevisions are for referring to whole blobs, while pathspecs are more generally when a command lets you specify paths for some purpose	11:35
	← zero85 left	11:36
atrigent	pathspecs are described in man gitglossary, as was said earlier	11:36
gitinfo	the gitglossary manpage is available at http://jk.gs/gitglossary.html	11:36
	→ nilsi_ joined	11:36
	→ pwnawannab[NE] joined	11:37
	→ dopesong joined	11:38
	→ nardev joined	11:41
	→ venmx joined	11:42
	← nowhere_man left	11:42
	← shiriru left	11:44
b_jonas	MERGE_HEAD is a reference to a commit I'm merging from. But the commit message when such a merge is in progress gives the name of the branch I'm merging from, since I gave a branch name to git merge. The information of what branch name I used, is that stored only in the MERGE_MSG file?	11:44
	→ nowhere_man joined	11:45
	deadnull_ → _deadnull	11:45
	→ Qwez joined	11:45
	← Qwez left	11:46
	→ digidog joined	11:47
	← ceaucari left	11:47
	← digidog left	11:47
	→ digidog joined	11:48
codepilot	hello... I have a question: my git project has two submodules. If I say git submodules, it gives me only one, but in the file .gitmodules are two submodules. If I do 'git submodule init' it only initializes the one given with 'git submodules' but not the other one. What is wrong here? I get such problems recently....	11:48
	→ AnnabelSchmidt joined	11:50
	→ jimi_ joined	11:51
	→ Rish joined	11:52
	→ Gloomy joined	11:52
	→ ceaucari joined	11:52
	← CussBot left	11:52
	→ CussBot joined	11:53
	→ docnvk joined	11:53
	→ bitkiller joined	11:56
	← codepilot left	11:56
	→ Sceorem joined	11:56
	→ josuebrunel joined	11:58
	→ nilsi joined	11:58
	← sgambino left	11:58
	← fstd left	11:59
	_deadnull → deadnull_	11:59
	← nilsi_ left	12:00
	→ prsn joined	12:00
	→ fstd joined	12:00
	→ jab416171 joined	12:00
cbreak	codepilot: git ls-tree -R	12:00
	each commit entry is a registered submodule	12:01
	→ crose joined	12:03
	← dopesong left	12:03
	← prsn left	12:04
	→ fahadash joined	12:05
	→ dopesong joined	12:05
	→ synthroid joined	12:05
	← EY left	12:06
	← wviana left	12:07
	→ wviana joined	12:07
	→ EY joined	12:08
	→ mdw joined	12:09
	← Junior left	12:09
	→ jaguarmagenta joined	12:10
	→ nilsi_ joined	12:10
	← eletuchy left	12:10
	← nilsi left	12:10
	← Gloomy left	12:10
	→ eletuchy joined	12:11
	← mohabaks left	12:11
	→ soc42 joined	12:11
	← ceaucari left	12:13
	← jaguarmagenta left	12:15
	← eletuchy left	12:15
	← Sendoushi left	12:16
	← subhojit777 left	12:16
	docnvk → zz_docnvk	12:17
	→ subhojit777 joined	12:17
	← subhojit777 left	12:18
	→ Sendoushi joined	12:18
	→ star_prone joined	12:19
	→ ceaucari joined	12:19
	← ghostal_ left	12:20
	→ rwb joined	12:21
	→ Junior joined	12:21
	← star_prone left	12:24
	→ deadnul__ joined	12:24
	← encod3 left	12:25
	← Junior left	12:25
	→ Junior joined	12:25
	→ encod3 joined	12:26
	→ noser joined	12:26
	← deadnull_ left	12:27
	→ adron joined	12:29
	→ qtax^w joined	12:32
	← NeverDie left	12:34
	← qtax^^w left	12:34
	← netj left	12:35
	← aavrug left	12:35
	→ netj joined	12:35
	← adron left	12:36
puff	Good morning.	12:36
osse	Vieeeetnaaaaam!!!	12:38
	→ aviraldg_ joined	12:44
	→ eletuchy joined	12:44
	← jceb left	12:45
	→ rgrinberg joined	12:45
	← LucaTM left	12:46
	→ tach_ joined	12:46
	→ LucaTM joined	12:47
	← Impaloo left	12:47
	→ Impaloo joined	12:48
	← eletuchy left	12:49
	← LucaTM left	12:49
	→ titankiller joined	12:49
	→ Achylles_ joined	12:49
	→ LucaTM joined	12:50
	→ ksinkar joined	12:51
	← LucaTM left	12:52
	→ LucaTM joined	12:53
	← boudiccas left	12:53
	→ italoacasas joined	12:53
ksinkar	I am trying to remove the history of my git repo. Basically I want to have a specific commit (node of my git tree) to become the initial commit (the root of my git tree). How can I make that possible?	12:53
	zz_docnvk → docnvk	12:53
ksinkar	When I say git tree, I mean the commit history tree.	12:54
arahael	ksinkar: modify that commit to have no parents. and rewrite all your histoey in the process.	12:54
	← jimi_ left	12:55
arahael	ksinkar: git filter-branch	12:55
	← LucaTM left	12:55
	→ algae joined	12:55
	→ LucaTM joined	12:56
	→ notebox joined	12:56
	→ jimi_ joined	12:56
	← LucaTM left	12:57
	→ sgambino joined	12:58
	→ cdg joined	12:58
	← cdg left	12:58
	→ LucaTM joined	12:58
	→ settermjd joined	12:58
	→ cdg joined	12:59
	← LucaTM left	12:59
	→ UrsoBranco joined	12:59
	→ daftano joined	12:59
	← rnat left	12:59
	← rscata left	13:00
	← settermjd left	13:00
	→ jimi_sanchez joined	13:00
	← jimi_ left	13:00
	→ settermjd joined	13:00
	← bsanford_ left	13:01
	← settermjd left	13:02
	→ oepit joined	13:03
ksinkar	arahael: If I have understood you correctly I should use a --commit-filter and be done with it. Let me try it and get back to you.	13:03
	← oepit left	13:04
	← garethdaine left	13:04
arahael	ksinkar: i'm not familiar with the specifics.	13:04
	ksinkar: as i've never done it.	13:04
	→ jceb joined	13:05
	← Ananya left	13:05
	→ Gsham joined	13:05
	← deavid left	13:06
	→ deavid joined	13:07
	← jimi_sanchez left	13:08
ksinkar	arahael: have you ever used git-filter-branch?	13:08
	→ jimi joined	13:08
	→ Ananya joined	13:08
	→ Achylles joined	13:09
	← Achylles_ left	13:09
arahael	ksinkar: yes, but not for that reason. i used it to graft a branch.	13:09
	→ stasmakarov joined	13:10
	→ bronson joined	13:10
	→ rnsanchez_ joined	13:11
	→ WayToDoor joined	13:11
	← rnsanchez left	13:13
	→ bsanford_ joined	13:13
	→ xbob joined	13:14
	← jimi left	13:14
	→ jimi joined	13:14
	← clmsy left	13:14
	← bronson left	13:15
	→ Achylles_ joined	13:16
	← jimi left	13:16
	→ jimi joined	13:17
	← Dougie187 left	13:17
	→ bollullera joined	13:17
	← bollullera left	13:18
	→ bollullera joined	13:18
	→ sfr^ joined	13:20
	← fscala left	13:20
	→ GT4066 joined	13:21
	← mdw left	13:21
	→ tlaxkit joined	13:21
ksinkar	arahael: I am doing almost the same. I simply taking a node and grafting it to the root bypassing and deleting the middle ones. For some reason I keep getting this message "WARNING: Ref 'refs/heads/master' is unchanged" and no history is deleted.	13:21
	→ fscala joined	13:22
	→ jaafar joined	13:22
	← zeroed left	13:23
	← TomyLobo left	13:23
	← a_thakur left	13:24
	← Achylles_ left	13:24
	→ garethdaine joined	13:24
	→ TomyLobo joined	13:26
	← jimi left	13:27
	→ DolphinDream joined	13:28
	→ tinanoo joined	13:28
	→ jimi_ joined	13:29
	→ zeroed joined	13:29
	→ ZenWalker joined	13:29
	→ mizu_no_oto joined	13:29
	← Achylles left	13:30
	← WayToDoor left	13:30
	→ Achylles joined	13:30
	← tvon left	13:30
	← wviana left	13:30
	← Rish left	13:30
	→ wviana joined	13:31
	→ marscher joined	13:32
	← Achylles left	13:32
	→ adron joined	13:32
	→ BigWillie joined	13:33
	→ diegoviola joined	13:33
	← daftano left	13:34
	→ Zean joined	13:35
	→ acetakwas joined	13:36
	→ bouncy_ joined	13:36
	← adron left	13:37
	→ steveearl joined	13:37
	← jimi_ left	13:38
	→ eletuchy joined	13:38
	→ fwdit joined	13:38
	→ Impaloo27 joined	13:40
	→ jimi_ joined	13:40
	← acetakwas left	13:41
	← eletuchy left	13:42
	→ prsn joined	13:42
	← Mez left	13:43
	← titankiller left	13:44
	→ Spacew00t joined	13:45
	← Gsham left	13:45
	← mizu_no_oto left	13:46
	→ Dougie187 joined	13:47
	→ AaronMT joined	13:48
	→ jimi_sanchez joined	13:49
	→ abyx joined	13:49
	← jimi_ left	13:50
	← bouncy_ left	13:50
	← sfr^ left	13:51
	← holodoc left	13:51
	→ fmcgeough joined	13:51
	← BlaXpirit left	13:53
	← ahmed_elgabri left	13:54
	← chachasmooth left	13:54
	→ NeverDie joined	13:55
	→ acetakwas joined	13:55
	← bsanford_ left	13:55
	← dodobrain left	13:56
	→ exarch joined	13:56
	← abyx left	13:57
	→ phaleth joined	13:57
	→ ahmed_elgabri joined	13:58
	→ ash_workz joined	13:58
	→ m0nkmaster joined	13:58
	← Impaloo27 left	14:00
	→ stantonk joined	14:00
	→ annoymouse joined	14:01
	→ chachasmooth joined	14:03
	→ BlaXpirit joined	14:03
	→ kfpratt joined	14:03
	← stantonk left	14:05
	← bouncy left	14:06
	→ bouncy joined	14:07
	→ danhuynh______ joined	14:07
	→ lindenle joined	14:08
	→ subhojit777 joined	14:09
	← ksinkar left	14:09
	← bouncy left	14:09
	→ bouncy joined	14:10
	→ abyx joined	14:11
	→ dhollinger joined	14:12
	→ Spacew00_ joined	14:12
	→ patarr joined	14:12
	→ mehola joined	14:12
	← lindenle left	14:13
	← ewet left	14:13
	← xcesariox left	14:14
	← circ-user-iSXQf left	14:14
	→ Gsham joined	14:15
	→ nofacade joined	14:15
	← Spacew00t left	14:15
	← M-mistake left	14:15
	→ CubiK joined	14:16
	← digidog left	14:16
	→ M-mistake joined	14:17
	← mehola left	14:17
	→ digidog joined	14:17
	← jason237 left	14:18
	→ jason237 joined	14:18
	→ vincentor joined	14:18
	→ holodoc joined	14:19
	← nchambers left	14:21
	← M-mistake left	14:21
	← fahadash left	14:22
	→ jimi joined	14:22
	→ M-mistake joined	14:22
	← jimi_sanchez left	14:22
	→ madewokherd joined	14:23
	← ahmed_elgabri left	14:24
	← weox left	14:24
	← fwdit left	14:25
	→ perlpilot_ joined	14:25
	← raininja left	14:26
	→ bronson joined	14:26
	→ LucaTM joined	14:27
	← perlpilot left	14:27
	→ perlpilot joined	14:27
	← nnyk_ left	14:27
	← notebox left	14:30
	← BigWillie left	14:30
	← bouncy left	14:30
	→ daftano joined	14:31
	aax → xaa	14:31
	→ boingy1 joined	14:31
	← EY left	14:31
	→ EY joined	14:32
	→ ahmed_elgabri joined	14:32
	← algun left	14:32
	→ eletuchy joined	14:32
	← boingy1 left	14:32
	→ boingy1 joined	14:33
	→ Guest75702 joined	14:33
	← jimi left	14:35
	→ jimi joined	14:35
	jimi → jimi_	14:35
	← eletuchy left	14:37
	→ raijin joined	14:37
	← Guest75702 left	14:38
	→ ifsp joined	14:39
	→ Gamecubic joined	14:39
	→ jwest joined	14:40
	← boingy1 left	14:40
	← vincentor left	14:41
	→ boingy joined	14:41
	← crose left	14:43
	← perlpilot left	14:43
	gitinfo set mode: +v	14:43
	perlpilot_ → perlpilot	14:43
	→ perlpilot_ joined	14:44
	→ kpease joined	14:44
	→ livingstn joined	14:45
	→ stantonk joined	14:45
	← CubiK left	14:46
	→ CubiK joined	14:47
	← bronson left	14:47
	← aviraldg_ left	14:48
	← mattfoo left	14:49
	← sagerdearia left	14:50
	→ efco joined	14:51
	← rgrinberg left	14:51
	← CubiK left	14:51
	→ hobodave joined	14:51
	→ notebox joined	14:52
	→ johnwhitton joined	14:52
	← Anupkumar left	14:53
	→ armin_ joined	14:54
	→ mattfoo joined	14:54
	→ boontdustie joined	14:55
	← armin left	14:55
	→ CheckDavid joined	14:57
	→ johnnyfive joined	14:57
	← blur3d left	14:58
	→ kilo_bravo joined	14:58
	← m0nkmaster left	14:59
	→ jeffreylevesque joined	14:59
	gitinfo set mode: +v	15:00
	gitinfo set mode: +v	15:00
	← akushner left	15:00
steveearl	anyone ever loose some data through "git checkout ."?	15:00
	*lost	15:00
	→ stantonk_ joined	15:01
	→ zero85 joined	15:01
	→ Impaloo62 joined	15:01
	← cyan__ left	15:02
	← josuebrunel left	15:02
	→ infra-red joined	15:02
	→ josuebrunel joined	15:03
perlpilot	steveearl: I'm sure there are many people who have done so :)	15:03
	← stantonk left	15:04
perlpilot	steveearl: if you follow-up question is "how do get the data back?" I may have some bad news for you.	15:04
	← daftano left	15:04
	← zero85 left	15:04
	← nettoweb left	15:05
	← rominronin left	15:05
	← troulouliou_div2 left	15:06
	← bulliby left	15:06
	→ crose joined	15:06
	→ dmto joined	15:06
	→ zero85 joined	15:06
steveearl	luckily I'm not in that position, I'm just wondering why checkout file is so quiet about deleting content?	15:07
	← infra-red left	15:08
	→ zean79 joined	15:08
	← zero85 left	15:08
	→ dopesong_ joined	15:09
	← dopesong_ left	15:09
	← zean79 left	15:09
	→ troulouliou_div2 joined	15:10
perlpilot	steveearl: I dunno, but I would guess it's because it's "git checkout"'s job to over write things and if you didn't want that to happen, you wouldn't have been using it	15:10
	→ daftano joined	15:11
	→ chrisgeorge joined	15:11
	← acetakwas left	15:11
	← Sceorem left	15:12
	← dopesong left	15:12
	→ zero85 joined	15:12
	→ bango2 joined	15:13
	→ zean79 joined	15:13
	← zero85 left	15:13
	← Gsham left	15:13
	← zean79 left	15:14
	← Alienpruts left	15:14
	→ Pulp joined	15:15
	→ zero85 joined	15:15
	← ThomasLocke left	15:16
	← zero85 left	15:16
	→ acetakwas joined	15:16
	← Guest80967 left	15:16
	→ Guest80967 joined	15:16
	→ zero85 joined	15:17
	← PCatinean left	15:17
	← zero85 left	15:17
	→ staticshock joined	15:18
	→ zero85 joined	15:18
	← zero85 left	15:19
	→ akushner joined	15:20
	← yn5___ left	15:21
	→ zero85 joined	15:21
	→ slavka` joined	15:21
	← zero85 left	15:22
	→ zero85 joined	15:22
	→ zean43 joined	15:23
slavka`	hey all, i did a merge which resulted in some conflicts, then staged and unstaged files with conflicts, just wondering now is there a way to see which files have conflicts?	15:23
	→ leeN joined	15:23
	← zero85 left	15:23
steveearl	slavka are you using git in the command line?	15:23
	← synthroid left	15:23
slavka`	both source tree and command line	15:24
	→ zero85 joined	15:24
slavka`	i did the merge using source tree...	15:24
	but now i cant see conflicts anywhere	15:24
	← boontdustie left	15:24
	→ dreiss joined	15:25
slavka`	i havent resolved them so i know they are there	15:25
	:/	15:25
steveearl	did you apply the stash?	15:25
slavka`	no branch merge	15:25
	→ chitopunk joined	15:25
	← EY left	15:25
steveearl	ah sorry I misread...	15:25
	← Gonzo89 left	15:25
slavka`	all good	15:25
	← zero85 left	15:25
	→ mohabaks joined	15:26
	→ boudiccas joined	15:26
	→ EY joined	15:26
slavka`	there anything i can do?	15:27
	→ thiago_ joined	15:27
	← Balliad left	15:27
	← daftano left	15:27
	← jceb left	15:28
	→ zero85 joined	15:28
steveearl	its strange to be honest if git doesnt show you modified files there should be no conflicts.	15:28
	are you still merging?	15:28
	→ erichf joined	15:28
slavka`	no, it shows me modified files	15:28
	thiago_ → thiago	15:28
	→ Phasee joined	15:28
	← zean43 left	15:28
slavka`	but i dont know which ones have conflicts	15:28
	← muthu left	15:29
steveearl	if you type git status what do you see?	15:29
	→ rgrinberg joined	15:29
	← zero85 left	15:29
tcsc	is there a way to unstage all changes but leave the commit intact? (my reason for doing this is pretty lame, but basically my editor seems to have an easier time navigating between uncommitted changes/hunks, but there's some metadata added to the commit message by a git plugin that's used for the code review system we use where i work, so I don't want to	15:30
	just reset --soft)	15:30
steveearl	i recreated what you did stage and unstage during a merge and it still shows me my the modified file	15:30
slavka`	i see a message saying all conflicts fixed... but you still merging...	15:30
	whole bunch of not staged files	15:30
	the thing is ... i havent fixed those conflicts... so im confused	15:30
Eugene	!repro	15:30
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see	15:30
	→ zero85 joined	15:30
steveearl	"and below you see changes not staged for commit"?	15:30
	→ David_ joined	15:31
slavka`	yep	15:31
tcsc	err, i don't mean unstage. i mean move stuff from the most commit to into the staging area	15:31
	← br0kenman left	15:31
	← zero85 left	15:31
slavka`	steveearl: whole bunch of unstaged and untracked files...	15:32
Eugene	tcsc - `git checkout -- file` will checkout file as it exists at HEAD to the work-tree and to the staging area. Is that what you want?	15:32
	→ lindenle joined	15:32
steveearl	@slavka and there should be files markes as modified?	15:32
	→ tyreld joined	15:32
slavka`	yep there are	15:32
tcsc	Eugene: no, i'm basically looking for a way to do `git reset --soft HEAD^` without actually losing the commit	15:32
	→ zero85 joined	15:33
steveearl	@slavka' are those not the files you are looking for?	15:33
	← zero85 left	15:33
slavka`	ok, so some of those files have conflicts in them	15:33
	but i dont know which ones	15:33
Eugene	tcsc - you want to be able tocome back to HEAD later? You can make a temp-branch or write down the SHA	15:33
	→ zero85 joined	15:33
	→ zean43 joined	15:33
	← zean43 left	15:34
	← MatthewAllan93 left	15:34
	← Sendoushi left	15:34
	← xbob left	15:34
	→ Tylak joined	15:34
	→ dopesong joined	15:34
	← zero85 left	15:35
	← nofacade left	15:35
steveearl	@slavka` unfortunately I dont believe its possible unless you go into each file and look for the <<HEAD >>master markings	15:35
slavka`	dam, that sux...	15:35
steveearl	@slavka` i would just "git merge --abort" and start fresh	15:35
slavka`	ahh ok you can do that cool... ill try	15:35
	← de-vri-es left	15:35
steveearl	good luck	15:35
	← steveearl left	15:36
	← zeroed left	15:36
tcsc	Eugene: hm, i think maybe i'm not explaining the situation well. I made a commit, pushed it up for code review, and got told 'fix X, Y, Z'. usually I just do this manually using git commit --amend, git rebase -i, etc. this time it's enough small changes (mostly code style stuff, like ensure spaces around all the operators), that I'd really like to be sure I	15:36
	go over all the changes in the commit. the easiest way for me to do this in my editor is to navigate between uncommitted changes	15:36
	→ zero85 joined	15:36
	→ de-vri-es joined	15:36
tcsc	Eugene: the catch is that i'd really like to not loose the SHA	15:36
	otherwise reset --soft would be ideal	15:36
	← zero85 left	15:37
	→ nettoweb joined	15:37
	→ Gsham joined	15:37
	→ zean43 joined	15:37
	→ MatthewAllan93 joined	15:37
Eugene	Make a temp branch(`git branch saveme`), reset like you want to, and then you can reset back to saveme or whatever you want	15:37
tcsc	hmmm	15:38
	okay	15:38
	← dmto left	15:38
	→ zero85 joined	15:38
Eugene	You could also just view the SHA in the !reflog. Git tries /really/ hard not to lose things for you.	15:38
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	15:38
tcsc	yeah, the reflog is something i'm aware of, but don't actually know how to use	15:38
	← Zean left	15:38
_ikke_	It's just a list where each change to HEAD and branches is recorded in	15:39
	git reflog and git log -g	15:39
	→ Zean joined	15:39
	← zero85 left	15:39
	← Gsham left	15:39
	← dopesong left	15:39
	→ alt^255 joined	15:40
	→ mizu_no_oto joined	15:40
alt^255	Hi. How can I "pull" a single file out of a branch? Alternatively, how can I 'git checkout' only a sub-directory of a branch?	15:40
_ikke_	alt^255: Do you want these files / directories in your working tree?	15:41
alt^255	sorry I just realised I can simply do 'git checkout branch file'	15:41
_ikke_	yeah, was about to suggest that	15:41
Eugene	That is exactly what we were going to recommend, with the !dashes	15:41
gitinfo	Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"	15:41
	→ zero85 joined	15:42
alt^255	odd how the solution comes to mind like .5 seconds after asking. Every. Single. Time.	15:42
_ikke_	Rubber ducking	15:42
	alt^255 needs a rubber duck	15:42
alt^255	aye	15:42
_ikke_	:-)	15:42
	We have no problem to be your rubber duck :P	15:42
alt^255	heh thanks	15:42
	← zero85 left	15:42
	Eugene quacks	15:42
	→ zero85 joined	15:43
	← Zean left	15:43
	← rchavik left	15:44
	← brandonw left	15:44
	→ dopesong joined	15:44
	← zero85 left	15:45
	→ brandonw joined	15:46
	← duderonomy left	15:46
	→ zero85 joined	15:47
	→ PryMar56 joined	15:47
	→ bronson joined	15:48
	← zero85 left	15:48
	← thiago left	15:48
	← deadnul__ left	15:48
	→ zero85 joined	15:49
	← kpease left	15:49
	← zero85 left	15:50
	← stantonk_ left	15:50
	← BenderRodriguez left	15:50
	← ochorocho__ left	15:51
	→ anu0 joined	15:51
	→ duderonomy joined	15:51
	→ zero85 joined	15:51
	→ PCatinean joined	15:52
	→ bruce_lee joined	15:52
	← bruce_lee left	15:52
	→ bruce_lee joined	15:52
	→ stantonk joined	15:52
	← zero85 left	15:52
	← mizu_no_oto left	15:53
	← bronson left	15:53
	→ zero85 joined	15:54
	→ synthroid joined	15:54
	→ dmto joined	15:54
	→ Gsham joined	15:54
	← anu1_ left	15:54
	← soc42 left	15:54
	→ bsanford joined	15:54
	→ Noldorin joined	15:54
	→ elastix joined	15:55
	← slavka` left	15:55
	← Gsham left	15:55
	← zero85 left	15:55
	→ nothingmuch joined	15:55
	← fsvehla left	15:55
	← Raging_Hog left	15:56
	→ slavka` joined	15:56
	→ zero85 joined	15:56
	→ The_Phoenix joined	15:56
	← The_Phoenix left	15:56
	← xaa left	15:57
	→ bobdel joined	15:57
	→ The_Phoenix joined	15:57
	← zero85 left	15:57
	← The_Phoenix left	15:58
	← stantonk left	15:58
	← bobdel left	15:59
	← raijin left	15:59
	→ stantonk joined	15:59
	→ Lunatrius` joined	15:59
	← mohabaks left	15:59
	← Lunatrius left	15:59
	→ adron joined	15:59
	→ The_Phoenix joined	16:00
	Lunatrius` → Lunatrius	16:00
	← Guest60129 left	16:00
	← The_Phoenix left	16:00
	→ Zean joined	16:00
	← Guest80967 left	16:00
	→ Guest80967 joined	16:01
	→ star_prone joined	16:01
	← acetakwas left	16:02
	← stantonk left	16:02
	→ stantonk joined	16:02
	→ Zean_ joined	16:02
	→ The_Phoenix joined	16:02
	→ acetakwas joined	16:02
	← Zean left	16:02
	← madewokherd left	16:04
	← ahmed_elgabri left	16:04
	← adron left	16:04
	→ kpease joined	16:05
	← star_prone left	16:05
nothingmuch	i want a command I that splits commits by file/hunk, to use in a rebase todo file. I'm thinking first commit --allow-empty -C $orig_commit and then git commit --fixup to allow autosquashing. not sure how to approach per hunk splitting (maybe --edit with a perl script in place of the editor?). thoughts/advice would be much appreciated	16:05
	← kpease left	16:06
	← Impaloo left	16:07
	→ Vaelatern joined	16:08
	→ adron joined	16:08
	→ Zean joined	16:09
	← Zean_ left	16:10
	→ prsn_ joined	16:10
	→ unbalancedparen joined	16:10
	← Zean left	16:11
	→ kpease joined	16:11
	→ Zean joined	16:11
	← prsn left	16:12
	← _pix left	16:12
	→ mehola joined	16:14
	→ Gsham joined	16:14
	→ ochorocho__ joined	16:14
	← Zean left	16:15
	→ Zean joined	16:15
	gitinfo set mode: +v	16:16
	→ BenderRodriguez joined	16:16
	→ prsn joined	16:17
	→ circ-user-fe9O3 joined	16:18
nothingmuch	i want a command I that splits commits by file/hunk, to use in a rebase todo file. I'm thinking first commit --allow-empty -C $orig_commit and then git commit --fixup to allow autosquashing. not sure how to approach per hunk splitting (maybe --edit with a perl script in place of the editor?). thoughts/advice would be much appreciated	16:18
	← mehola left	16:18
	← slavka` left	16:18
	→ felher joined	16:19
	→ andyhoang joined	16:19
	← Zean left	16:19
	→ Zean_ joined	16:19
	← nydel07 left	16:20
	← prsn_ left	16:20
milki	i see a double post of lots of text	16:21
	→ eletuchy joined	16:21
	→ Zean joined	16:21
alt^255	anything that contains the word "maybe" and "perl script" should be avoided.	16:21
nothingmuch	milki: sorry i thought I was unvoiced	16:21
alt^255	*words	16:21
nothingmuch	alt^255: thanks for your help =P	16:21
milki	lol	16:21
	>.>	16:21
alt^255	heh :) sorry, long day	16:21
	← tlaxkit left	16:21
	← achadwick left	16:22
	← bollullera left	16:22
milki	nothingmuch: so i can understand splitting the commits, what do you mean for use in a todo?	16:22
	OH	16:23
	the command actions in the todo huh	16:23
	i havent worked with those	16:23
	→ Zean__ joined	16:23
nothingmuch	milki: yep	16:23
milki	they are quite scary to me	16:23
	← Gsham left	16:23
	→ daftano joined	16:23
milki	i would probably use expect actually >.>	16:23
	since i dont know how to deal with the hunk part	16:23
	← dan2k3k4 left	16:23
milki	i wonder if -p mode has a non-interactive mode	16:24
nothingmuch	milki: i find it extremely useful for running tests, but i hven't abused it like that yet =)	16:24
	← Zean_ left	16:24
nothingmuch	milki: not that I could find in the docs	16:24
	→ durham joined	16:24
	→ Zean_ joined	16:25
milki	splitting by file is easy enough to do with any script	16:25
	not so sure about hunks -.-	16:25
	← Zean__ left	16:25
nothingmuch	i think i'll swerve it for now. if I get to that level i might as well do it manually	16:25
	← Zean left	16:25
	→ spudowiar joined	16:26
	← mofai left	16:26
milki	but if you can do it manually, you can also script it	16:26
spudowiar	Anyone know how to import the history of a single file into a repo?	16:26
milki	spudowiar: merge it?	16:26
spudowiar	I've pulled a totally unrelated repo into a branch	16:26
	I just want one file (and all the history)	16:26
	How do I do that?	16:26
milki	ah, you first want to extract the file and its history then with filter-branch	16:26
nothingmuch	milki: it's an ROI question, how much time will i save over say the next year if I spend the time automating it	16:26
milki	after that, you can merge it	16:26
	← Noldorin left	16:26
	← eletuchy left	16:26
spudowiar	milki: ok, thanks	16:26
milki	nothingmuch: ah, i consider funness more usually	16:26
	>.>	16:26
	← Zean_ left	16:26
	→ Zean joined	16:26
spudowiar	milki: wondered if there was an easy way	16:27
	*easier	16:27
	but there probably isn't	16:27
	thanks anyway	16:27
nothingmuch	milki: ETOOMANYPROJECTS ;-)	16:27
milki	i wouldnt mine learning how to manage hunks with a script	16:27
	d	16:27
spudowiar	I really love Git's interactive merging	16:27
nothingmuch	milki: i suspect it'll be easier to dump a diff out of git, and edit that	16:27
spudowiar	*adding	16:27
	← alt^255 left	16:28
spudowiar	All my friends at school are emailing files, modifying files to patch them, etc.	16:28
	and I'm just there with Git :P	16:28
	→ CalimeroTeknik joined	16:28
	→ Gsham joined	16:28
milki	:P	16:28
CalimeroTeknik	hello, can I make git not take .gitignore files into account?	16:28
	← Zean left	16:28
	← annoymouse left	16:29
	← daftano left	16:29
milki	CalimeroTeknik: in what accounts?	16:29
	← kurkale6ka left	16:29
spudowiar	Is there a way to do an invert git rm?	16:29
nothingmuch	CalimeroTeknik: git add -f works around it, not sure if that's what you mean	16:30
spudowiar	e.g. remove all but	16:30
CalimeroTeknik	milki, if you want the juicy details, I'm just using a throwaway repo in ~ that follows everything, including repos in ~/foo and such	16:30
	→ ferr1 joined	16:30
CalimeroTeknik	if at some point it stops working I'll be able to figure out what went wrong more easily	16:31
	← stantonk left	16:31
	← italoacasas left	16:31
CalimeroTeknik	of course subrepos have gitignore files…	16:31
	→ kadoban joined	16:31
milki	ah, abusing repos -.-	16:31
CalimeroTeknik	so add -f it is, thanks nothingmuch :)	16:31
	yeah, but I'm throwing it away regularly, so it's no big deal	16:31
	→ stantonk joined	16:32
	← sgambino left	16:32
spudowiar	I wonder if I can use git-subtree on files	16:32
	← robbyoconnor left	16:32
spudowiar	Nope, I can't :(	16:32
	→ kaiza joined	16:34
	→ algun joined	16:34
	← mikiones left	16:35
	→ xcesariox joined	16:36
	→ Noldorin joined	16:36
	← encod3 left	16:36
	→ madewokherd joined	16:37
	→ thiago joined	16:38
spudowiar	milki: git filter-branch --index-filter 'git ls-files \| grep -Fvx perl/buffers.pl \| git update-index --force-remove --stdin'	16:38
	milki: perfect	16:38
milki	spudowiar++	16:38
spudowiar	hehe	16:38
milki	filter-branch usage without quesiton. so good	16:38
	most people get confused by it	16:38
spudowiar	it took a while to work out a solution with index-filter	16:39
milki	i would put it in advanced git usage	16:39
spudowiar	easiest would be tree-filter but that's slow	16:39
	it's really easy though	16:39
	→ ochorocho__1 joined	16:39
	← ochorocho__ left	16:39
	→ jasondockers joined	16:40
	← Guest80967 left	16:40
	jasondockers → Guest86479	16:40
	← dreiss left	16:41
spudowiar	hmm... wondering if there's a way to do it with subtrees though	16:42
	I want a simple way to keep pulling changes in	16:42
	← lamppid left	16:43
	→ eletuchy joined	16:43
	← Impaloo62 left	16:43
milki	no, those sub tools are always for entire repos	16:43
	→ Impaloo joined	16:44
milki	spudowiar: maybe you are mistreating the file itself?	16:44
	spudowiar: maybe it should be in a different repo?	16:44
	← ochorocho__1 left	16:44
spudowiar	milki: basically, I want to fork certain WeeChat scripts	16:44
	milki: I want to include the full history however	16:44
	← David_ left	16:46
	← staticshock left	16:47
	→ SteffanW joined	16:48
	← MistahKurtz left	16:48
	← digidog left	16:49
	→ jagob joined	16:50
	← diegoaguilar left	16:51
	← elastix left	16:53
	← Gsham left	16:54
	← josuebrunel left	16:54
	→ sarbs joined	16:55
	← MrWoohoo left	16:55
	← marscher left	16:55
	← hobodave left	16:57
	→ durham__ joined	16:57
milki	well, as long as you have the remote tracking branch, you have the file history	16:57
	← durham left	16:59
	← UTAN_dev left	16:59
	← chll left	16:59
	→ chrisgeorge_ joined	17:00
	← chrisgeorge_ left	17:00
	← acetakwas left	17:01
	→ staticshock joined	17:02
	← chrisgeorge left	17:03
	→ pothepanda joined	17:03
	→ UTAN_dev joined	17:03
	← The_Phoenix left	17:05
	→ ejb joined	17:05
	← danhuynh______ left	17:05
	→ sgambino joined	17:06
	→ raijin joined	17:06
	← mischat left	17:07
	← citizen-stig left	17:07
	→ geet joined	17:07
	← geet left	17:07
	→ nwf joined	17:08
	→ d4rklit3 joined	17:10
	→ acetakwas joined	17:12
	← nettoweb left	17:13
	→ nettoweb joined	17:13
	← Puffball left	17:14
	→ diegoaguilar joined	17:14
	→ Puffball joined	17:14
	← bongjovi left	17:16
	→ ahmed_elgabri joined	17:16
	→ vF3hNGxc47h8 joined	17:17
	→ Guest55 joined	17:18
	← isxek left	17:20
	→ Gsham joined	17:22
	→ EvilPeng1 joined	17:22
	→ hahuang61 joined	17:22
	← hahuang65 left	17:24
	← rgrinberg left	17:24
	→ dreiss joined	17:27
	← spudowiar left	17:28
	→ Sasazuka joined	17:28
	→ EvilPenguin joined	17:30
	← EvilPeng1 left	17:31
	← fscala left	17:32
	← notebox left	17:32
	→ jjasinski joined	17:32
	← xcesariox left	17:33
	← AnnabelSchmidt left	17:33
	← raijin left	17:33
	→ fscala joined	17:35
	← Gsham left	17:36
	→ vagner joined	17:36
	← netj left	17:37
	→ Thorn__ joined	17:37
	→ netj joined	17:37
	→ infra-red joined	17:38
	← nwf left	17:38
	← vagner left	17:38
	→ vagner joined	17:39
	→ nwf joined	17:40
	← Thorn left	17:41
	→ hobodave joined	17:41
	← eletuchy left	17:42
	→ eletuchy joined	17:42
	→ weox joined	17:43
	→ fsvehla joined	17:44
	← acetakwas left	17:45
	← vagner left	17:45
	← eletuchy left	17:46
	← Orbitrix left	17:47
	← diegoaguilar left	17:47
	← mariuscc left	17:48
	← rivarun left	17:48
	← fsvehla left	17:51
	← infra-red left	17:51
	← akushner left	17:51
	← nilsi_ left	17:51
	→ Orbitrix joined	17:52
	→ fsvehla joined	17:52
	← marcogmonteiro left	17:53
	→ vagner joined	17:54
	→ rgrinberg joined	17:55
	→ elastix joined	17:55
	← ferr left	17:55
	→ deadnull_ joined	17:55
	→ daftano joined	17:56
	→ josuebrunel joined	17:56
	rnsanchez_ → rnsanchez	17:56
	← UTAN_dev left	17:56
	← netj left	17:57
	→ italoacasas joined	17:58
	→ rivarun joined	17:58
	← josuebrunel left	18:00
	← deadnull_ left	18:00
	→ netj joined	18:01
	← PCatinean left	18:03
	→ PCatinean_ joined	18:03
	← circ-user-fe9O3 left	18:03
	→ zero85 joined	18:05
	→ EricPoe joined	18:06
	← ferr1 left	18:07
	← stantonk left	18:08
	← vagner left	18:09
	→ stantonk joined	18:09
	→ vagner joined	18:10
	→ mikiones joined	18:11
	→ Gsham joined	18:11
	← Gsham left	18:11
	← durham__ left	18:13
	→ ORiON-- joined	18:13
	→ nofacade joined	18:14
	← fsvehla left	18:14
	→ mehola joined	18:15
	← jimi_ left	18:15
	← vagner left	18:16
	→ xbob joined	18:16
	→ eletuchy joined	18:17
	→ boombatower joined	18:17
	→ xaa joined	18:18
	→ durham joined	18:18
	← durham left	18:19
	← mehola left	18:19
	← staticshock left	18:19
	→ Anupkumar joined	18:19
	→ durham joined	18:19
	← govg left	18:19
	← Anupkumar left	18:19
	→ Anupkumar joined	18:20
	← Anupkumar left	18:20
	→ nwkj86 joined	18:21
	← eletuchy left	18:21
	← subhojit777 left	18:25
	← synthroid left	18:25
	→ pandeiro joined	18:26
	→ khmarbaise joined	18:27
	← hahuang61 left	18:28
	← MatthewAllan93 left	18:28
	→ MatthewAllan93 joined	18:28
	← daftano left	18:28
	→ circ-user-fe9O3 joined	18:29
	→ gamer_ joined	18:29
	→ SwiftMatt joined	18:30
	← perlpilot left	18:30
	→ citizen-stig joined	18:31
	→ synthroid joined	18:32
	← elastix left	18:32
	→ jfelchner joined	18:32
	→ ToBeCloud joined	18:32
	gitinfo set mode: +v	18:32
	← Lycaonian left	18:33
	→ mwhooker joined	18:33
	→ perlpilot joined	18:34
	← mwhooker left	18:34
	← ahmed_elgabri left	18:35
	→ oich joined	18:36
	← dsdeiz left	18:37
	← Aerosonic left	18:37
	→ daftano joined	18:41
	→ ahmed_elgabri joined	18:43
	→ mwhooker joined	18:44
	→ xbob_ joined	18:44
	← xbob left	18:45
	→ robotroll joined	18:46
	← circ-user-fe9O3 left	18:48
	← cdg left	18:50
	→ hahuang65 joined	18:51
	← grawity left	18:52
	→ grawity joined	18:53
	← xbob_ left	18:53
	→ dsdeiz joined	18:53
	← dsdeiz left	18:53
	→ dsdeiz joined	18:53
	← troulouliou_div2 left	18:54
	← docnvk left	18:54
	→ docnvk joined	18:55
	→ synthroi_ joined	18:56
	→ xbob joined	18:56
	← stantonk left	18:58
	→ circ-user-fe9O3 joined	18:59
	← PCatinean_ left	18:59
	← b1tchcak_ left	18:59
	← synthroid left	18:59
	→ digidog joined	19:00
	→ stantonk joined	19:02
	← stantonk left	19:02
	→ stantonk joined	19:02
	→ staticshock joined	19:02
	→ b1tchcakes joined	19:04
	← Phasee left	19:06
zarathushtra	so i made a merge from A to B and realized that some code in B were overwritten because i didnt treat the conflicts correctly. now i made a revert of that merge and I want to merge it again but fixing those conflicts... what do I need to do? because if I revert the revert, the unwanted changes would still be there	19:07
	← efco left	19:07
	← multi_io left	19:08
	→ nevodka joined	19:09
	→ griffindy joined	19:09
	→ DWestCoast joined	19:10
	← robotroll left	19:10
	← adron left	19:10
	← dhollinger left	19:10
	→ eletuchy joined	19:11
	→ multi_io joined	19:13
	→ yqt joined	19:13
	← sarbs left	19:13
	→ lpapp joined	19:13
	→ sarbs joined	19:14
lpapp	hi, why on the holy earth would I get this for git rebase --continue right after git add and git commit? https://paste.kde.org/ptk1melcn/7azsma/raw	19:14
docnvk	you can always do a hard reset	19:14
lpapp	I had to resolve a merge conflict manually....	19:14
	→ elastix joined	19:14
	← flaguy48 left	19:14
	→ m0viefreak joined	19:14
	← xbob left	19:14
lpapp	I just literally followed the instructions after the holy grail git pull --rebase....	19:14
	it also says this for git status: rebase in progress; onto 81e032a	19:15
	You are currently rebasing branch 'master' on '81e032a'.	19:15
	(all conflicts fixed: run "git rebase --continue")	19:15
	I DID RESOLVE THE CONFLICT	19:15
	→ xbob joined	19:15
	← griffindy left	19:15
osse	you probably want git rebase --skip	19:15
	not sure why that message keeps appearing	19:15
selckin	think you're not supposed to commit just add them	19:15
	then continue to commit	19:15
lpapp	so what to do, git reset --soft HEAD~1 then?	19:15
	and git rebase --continue?	19:15
	← eletuchy left	19:15
	← jmpp left	19:15
selckin	git reset HEAD^	19:15
	yeah should work	19:15
osse	no, just git rebase --skip	19:15
lpapp	osse: I lost my commits that way....	19:16
osse	assuming you're happy with the conflict resolution that doesn't matter, since the commit doesn't no anything	19:16
	anymore	19:16
	← stantonk left	19:17
lpapp	well, I mind it as I lost all the commits	19:17
	I have one merge commit now... all the history for my development has just gone	19:17
selckin	!reflog	19:17
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	19:17
lpapp	I would not like to continue it like this; I would much rather keep the development history through the commit messages.	19:17
osse	then do git reset --hard HEAD@{1} and start over	19:17
	← boudiccas left	19:17
lpapp	so I need a git pull --rebase and some magic that just does work	19:17
	keeps the history, etc.	19:17
	osse: git reset --hard HEAD@{1} left me where I am.	19:18
	i.e. verbatim	19:18
	lpapp hopes for a better day when git can actually handle merges properly	19:18
osse	HEAD@{2}then. use git reflog to find the commit you were on before the pull	19:18
lpapp	there are always cases when it just does not get it	19:18
osse	if you want merges then you shouldn't have used --rebase :p	19:20
	← Bowel left	19:20
	→ flaguy48 joined	19:21
osse	anyway, the reason git says "no changes" is because the conflict was resolved in such a way that the commit to be applies doesn't have any changes anymore	19:21
lpapp	huh?	19:21
osse	which is why it's suggested to skip it	19:21
lpapp	if I cannot push because my local is behind, I definitely need git pull --rebase, I thought?	19:21
osse	'git pull' would work too	19:21
lpapp	in order to be able to push	19:21
	and of course, there are cases when more than one dev worked on the same stuff	19:21
	so git add as it commended	19:21
	I used git commit (my mistake)	19:21
	but apparently skip did not get it right.	19:21
	it suggested*	19:22
	I really hope for a day when manually merging stuff becomes easy	19:22
	because in principle, it is really simple	19:22
	it is not a really complex workflow	19:22
	by the way, git could make it clearer that if I commit, use skip	19:24
	to me git add does not make any sense on its own without a commit as a git user for several years	19:24
	but apparently doing the commit is the wrong thing.	19:24
	yes, I am stupid, so some hint from git would be useful :)	19:24
osse	yes because the commit would be empty	19:24
lpapp	but if it is just me, then fine, no worries...	19:24
osse	"empty" meaning "introduce no changes"	19:24
lpapp	sure	19:24
	also, I really do not know how, but I just got two merge commits!	19:25
	for the same thing :)	19:25
	my coworkers will smiley (ideally) at me tomorrow.	19:25
	smile*	19:25
	→ nilsi joined	19:25
	← xbob left	19:26
	← abyx left	19:26
	→ xbob joined	19:27
lpapp	osse: selckin thanks	19:27
	→ apotry joined	19:27
	← nevodka left	19:27
	→ mostlybadfly joined	19:28
docnvk	this is dangerous water because it's almost a religious war: rebase vs merge. But, I find that life is so much simpler when rebase is categorically banned	19:29
osse	!rebase_vs_merge	19:29
	→ ril joined	19:29
osse	!rebase_v_merge	19:29
	oh well	19:30
	→ adron joined	19:30
selckin	banning rebase is stupid, tracking when someone updates from the remote is just garbage noise	19:30
	→ clemf joined	19:30
	→ bnb joined	19:31
	← nilsi left	19:31
bnb	Hello. I was just wondering how I can use subtrees to pull one folder of my repo into another branch?	19:31
ojacobson	you … can't actually ban rebase, because it's undetectable as such. The closest you can get is banning both branch deletes and force pushes.	19:31
_ikke_	rebase vs merge is a false dichotomy	19:31
ojacobson	I'll leave you to figure out the problems that causes.	19:31
	← lpapp left	19:32
_ikke_	He's gone	19:32
	→ boudiccas joined	19:32
ojacobson	whups, sorry. I have /part messages muted :)	19:32
	← daftano left	19:32
docnvk	I didn't actually mean ban it. I mean that it's strongly discouraged by collaborators	19:32
	but it's a matter or preference	19:32
	→ Silox\| joined	19:32
_ikke_	It's a tool	19:33
	And as with any tool, one can use it, or one cannot use it	19:33
docnvk	I didn't mean to open a can of worms here. I use it too	19:33
	→ riets joined	19:33
	→ codebam joined	19:33
docnvk	it makes thing clean, and it's nice to squash things sometimes	19:34
bnb	Would anyone be able to suggest how I can subtree off one directory in my file tree to be pulled into another branch?	19:34
	Or any other method to pull just one folder (build/) into another branch?	19:34
_ikke_	bnb: I have never used subtrees myself	19:34
	← Guest86479 left	19:35
	→ Guest86479 joined	19:35
bnb	_ikke_: any other idea as to how I could pull a single directory (Its contents) into another branch?	19:35
	→ stantonk joined	19:35
_ikke_	What is your goal with that (the answer might influence the sollution)	19:36
	← xbob left	19:38
bnb	Using a static site generator to make a site, files go into `build/`, want to pipe `build/` to a branch to be published.	19:39
	→ jmpp joined	19:39
	→ mizu_no_oto joined	19:40
	← Orbitrix left	19:41
_ikke_	Does seem to me like a simple filesystem operation?	19:42
	→ abyx joined	19:42
	← jmpp left	19:43
	→ xbob joined	19:44
bnb	How would I go about that across branches?	19:44
	→ ferr joined	19:44
	→ mar77i_ joined	19:45
	← stantonk left	19:45
	→ stantonk joined	19:45
_ikke_	bnb: checkout the target branch, then git checkout <srcbranch> -- path/to/build/dir	19:45
	→ daftano joined	19:46
	→ Orbitrix joined	19:46
	← mar77i left	19:47
	→ StuartMI joined	19:48
	← stantonk left	19:50
	→ Phasee joined	19:50
	→ bronson joined	19:50
	→ stantonk joined	19:50
	→ jmpp joined	19:54
	← bronson left	19:55
	→ infra-red joined	19:56
	← infra-red left	19:56
	← clemf left	19:56
	→ clemf joined	19:56
	← scribe left	19:57
	← AaronMT left	19:59
	← xbob left	19:59
bnb	_ikke_: Looks like that pulls the entire master branch into the path/to/build/dir	20:01
	I want one directory from the master branch (srcbranch) into the target branch.	20:02
	← SteffanW left	20:03
_ikke_	bnb: git checkout master -- build would only get a dir called build into your worktree	20:03
	→ xbob joined	20:03
bnb	Hmm. Okay.	20:04
	→ bootsieboo joined	20:04
bnb	Looks like build/ got deleted, so it was pulling the whole branch?	20:05
_ikke_	No, it doesn't	20:05
	← staticshock left	20:06
bnb	Hmm	20:06
	That's weird.	20:06
	← circ-user-fe9O3 left	20:06
	→ toogley joined	20:09
	→ circ-user-fe9O3 joined	20:10
	← abyx left	20:10
	← noser left	20:10
	← afuentes left	20:10
toogley	given the commit hash, can i find out somehow solely the commit message? i need to use that in a script, so i would like to avoid manipulating the data provided by git log --oneline.	20:10
	→ synthroid joined	20:11
osse	toogley: git log -1 --format=%B	20:11
	← erichf left	20:11
toogley	osse: exactly what i need, thanks.	20:11
osse	there's an extra blank line there, but if you use $() that disappears on it's ownn	20:12
	you can also separate the "title" and the "body" with a custom marker	20:12
	← mizu_no_oto left	20:12
bnb	I don't want my `node_modules/` directory to be uploaded to GitHub, but I don't want it to stay in every branch.	20:12
	→ Balliad joined	20:13
	← synthroi_ left	20:13
bnb	Is there a way to make that happen in .gitignore?	20:13
_ikke_	no	20:13
	A file is either tracked in git, or it isn't	20:13
	Nothing in between	20:13
	(I deliberately say file, because git does not track directories)	20:13
bnb	Damn. Because when I run `mv ./branch/* ./` it moves it into my `node_modules/`.	20:14
	→ mehola joined	20:15
	mar77i_ → mar77i	20:16
	← bootsieboo left	20:16
	→ Rayq joined	20:16
	→ staticshock joined	20:18
	← Rayq left	20:19
	← mehola left	20:20
	← EricPoe left	20:20
	← xbob left	20:20
	→ aidalgol joined	20:20
	armin_ → armin	20:21
	→ abyx joined	20:21
	→ Synthead joined	20:22
	← staticshock left	20:23
	→ xbob joined	20:23
	← yqt left	20:23
	→ TyrfingMjolnir joined	20:26
TyrfingMjolnir	How can I clone a given commit?	20:26
	→ star_prone joined	20:26
	← jeffreylevesque left	20:26
	→ cdg joined	20:27
	← mwhooker left	20:27
TyrfingMjolnir	I would like to clone this commit: https://github.com/antonym/netboot.xyz/commit/ed95e792a6823d61c9f76bf13e7d18475af31073	20:27
	← rwb left	20:27
TyrfingMjolnir	But the full netboot.xyz at that stage	20:27
_ikke_	TyrfingMjolnir: clone in what sense?	20:27
	← EvilPenguin left	20:27
ojacobson	you'd have to clone a branch that contains the commit, if you want the full git history leading up to that commit + submodules etc	20:27
TyrfingMjolnir	git clone yes, that	20:28
ojacobson	if you just want the work tree and don't need the actual metadata, check if github supports git-archive	20:28
TyrfingMjolnir	How would I do that?	20:28
_ikke_	it doesn;t	20:28
ojacobson	by design, you cannot clone or fetch an arbitrary commit	20:28
	← Puffball left	20:28
ojacobson	you can fetch named things, and you'll get their full history when you do	20:28
TyrfingMjolnir	I would like to clone netboot.xyz as pr Jan 11	20:29
_ikke_	https://github.com/antonym/netboot.xyz/archive/d95e792a6823d61c9f76bf13e7d18475af31073.zip	20:29
	Is there a problem just cloning the entire repository?	20:30
	← daftano left	20:30
TyrfingMjolnir	Some features have been removed	20:30
_ikke_	You can checkout that specific feature	20:30
	commit	20:30
	→ stantonk_ joined	20:31
	→ yqt joined	20:31
	← phaleth left	20:31
	← jfelchner left	20:31
	→ Puffball joined	20:32
	→ Celelibi joined	20:32
	→ mizu_no_oto joined	20:32
	→ arooni joined	20:32
	→ nisabek joined	20:33
TyrfingMjolnir	What I really would like to have is this: https://github.com/antonym/netboot.xyz/blob/ed95e792a6823d61c9f76bf13e7d18475af31073/src/windows.ipxe	20:33
	Fully functional in it's natural habitat	20:33
	← ToBeCloud left	20:33
TyrfingMjolnir	Of course I would have to modify this to work on prem	20:34
	→ scribe joined	20:34
	← stantonk left	20:35
	← crose left	20:35
	← pantsman- left	20:35
	→ FuzzySockets joined	20:36
	→ staticshock joined	20:36
	→ jfelchner joined	20:36
	→ daftano joined	20:37
	diegoviola → dviola	20:37
	← algae left	20:37
	← xbob left	20:37
	→ xbob joined	20:37
	→ mwhooker joined	20:40
	→ jfelchner_ joined	20:41
	→ voice_of_me joined	20:41
	← arooni left	20:42
	← mizu_no_oto left	20:43
	← jfelchner left	20:44
	← circ-user-fe9O3 left	20:44
	→ ochorocho__ joined	20:45
	← xbob left	20:46
	→ xbob joined	20:47
	→ bennyZ joined	20:48
	← Guest86479 left	20:48
	← ochorocho__ left	20:49
	→ radsy joined	20:49
	→ raijin joined	20:50
	← synthroid left	20:51
	← sdothum left	20:52
	→ crose joined	20:53
	→ nnyk_ joined	20:53
	← nnyk_ left	20:53
	→ nnyk_ joined	20:53
	→ Zean joined	20:55
	→ ahr3n joined	20:55
	← xbob left	20:55
	→ bollullera joined	20:55
	→ sdothum joined	20:56
	→ EvilPenguin joined	20:56
	→ pneuma joined	20:56
	→ xbob joined	20:57
	← tgunr left	20:58
	← bennyZ left	20:59
	← bnb left	21:01
	→ tgunr joined	21:01
	→ neanderslob joined	21:01
qsx	(fyi, i just lost the game)	21:02
	Eugene kicked qsx (You are the weakest link. Good-bye!)	21:03
	→ qsx joined	21:03
	Eugene changed the topic to: Welcome to #git, the place for git help and clown ransom \| Current stable version: 2.8.2 \| First visit? Read: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Submit a PR or Fred Funny-Shoes gets it! https://madeitwor.se/git-jokes	21:04
	Eugene set mode: -o	21:04
	← ejb left	21:04
	← clemf left	21:06
	← livingstn left	21:06
	← DWestCoast left	21:06
	→ clemf joined	21:06
	← xbob left	21:06
	→ eletuchy joined	21:08
	→ xbob joined	21:09
	→ cydrobolt_ joined	21:10
	← cyphase left	21:10
	← hobodave left	21:11
	→ Lomex joined	21:11
	← CheckDavid left	21:12
	→ icedp joined	21:12
	→ nilsi joined	21:14
	→ shiriru joined	21:14
	← ahmed_elgabri left	21:14
	→ AaronMT joined	21:14
	← dsdeiz left	21:16
	← cydrobolt_ left	21:17
	→ cydrobolt joined	21:17
	← cydrobolt left	21:17
	→ cydrobolt joined	21:17
	← nilsi left	21:18
	→ xbob_ joined	21:18
	← xbob left	21:19
	← shiriru left	21:19
	→ relipse2 joined	21:22
	→ Winter_ joined	21:22
relipse2	what does this mean: git checkout master && git merge dev Switched to branch 'master' Your branch is up-to-date with 'origin/master'.Updating 9ef42b0..8edcd77 error: unable to create file public_html/help_sponsor_form.php (Permission denie d)	21:22
	→ axk4545 joined	21:22
	← crose left	21:23
axk4545	any idea how what is going on with https://paste.fedoraproject.org/362716/46239695/	21:23
	*what is	21:23
	← fmcgeough left	21:23
qsx	Eugene: pfft.	21:23
	← stantonk_ left	21:24
	→ pantsman- joined	21:24
	→ WayToDoor joined	21:24
	→ cyphase joined	21:25
kadoban	relipse2: It means you shouldn't be using git for deployment.	21:26
	← Balliad left	21:26
	← jbitdrop left	21:26
	→ mdw joined	21:26
kadoban	relipse2: It's a filesystem permissions error, you have a file that git isn't allowed to write that you've told it to write.	21:27
Eugene	I got tired of banning that guy	21:27
	He's been trying to deploy for 2 years now	21:27
	← digidog left	21:27
	→ cagedwisdom joined	21:27
	← xbob_ left	21:28
	← ash_workz left	21:28
	→ UncleCJ joined	21:29
	→ xbob joined	21:29
	← Thorn__ left	21:29
	→ Thorn joined	21:31
	← mwhooker left	21:32
Seveas	axk4545: you're pushing to an http host that doesn't like the size of your push. Fix your webserver config (if you're in the position to do so) or do smaller pushes.	21:33
	→ stantonk joined	21:33
axk4545	Seveas: thanks.	21:33
	→ mischat joined	21:33
	← stantonk left	21:35
	← tach_ left	21:35
	← mdw left	21:35
	← EvilPenguin left	21:36
	→ stantonk joined	21:37
	← xbob left	21:38
	← nardev left	21:39
	← Fijit left	21:39
	→ mellernoia joined	21:41
	→ EvilPenguin joined	21:41
	← stantonk left	21:41
	→ xbob joined	21:44
	← Zean left	21:45
	← italoacasas left	21:45
	← bango2 left	21:45
	← TyrfingMjolnir left	21:46
	→ dodobrain joined	21:47
	← UncleCJ left	21:47
	← Silox\| left	21:47
	← crunchers left	21:47
	→ YP-QMUL-W joined	21:47
	← xbob left	21:48
	→ diegoaguilar joined	21:48
	← raijin left	21:49
	← eletuchy left	21:50
	← leehambley left	21:50
	← UrsoBranco left	21:50
	→ eletuchy joined	21:50
	jfelchner_ → jfelchner	21:50
	← Dougie187 left	21:51
	← madewokherd left	21:52
	freekevi- → freekevin	21:53
	→ nardev joined	21:54
	← nofacade left	21:55
	← eletuchy left	21:55
	→ raijin joined	21:55
	← mar77i left	21:56
	← clemf left	21:59
	← mischat left	22:00
	→ tvon joined	22:00
	→ mar77i joined	22:01
	→ WaReZ joined	22:02
	→ rxo_ joined	22:02
	← rxo_ left	22:02
	← nadim left	22:02
	→ xlegoman joined	22:02
	→ albertk9 joined	22:03
	→ mwhooker joined	22:04
	← mase-tech left	22:04
	← oncall-pokemon left	22:05
	← vF3hNGxc47h8 left	22:06
	← albel727 left	22:06
	← ril left	22:07
	← axk4545 left	22:07
	← albertk9 left	22:07
	→ nnyk joined	22:08
	← nnyk_ left	22:08
	→ Ardethian\\work joined	22:09
	← relipse2 left	22:09
	→ troulouliou_div2 joined	22:09
	→ acetakwas joined	22:10
	← YP-QMUL-W left	22:10
	→ stantonk joined	22:11
	← Ardethian\work left	22:11
	→ Nugget joined	22:12
	← Nugget left	22:12
	→ Ardethian\work joined	22:12
	→ italoacasas joined	22:12
	← Ardethian\\work left	22:13
	→ YP-QMUL-W joined	22:13
	← italoacasas left	22:13
	→ italoacasas joined	22:14
	→ Nugget joined	22:14
	← Nugget left	22:15
	→ Nugget joined	22:15
	← stantonk left	22:15
	← YP-QMUL-W left	22:15
	→ ejb joined	22:16
	→ mehola joined	22:16
	→ madewokherd joined	22:16
	← nnyk left	22:17
	← elastix left	22:17
	← Nugget left	22:17
	→ Nugget joined	22:17
	← Nugget left	22:18
	← troulouliou_div2 left	22:18
	→ noser joined	22:18
	← d0nn1e left	22:18
	→ albel727 joined	22:18
	← johnmilton left	22:18
	→ Nugget joined	22:19
	→ d0nn1e joined	22:19
	← ahr3n left	22:20
	→ stantonk joined	22:20
	← mehola left	22:21
	→ clemf joined	22:21
	← riets left	22:21
	← sgambino left	22:22
	← adron left	22:22
	← apotry left	22:22
	← acetakwas left	22:22
	→ eletuchy joined	22:24
	→ adron joined	22:25
	← emPi left	22:26
	← mwhooker left	22:26
	→ eszeikial joined	22:27
	→ shades joined	22:29
shades	hello	22:29
	← eletuchy left	22:29
shades	git remote show origin shows my fetch and push urls	22:29
	due to problems our project pivoted and we ended up changing the project title, on the main, and I done so on my fork to reflect this	22:30
	i'd like to change my fetch/push urls for remote	22:30
	can someone help me with this?	22:30
kadoban	git remote set-url origin whatever you can find the details in man git remote	22:31
gitinfo	the git-remote manpage is available at http://jk.gs/git-remote.html	22:31
	← Phasee left	22:32
	→ ochorocho__ joined	22:32
shades	awesome that worked i think	22:33
	i'll find out if it actually works when i push nexxt time	22:33
	← abyx left	22:33
	→ mwhooker joined	22:33
kadoban	:)	22:33
	→ ahr3n joined	22:34
	→ Bruce_ joined	22:34
	→ acetakwas joined	22:35
	← LucaTM left	22:36
	← hahuang65 left	22:37
	→ arooni joined	22:37
	← toogley left	22:37
	→ hahuang65 joined	22:37
acetakwas	What exactly is the point of `git fetch origin master`	22:37
	Then `get merge origin/master`	22:38
	If I do `git pull origin master`, and there are conflicts, I'll be informed.	22:38
	Then I'd resolve the conflicts.	22:38
	With `git mergetool`	22:39
	← Winter_ left	22:39
acetakwas	I'd use the same `git mergetool` if there are conflicts with the first approach. So what's the point?	22:39
avar	What's the point of what? Of having the "pull" command?	22:39
	→ robbyoconnor joined	22:41
	→ nchambers joined	22:42
	← SwiftMatt left	22:43
	→ mofai joined	22:45
	→ diego1 joined	22:45
acetakwas	avar:: I know the difference	22:46
	← diego1 left	22:46
	→ diego1 joined	22:46
	← robbyoconnor left	22:46
	← clemf left	22:46
	← WaReZ left	22:46
acetakwas	I just want to know why `git fetch` over `git pull` when you can easily resolve conflicts both ways.	22:46
	→ clemf joined	22:46
bremner	acetakwas: in the first way, you can inspect the differences before deciding to merge; perhaps decide to rebase instead	22:47
avar	I'm just trying to understand the question, are you asking why git provides "fetch" at all when the common case is to use "pull"?	22:47
	← a3Dman left	22:47
preaction	what if i don't want to merge? what if i want to verify the changes, rebase, and then squash?	22:47
	→ Zean joined	22:47
avar	In that case, like bremner says, because "pull" is a more involved worktree operation, "fetch" just gets remote refs	22:47
	there's a lot of reasons to get remote refs and do nothing right away to your work tree	22:48
	← ahr3n left	22:48
	← dopesong left	22:48
	← dviola left	22:48
bremner	git fetch can deal with more than one remote branch at a time, also	22:49
	← exarch left	22:50
	→ a3Dman joined	22:50
acetakwas	avar:: Okay	22:51
	bremner:: Okay. Thanks. I'll need to learn how "rebase" works to fully grasp your answer.	22:52
	← jagob left	22:52
	→ bronson joined	22:52
	← star_prone left	22:52
bremner	well, rebase is just an example. In general one shouldn't blindly merge in changes from other repos.	22:53
	← nettoweb left	22:53
acetakwas	bremner:: Yeah, well when they are "other" repose from "other" people.	22:54
	s/repose/repos	22:55
	← clemf left	22:55
	→ nettoweb joined	22:55
bremner	yes, well you asked why a command existed. Not whether you should use it.	22:55
	→ clemf joined	22:55
bremner	pull exists for the simple case; it's just that simple case is not as common as people think.	22:56
	→ choki joined	22:56
	→ jagob joined	22:56
	← cagedwisdom left	22:56
	← adron left	22:57
	← bronson left	22:57
	← preaction left	22:58
	← AceLewis left	22:59
	← Chunk2 left	22:59
	→ ahr3n joined	23:00
	→ SwiftMatt joined	23:00
	→ Prawnzy joined	23:00
	← Spacew00_ left	23:01
	← nwf left	23:01
	→ nilsi joined	23:02
	← AaronMT left	23:03
	→ NightStrike joined	23:04
	→ nwf joined	23:04
	← nwkj86 left	23:05
	← udm left	23:05
NightStrike	I made a local branch that I'd like to rebase against its parent. How do I do that?	23:05
	→ YP-QMUL-W joined	23:06
	→ realz__ joined	23:06
NightStrike	When I look at the output of git status, it is confusing. It says "On branch x" followed by "Your branch is up to date with origin/x". But I created it from branch y.	23:06
	← realz left	23:07
	← nilsi left	23:07
NightStrike	I was on y, I did git checkout -b x, and now I'm on x. But the origin is itself, not y.	23:07
	← YP-QMUL-W left	23:07
	→ udm joined	23:07
	diego1 → dviola	23:08
	→ Chunk2 joined	23:09
	← kpease left	23:09
	→ rkazak joined	23:11
	← SwiftMatt left	23:15
	← udm left	23:15
	→ cagedwisdom joined	23:16
	← chitopunk left	23:16
Exagone313	Hi, to edit gitolite config, I use the URL git@localhost:gitolite-admin. I changed the port of SSH to 23 (I use sslh on port 22), what URL do I use for this port? I tried git@localhost:23:gitolite-admin but it does not work...	23:16
	→ SwiftMatt joined	23:17
	← dviola left	23:17
Exagone313	Even with git@localhost:23/gitolite-admin, it keeps trying to push to :22	23:18
	← garethdaine left	23:19
	← rgrinberg left	23:20
	Xe → _8ade2af05f26	23:20
	_8ade2af05f26 → Xe	23:20
Exagone313	Ok, found it, I needed ssh://git@localhost:23/gitolite-admin	23:20
	← fees left	23:22
	← mofai left	23:22
	← Lomex left	23:24
	→ RGriffin joined	23:25
	→ Lomex joined	23:25
	← SwiftMatt left	23:26
	← nwf left	23:26
	← mwhooker left	23:28
	→ nwf joined	23:28
	← stantonk left	23:31
	← Lomex left	23:31
	→ adron joined	23:31
	→ afuentes joined	23:32
	← cdg left	23:33
	→ cdg joined	23:34
	← mattfoo left	23:34
	← ferr left	23:34
	→ amdi_ joined	23:35
	← amdi_ left	23:36
	← rkazak left	23:36
	→ robbyoconnor joined	23:36
	← dmto left	23:36
	→ amdi_ joined	23:37
	→ mwhooker joined	23:37
	← King_Hual left	23:37
	→ UncleCJ joined	23:37
	← amdi_ left	23:38
	→ amdi_ joined	23:38
	← amdi_ left	23:38
	← xaa left	23:38
	← cdg left	23:39
	← dodobrain left	23:39
	→ dodobrain joined	23:39
	← dodobrain left	23:39
	→ dodobrain joined	23:39
dodobrain	hi all	23:39
	how do i check if a tag is an annotated tag or lightweight tag?	23:40
	→ mattfoo joined	23:40
	← clemf left	23:40
	← UncleCJ left	23:40
	→ rgrinberg joined	23:41
	← mellernoia left	23:41
	→ Aerosonic joined	23:42
	→ gravitron joined	23:42
	← jagob left	23:43
	← gravitron left	23:43
	→ gravitron joined	23:43
	→ clemf joined	23:44
	→ mellernoia joined	23:44
	← githogori left	23:44
	→ gnoel joined	23:44
	← cagedwisdom left	23:45
	→ cagedwisdom joined	23:46
	← clemf left	23:46
	→ clemf joined	23:47
	← voice_of_me left	23:48
	→ preaction joined	23:49
	← fscala left	23:49
	← clemf left	23:50
	← nettoweb left	23:51
	→ anu1 joined	23:51
	→ fscala joined	23:52
	← anu0 left	23:55
	← adron left	23:57
	→ krsr joined	23:58
	← kilo_bravo left	23:58
	← fstd left	23:59
	→ flash joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation