IRCloggy #git 2017-02-13

Provider of IRC logs since 2005.

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

	2017-02-13
	→ canuk joined	00:00
	← Gravious left	00:06
	← Ranmaru left	00:10
	← finalbeta left	00:10
	← Phylock left	00:13
Vampire0	gry, a branch is just a post-it note on a commit. A commit does not belong to a branch. It may be part of the history of the commit a branch pointer currently points at, but a commit can be part of any amount of branches, including none	00:14
	← Serus left	00:18
Vampire0	gry, and to pick the commit the branch pointer "vampire" currently points at, simply do `git cherry-pick vampire`	00:18
	← King_Hual left	00:23
	← efeuska left	00:25
	← matoro left	00:25
	→ Derperpe1 joined	00:27
	→ Nugget_ joined	00:27
	← Oatmeal left	00:27
	← ejnahc left	00:28
	← Nugget left	00:29
	← Derperperd left	00:29
	← olbat left	00:29
	← nunchuck left	00:29
	→ clemf_ joined	00:29
	→ ejnahc joined	00:29
	← mischat left	00:30
	→ olbat joined	00:30
	← clemf left	00:30
	→ pur3eval joined	00:34
	← yqt left	00:37
	→ yqt joined	00:37
	← pur3eval left	00:38
	→ jameser joined	00:41
	← dbl4k left	00:43
	← astrofog left	00:43
	→ flashpoint9 joined	00:45
	→ om_henners joined	00:46
flashpoint9	Hey guys, had a question. I have a remote server that I would like to communicate with repos belonging to a group on github, I also want to push and pull to those repos locally. Im thinking about using deploy keys (not 100% sure) on the server so that I can push and pull from github while on the server and using the same SSH keys for local, is that the best/right way to handle what I want?	00:48
gry	thanks Vampire0!	00:48
	← jameser left	00:49
	→ brent__ joined	00:52
	← m0viefreak left	00:52
	← peterR`` left	00:53
	← yqt left	00:53
	← Goplat left	00:53
	→ yqt joined	00:54
	← Brain left	00:57
Vampire0	gry yw	00:59
gitinfo	flashpoint9: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)	01:00
	→ matoro joined	01:00
	← brokensyntax left	01:00
	← watabou left	01:01
flashpoint9	gitinfo: Ok, I wondered if I was asking in the wrong channel but thought I would give it a try since it's more of a methodology question (ie. what would you do in my situation)	01:02
	→ watabou joined	01:02
	→ peterR`` joined	01:02
	→ brokensyntax joined	01:03
	← gry left	01:07
	→ denimsoft joined	01:08
	← datahead8888 left	01:11
	→ ozmage joined	01:12
	→ CussBot joined	01:14
	→ fatalhalt_ joined	01:16
	← cdown left	01:16
	← nikivi left	01:17
	← Perspicaciosity left	01:17
	← MrWoohoo left	01:18
	→ shinnya joined	01:18
	← netj left	01:18
	→ nikivi joined	01:19
	← fatalhalt left	01:19
	→ __builtin joined	01:19
	← DolpheenDream left	01:20
	→ rbjorklin joined	01:20
	→ cdown joined	01:20
	← kyan left	01:20
	→ iamtakingiteasy joined	01:21
	← Ardethian left	01:21
	← yqt left	01:21
	→ netj joined	01:21
	→ yqt joined	01:22
	→ Saturn812 joined	01:22
	→ linuxmodder joined	01:22
	← xlegoman left	01:24
	→ newbie joined	01:25
	→ xlegoman joined	01:25
	→ dsdeiz joined	01:27
	← yqt left	01:28
	→ akkad joined	01:30
	→ mischat joined	01:30
	→ cheater joined	01:32
cheater	hi	01:32
	when specifying a revision for something like git diff, is there a way to say "diff between <rev0> and the nearest common ancestor of <rev1> and <rev2>"?	01:33
	or	01:33
	"diff between <rev1> and the nearest common ancestor of <rev1> and <rev2>"?	01:33
	→ kyan joined	01:34
	← brent__ left	01:34
cheater	i.e. i am on a branch and i would like to see the complete diff since i branched off from master	01:34
e	yes	01:34
	look at ... (as opposed to ..) in git help diff	01:35
	→ pur3eval joined	01:35
	→ cqi joined	01:36
	← d1z left	01:36
	← mischat left	01:38
	← mikecmpbll left	01:39
	← pur3eval left	01:39
	← dreaddymck left	01:44
	→ Levex joined	01:45
	← levex_ left	01:45
	→ brent__ joined	01:49
	→ gelei007 joined	01:50
	← chipotle left	01:50
	→ chipotle joined	01:52
	← Tobbi left	01:52
	→ levex_ joined	01:53
	← Levex left	01:53
	→ fatalhalt__ joined	01:53
	→ d1z joined	01:53
	→ howitdo joined	01:54
	← howitdo left	01:54
	→ howitdo joined	01:54
	→ dwmw2_gone joined	01:54
	→ MattMake_ joined	01:56
	← ozmage left	01:57
	← fatalhalt_ left	01:57
	← MattMaker left	01:59
	← brent__ left	01:59
	→ elsevero joined	02:00
	→ acetakwas joined	02:01
	← MattMake_ left	02:01
	← fatalhalt__ left	02:02
	→ sharkz joined	02:04
	→ Vgr joined	02:04
	← Vgr left	02:04
	→ Vgr joined	02:04
	→ Wulf4 joined	02:04
	→ ffilozov joined	02:05
	← geoid_ left	02:06
	→ geoid_ joined	02:06
	← pbrewczynski left	02:06
	← geoid_ left	02:07
	← Wulf left	02:07
	Wulf4 → Wulf	02:07
Somelauw	If one repo stores a file a and another repo stores a file subdir/subdir/subir/a, is it possible to cherry-pick from subdir/subdir/subdir/a to a or should I just manually copy the changes and give credit in the commit message?	02:09
	→ sbulage joined	02:11
	← shinnya left	02:13
	→ newbie1 joined	02:14
	← pks left	02:15
	← b1tchcakes left	02:15
	← anuxivm left	02:16
	← newbie left	02:17
	→ finalbeta joined	02:17
	← dwmw2_gone left	02:17
	→ dwmw2_gone joined	02:17
	← sbulage left	02:18
	← denimsoft left	02:18
	← nettoweb left	02:18
	→ MattMaker joined	02:19
	→ pks joined	02:19
	← Somelauw left	02:21
	← Naan left	02:22
	→ armyriad joined	02:23
	→ b3kN joined	02:27
	→ nunchuck joined	02:28
	→ deduped joined	02:30
	→ dcy joined	02:31
	← akkad left	02:33
	← nunchuck left	02:33
	→ Goplat joined	02:33
	← CheckDavid left	02:34
	→ mischat joined	02:35
	→ dreiss joined	02:35
	→ pur3eval joined	02:35
	← miczac left	02:36
	→ akkad joined	02:37
	← redhedded1 left	02:37
	→ nunchuck joined	02:39
	← mischat left	02:40
	← pur3eval left	02:40
	→ mizu_no_oto joined	02:42
	← levex_ left	02:47
	→ Vampire0_ joined	02:48
	→ aavrug joined	02:50
	← Vampire0 left	02:51
	← newbie1 left	02:52
	← d^sh left	02:53
	→ d^sh joined	02:55
	← ojdo left	02:55
	← durham left	02:57
	→ durham joined	03:01
	← flashpoint9 left	03:01
	→ ojdo joined	03:02
	→ nckpz_ joined	03:04
	→ zzz_ joined	03:04
	← zzz left	03:04
	← Vortex34 left	03:05
	→ SwiftMatt joined	03:05
	→ raijin joined	03:08
	→ dRealm joined	03:09
	→ ToBeCloud joined	03:11
	→ Nilesh_ joined	03:11
	gitinfo set mode: +v	03:11
dRealm	So here's what I've done: I wanted to clean up my webpage by moving all images under the root of the site to '/assets/images/'	03:12
	← shgysk8zer0_ left	03:12
dRealm	after doing that, I did a: git rm '*.jpg'	03:13
	not knowing that '*' recurses into directories.	03:14
	I have not committed my work yet	03:14
	→ zivester joined	03:15
	→ glspi joined	03:16
	→ oaao joined	03:16
dRealm	so.. what end up happening is git rm '*.jpg' deleted the images I just moved to '/assets/images' as well	03:16
	→ Vortex34 joined	03:17
dRealm	Good thing I did do a commit before I fucked up.	03:19
	Good thing is	03:19
	so, is "git reset" the command I want?	03:19
	→ venmx joined	03:20
	← hexagoxel left	03:22
dRealm	Okay, so it looks like git does have a record of all the deleted files. But here's the message it printed after I typed "git reset"	03:23
	http://codepad.org/hCLkY6Tn	03:23
	→ hexagoxel joined	03:25
dRealm	Come on boyz. It's 10:25 EST, I know y'all still up.	03:25
	← chachasmooth left	03:25
	→ fstd_ joined	03:26
	→ chachasmooth joined	03:26
	← fstd left	03:30
	fstd_ → fstd	03:30
	← durham left	03:31
glspi	drealm, i'm completely unqualified to help you....but i think maybe a 'git reset --hard' would do it....not my fault if not though!	03:31
	→ durham joined	03:31
dRealm	glspi: yay	03:33
	glspi: it came back	03:34
glspi	nice :)	03:34
	→ pur3eval joined	03:36
	→ mischat joined	03:36
	← diogenese left	03:37
	← aavrug left	03:37
dRealm	I can't believe they (or is it Linus) made '*' recurse into directories.	03:38
	→ diogenese joined	03:40
	← pur3eval left	03:41
	← mischat left	03:41
	→ duderonomy joined	03:42
	← rgrinberg left	03:43
	← Raed\|Mobile left	03:45
	→ Limes joined	03:45
	→ rgrinberg joined	03:46
	→ jstimm joined	03:46
	→ brent__ joined	03:49
	← BackEndCoder left	03:49
	→ BackEndCoder joined	03:49
	← rgrinberg left	03:50
	← raijin left	03:52
	→ svm_invictvs joined	03:53
	← mizu_no_oto left	03:58
	← sunri5e left	04:00
	→ raijin joined	04:00
	← aidalgol left	04:01
	→ inflames joined	04:02
	← Noldorin left	04:02
	→ sunri5e joined	04:03
	→ jnewt1 joined	04:03
	← brent__ left	04:04
	← durham left	04:04
	→ Andrew_K joined	04:04
jnewt1	i can't seem to clone anything using http or https , i get Unable to find remote helper for 'https'	04:05
	. i just updated curl and git based on some answers from SO.	04:05
dRealm	Okay, I just read git-rm(1). The answer is: if you want to unstage and delete stuff ONLY from the working directory, DON'T ask git to do the expansion; instead let the shell do it.	04:05
	→ sarp joined	04:06
	→ sarp_ joined	04:06
	← gelei007 left	04:06
	→ ozmage joined	04:06
jnewt1	here's the updated --version outputs from git and curl: http://pasted.co/1037e7a5	04:07
	← dcy left	04:10
	← qguv left	04:11
	→ bumpy joined	04:12
	→ qguv joined	04:13
	← qguv left	04:14
	→ qguv joined	04:15
	→ mohabaks joined	04:18
	← LiftLeft left	04:19
	→ shgysk8zer0_ joined	04:19
	← sarp_ left	04:22
	← mohabaks left	04:23
	→ LiftLeft joined	04:25
	→ webbcam joined	04:28
	← ozmage left	04:31
	← webbcam left	04:31
	← raijin left	04:32
	← fstd left	04:33
	→ Kaisyu joined	04:33
	→ Cabanoss- joined	04:34
	← venmx left	04:35
	← hexagoxel left	04:35
	→ mohabaks joined	04:36
	→ VladGh joined	04:36
	→ _xor joined	04:36
	→ pur3eval joined	04:37
	→ mischat joined	04:37
	→ dcy joined	04:37
	← Cabanossi left	04:37
	Cabanoss- → Cabanossi	04:37
	→ hexagoxel joined	04:38
	→ fstd joined	04:38
	→ Emperor_Earth joined	04:39
	← mohabaks left	04:41
	← mischat left	04:42
	← pur3eval left	04:42
	← svm_invictvs left	04:44
	→ svm_invictvs joined	04:45
	← fstd left	04:46
	→ fstd joined	04:46
	← endiruna left	04:47
	← matoro left	04:47
	→ endiruna joined	04:48
	→ matoro joined	04:51
	→ xall joined	04:52
	→ sword joined	04:55
	→ sittingbear joined	04:56
	← madewokherd left	04:58
	← glspi left	05:00
	← acetakwas left	05:01
	→ ayogi joined	05:01
	← xall left	05:02
	← matoro left	05:02
	← canuk left	05:03
	→ matoro joined	05:04
	→ ElGrandeAmigo joined	05:07
	← xlegoman left	05:08
	← zzz_ left	05:09
	← ElGrandeAmigo left	05:11
	→ zzz joined	05:11
	← jnewt left	05:12
	→ jimklo joined	05:12
	→ lmclinskey joined	05:12
	← nckpz_ left	05:14
	← sarp left	05:15
	→ ozmage joined	05:17
	← Lunatrius left	05:18
	← Gsham left	05:18
	← sittingbear left	05:19
	→ SiliconDon joined	05:25
	→ Lunatrius joined	05:25
cheater	e: thanks, let me look	05:26
	← chipotle left	05:26
cheater	e: thanks, but that's not it	05:27
	← robotroll left	05:28
	← SiliconDon left	05:28
cheater	e: oh but actually .. is what i'm looking for	05:28
	>> For example, origin.. is a shorthand for origin..HEAD and asks "What did I do since I forked from the origin branch?" Similarly, ..origin is a shorthand for HEAD..origin and asks "What did the origin do since I forked from them?"	05:29
	→ SiliconDon joined	05:29
	← l4v2 left	05:29
	← ToBeCloud left	05:31
	← shgysk8zer0_ left	05:32
	← vivuroy left	05:37
	← menip left	05:38
	→ pur3eval joined	05:38
	→ mischat joined	05:38
	← b3kN left	05:40
	← zivester left	05:41
	← matoro left	05:41
	← MineCoins left	05:42
	← pur3eval left	05:42
	← mischat left	05:43
	← ffilozov left	05:44
	→ sarri joined	05:44
	← sarri left	05:44
	→ sarri joined	05:44
	→ nd joined	05:44
	→ sbulage joined	05:45
	← nd_ left	05:47
	→ gelei007 joined	05:48
	← Groovin left	05:48
	→ jameser joined	05:49
	→ matoro joined	05:50
	→ Groovin joined	05:50
	← Kulrak left	05:52
	→ mohabaks joined	05:53
	← zzz left	05:55
	← fstd left	06:01
	→ fstd joined	06:01
	← MattMaker left	06:01
	← lmclinskey left	06:02
	→ dec0n joined	06:02
	→ MattMaker joined	06:04
	← navidr left	06:06
	← MACscr left	06:07
	← mohabaks left	06:07
	→ vivuroy joined	06:07
	← SiliconDon left	06:08
	→ brent__ joined	06:08
	→ MineCoins joined	06:08
	→ MACscr joined	06:08
	→ jozwior joined	06:10
	← vivuroy left	06:12
	→ rscata joined	06:16
	← nunchuck left	06:20
	← deduped left	06:20
	→ mohabaks joined	06:21
	→ Gloomy joined	06:23
	← basiclaser left	06:30
	← mohabaks left	06:31
	← brent__ left	06:32
	→ Guest82 joined	06:36
	→ Kulrak joined	06:37
	← Kulrak left	06:37
	→ Kulrak joined	06:37
	← ozmage left	06:38
	→ pur3eval joined	06:38
	→ mischat joined	06:39
	→ dersand joined	06:41
	← mischat left	06:43
	← Guest9 left	06:43
	← pur3eval left	06:44
	→ _UniFreak joined	06:44
	→ overlord_tm joined	06:45
	← robattila256 left	06:49
	→ Raging_Hog joined	06:50
	→ MattMake_ joined	06:50
	→ lordjancso joined	06:50
	← _xor left	06:52
	→ ThomasLocke joined	06:53
	→ basiclaser joined	06:53
	← MattMaker left	06:54
	→ e01 joined	06:56
	← e01 left	06:56
	→ e01 joined	06:56
	→ Endorphine joined	06:57
	← ISmithers left	06:59
	← Endorphine left	06:59
	→ zeroed joined	07:01
	← zeroed left	07:01
	→ zeroed joined	07:01
	→ wdfwefewvfgew joined	07:01
	← wdfwefewvfgew left	07:01
	→ Endorphine joined	07:01
	← Endorphine left	07:01
	→ miczac joined	07:02
	gitinfo set mode: +v	07:02
	→ JeroenT joined	07:02
	→ vivuroy joined	07:04
	→ Arno joined	07:04
	→ ihradek joined	07:05
	→ lmat joined	07:06
	← zeroed left	07:08
	← vivuroy left	07:09
	← Lunatrius left	07:10
	← ash_workz left	07:10
	→ zeroed joined	07:10
	← zeroed left	07:10
	→ zeroed joined	07:10
	← watabou left	07:13
	← Guest82 left	07:15
	→ lb1c joined	07:16
	← dcy left	07:17
	→ afuentes joined	07:18
	→ acetakwas joined	07:19
	→ dcy joined	07:20
	→ Lc0rE_ joined	07:20
	→ dan2k3k4 joined	07:20
	← jstimm left	07:23
	← Arno left	07:23
	→ freimatz joined	07:24
	→ chele joined	07:24
	→ santagada joined	07:24
	← Lc0rE_ left	07:25
	→ Lc0rE joined	07:26
	← donught left	07:27
	← Lc0rE left	07:29
	← JeroenT left	07:32
	→ JeroenT joined	07:33
	← jimklo left	07:36
	→ jimklo joined	07:37
	← JeroenT left	07:37
	→ F0rTh3J3st_ joined	07:38
	← dcy left	07:38
	← F0rTh3J3st left	07:38
	→ dcy joined	07:38
	→ pur3eval joined	07:39
	→ mda1 joined	07:40
	← jimklo left	07:41
	← mda1_ left	07:42
	→ mohabaks joined	07:43
	→ bolino1234 joined	07:43
	← bolino1234 left	07:43
	→ jimklo joined	07:44
	← pur3eval left	07:44
	← mohabaks left	07:45
	→ JeroenT joined	07:45
	← jimklo left	07:46
	→ jimklo joined	07:47
	→ repozitor joined	07:47
	← svm_invictvs left	07:48
	← MattMake_ left	07:48
	← jimklo left	07:49
	→ jimklo joined	07:50
	← repozitor left	07:51
	← Motoko left	07:51
	→ mohabaks joined	07:52
	← JeroenT left	07:53
	← algun_ left	07:53
	→ ash_workz joined	07:54
	→ qt-x joined	07:54
	← jimklo left	07:55
	→ jnavila joined	07:57
	← thiago left	07:58
	→ kent\n joined	07:58
	← Guest30 left	07:59
	← cqi left	08:01
	→ mischat joined	08:02
	← mischat left	08:03
	→ blr joined	08:03
_ikke_	jnewt1: what does git --exec-path return?	08:05
	→ JeroenT joined	08:05
	← dcy left	08:05
	→ dcy joined	08:06
	← mohabaks left	08:09
	→ visual joined	08:11
visual	hey guys	08:11
	→ ispn joined	08:11
visual	how do i add a remote git repository to an existing folder	08:11
	→ jagob joined	08:12
	→ cqi joined	08:14
	← raynold left	08:14
_ikke_	visual: git remote add <name> <url>	08:14
	→ rajat joined	08:14
	→ aidalgol joined	08:16
visual	and then how do i 'sync' it?	08:19
	i cant push, i cant pull	08:19
	this is really frustrating	08:19
	→ Prospero_ joined	08:19
	→ Dumblez0r joined	08:20
visual	Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g.	08:20
	hint: 'git pull ...') before pushing again	08:20
	but i just pulled it	08:20
_ikke_	You have to specify what to pull	08:20
	→ theoceaniscool joined	08:20
	→ AndChat\|607476 joined	08:20
visual	git pull remote origin	08:21
	error: The following untracked working tree files would be overwritten by merge:	08:21
_ikke_	visual: did you call your remote 'remote'?	08:22
	← Prospero_ left	08:22
visual	my bad, git pull origin master	08:22
_ikke_	ok	08:22
visual	and i t complains about the files	08:22
	→ Prospero_ joined	08:22
_ikke_	Right	08:22
	You have untracked files	08:22
	I mean	08:22
	uncomitted changes	08:22
visual	but i cant commit them because it says my branch is behind	08:23
_ikke_	You an alway commit	08:23
visual	-f ?	08:23
_ikke_	No need to	08:23
	just stage them and commit	08:23
	← Prospero_ left	08:23
visual	i can't man	08:23
	hint: Updates were rejected because the tip of your current branch is behind	08:23
	failed to push some refs to..	08:23
	so cant push and cant pull	08:23
_ikke_	That's when you push changes	08:23
visual	what the hell	08:23
	→ venmx joined	08:24
_ikke_	visual: You are missing one step	08:24
visual	what step	08:24
_ikke_	visual: First make sure everything locally is comitted	08:24
	→ Endorphine joined	08:24
visual	nothing to commit, working directory clean	08:24
_ikke_	visual: What does git status return	08:24
	→ AndChat-607476 joined	08:24
visual	same thing, on branch master, nothing to commit, working directory clean	08:25
_ikke_	visual: git status --ignored	08:25
visual	yeah there,s a bunch of ignored files	08:25
	i added those to gitignore	08:26
_ikke_	Right	08:26
	I suspect that someone started to track one of those files	08:26
visual	nobody except me uses this repository, i made it yesterday	08:26
_ikke_	ok	08:26
	and git merge origin/master	08:26
visual	error: The following untracked working tree files would be overwritten by merge:	08:27
_ikke_	What is the name of that file	08:27
visual	Sitemap.xml both fiels	08:27
_ikke_	(Is it one of the ignored files)?	08:27
visual	no	08:27
	or maybe	08:27
	wait	08:27
	http://prntscr.com/e82jve	08:28
	← AndChat\|607476 left	08:28
visual	i dont know where he gets the dev/tests... part	08:28
	s/part/folders	08:28
_ikke_	visual: try git status --ignored -uall	08:29
	It should also show each file seperately	08:29
	← venmx left	08:29
visual	it does, there's a lot of them	08:29
	← Endorphine left	08:29
	← jnewt1 left	08:29
_ikke_	They are probably covered by your .gitignore file	08:30
	← askb left	08:30
visual	yeah	08:30
_ikke_	Right, so you track them in your remote, but not locally	08:31
	← AndChat-607476 left	08:31
visual	how?	08:31
_ikke_	The merge would have to overwrite the sitemap.xml, which git refuses	08:31
visual	right so what's the procedure now? i guess i could just delete those files	08:32
_ikke_	Yeah, that's the easiest sollution	08:32
	← GT4066 left	08:32
visual	after i remove them what do i do	08:33
_ikke_	Then merge, then untrack those files	08:33
visual	which git commands	08:33
	→ AndChat607476 joined	08:33
_ikke_	git merge origin/master	08:33
	→ morfin joined	08:33
morfin	hello	08:34
	→ dvdchr joined	08:34
	→ _ng joined	08:34
	→ dc5ala joined	08:34
morfin	git stash contains some things which act as commits?	08:34
_ikke_	morfin: Yeah, git stash is implemented as a merged between 2 commits (so 3 commits in total)	08:34
	← dreiss left	08:35
_ikke_	a merge*	08:35
	← AndChat607476 left	08:35
	→ Endorphine joined	08:35
	← BackEndCoder left	08:35
	→ BackEndCoder joined	08:35
	← dcy left	08:36
	→ fragMental joined	08:38
	← sbulage left	08:39
	→ sbulage joined	08:39
	→ pur3eval joined	08:40
visual	fuckin gchristr	08:40
	removed the folder, gonna start again	08:41
_ikke_	..	08:41
visual	every time i get to deal with git i wanna kill somebody :^)	08:41
morfin	he-he i had merge conflict when popped stash	08:42
visual	yesterday i made the repo, pushed everything, made an archive that i downloaded here at work	08:42
	why the fuck does it have to be so complicated to sync it if it's the same files	08:42
_ikke_	visual: git trying to protect you against loosing changes	08:43
	that are not tracked	08:43
morfin	he-he	08:43
	→ byte512 joined	08:43
visual	where did the changes come from if it's the same files i pushed yesterday and nobody touched it	08:43
	retarded git	08:44
morfin	you even can cherry-pick removed commit i think	08:44
	← hussam left	08:44
	← pur3eval left	08:44
qt-x	visual: have you changed the history (rebase) ?	08:45
visual	no i havent touched it at all	08:45
qt-x	morfin: try reflog	08:45
	← freimatz left	08:45
_ikke_	visual: did you use git add -f sometime?	08:46
visual	yes	08:46
_ikke_	Well, there you go	08:46
	git add -f tells git to also add ignored files	08:46
visual	what a retarded feature	08:47
	i thought it just adds it despite conflicts	08:47
	→ Balliad joined	08:47
morfin	qt-x i remember	08:48
	something like git cherry-pick ..HEAD@{2}	08:48
	without knowing actual id of commit	08:49
	→ MattMaker joined	08:49
	→ jimklo joined	08:51
visual	http://prntscr.com/e82sm0	08:51
	fuck it	08:51
	:^)	08:51
	git pull	08:51
	then git push and it says it contains work i do not have	08:52
	if that's not retarded i dont know what is	08:52
_ikke_	visual: It's you trying random things without trying to grasp what is happening	08:52
	especially adding random -f	08:52
morfin	git pull failed?	08:52
visual	>remote: GitLab: You are not allowed to force push code to a protected branch on this project	08:52
	jesus fucking christ	08:52
	i need a smoke	08:52
morfin	because there is local uncommited changes	08:53
_ikke_	visual: It tells you why it failed	08:53
visual	i JUST added . and commited it	08:53
morfin	Gitlab can protect certain branches from push	08:53
	so you can only go trought merge request	08:53
	← MattMaker left	08:54
morfin	pull, create branch, commit, push, create merge request, merge	08:54
_ikke_	morfin: I don't think it's the case here	08:54
	Problem is that his remote contains changes he pushed from another repo	08:54
	he tries to merge locally, but that fails, because he has untracked files that would've been overwritten	08:55
	← Dumblez0r left	08:55
_ikke_	And lastly, he uses push -f, overwriting the commits he pushed from the other branch	08:55
	← MonsterKiller left	08:55
_ikke_	from the other repo*	08:55
	← jimklo left	08:56
	← Endorphine left	08:56
	← Goplat left	08:57
	→ MonsterKiller joined	08:57
visual	well not exactly	08:57
	i added some folders to gitignore because they're cache folders, etc	08:58
	then pushed to the repo	08:58
	← elsevero left	08:58
visual	now i downloaded the archive from the server (including the cached folders), added the same gitignore to the folder, and am trying to sync with the repo	08:58
	and failing miserably :^)	08:58
	→ Dumblez0r joined	08:59
_ikke_	Well, the files are tracked in master on your remote	08:59
	→ joshszep joined	08:59
_ikke_	even if you have them in .gitignore	08:59
	That's what causing these errors	08:59
	← joshszep left	08:59
visual	only 2, out of a few hundred	08:59
	why	08:59
	*out of a few hundred that are ignored	09:00
_ikke_	visual: git add -f, files were already tracked before you ignored them	09:00
visual	yeah and i did the -remove all from gitignore thing before pushing yesterday	09:00
	which reflected in the repo as deletion of those files	09:01
	fuck it, i'll just pull without the cached files	09:01
	→ apotry joined	09:01
visual	wasted 2 hours already on this, not worth it	09:02
	git kills	09:02
	thank you for your time :)	09:02
_ikke_	visual: It helps to invest into it a bit, so that you understand what happens. Is a lot less frustrating	09:03
visual	honestly it's just easier to keep backups than use this piece of shit software	09:03
	← JeroenT left	09:03
	→ mohabaks joined	09:03
visual	i've been a dev for a better part of a decade, and every single time git is involved it's a nightmare	09:04
_ikke_	visual: I was helping you trying to solve it, but you were too impatient	09:05
	→ jimsio joined	09:05
visual	i know, appreciate that	09:05
	sigh	09:05
	→ JeroenT joined	09:05
visual	if you have the time, can you guide me through it again?	09:05
_ikke_	sure	09:05
visual	ill give it one last shot	09:05
	alright	09:05
	im unpacking an archive taken from the hosting server; repo doesnt contain a few folders that i need ignored, which are added to the .gitignore	09:07
	miczac → miczac\away	09:07
visual	that's the situation	09:07
_ikke_	is that archive a full repo?	09:07
qt-x	visual: git fetch; gitk --all ; # see what is wrong with your history	09:07
	→ troulouliou_div2 joined	09:07
_ikke_	qt-x: this is a working tree issue, not necessarily a history issue	09:08
visual	_ikke_: it contains all the files from the repo AND a few folders that need to be ignored	09:08
_ikke_	ok	09:08
	← dvdchr left	09:08
	→ mikecmpbll joined	09:08
_ikke_	visual: so now when you do git pull, you get that error message, right?	09:08
visual	im still unpacking, 1 moment	09:09
	well actully 2 minutes 20 seconds )	09:09
_ikke_	sure	09:09
visual	i'll have to start with git init	09:09
qt-x	:D	09:09
visual	idk why but the .git folder didnt get archived	09:10
qt-x	git init will create a new tree history	09:10
	← Dumblez0r left	09:10
	→ lss8 joined	09:10
	← lss8 left	09:10
	→ lss8 joined	09:10
qt-x	and all push will fail	09:11
_ikke_	right	09:11
visual	well git clone will ignore those folders	09:11
	→ dcy joined	09:11
visual	so theres' no third option	09:11
_ikke_	visual: clone, and copy those folders?	09:11
visual	it's a lot of folders	09:11
_ikke_	you can copy over the entire working tree	09:12
visual	what if i copy everything [unpacked archive] on top of the cloned folder?	09:12
_ikke_	Right ^^	09:12
visual	oh, ok, one moment	09:12
	and then logically i should just add . and commit ?	09:14
	the .gitignore should include the folders that are not to be tracked	09:15
	← jagob left	09:15
	→ jagob joined	09:18
	→ Snugglebash joined	09:20
visual	so after copying everything on top of the cloned folder, the next step is git add . ?	09:20
	→ Shashikant86 joined	09:22
	← blackwind_123 left	09:23
	← mohabaks left	09:23
	→ elsevero joined	09:24
	← acetakwas left	09:24
	→ blackwind_123 joined	09:24
	← LiftLeft left	09:25
	← dcy left	09:25
	→ vivuroy joined	09:26
visual	:I	09:27
	→ Lunatrius joined	09:28
	→ Darcidride joined	09:30
	← vivuroy left	09:31
	← miczac\away left	09:31
	← lss8 left	09:33
	→ mischat joined	09:33
	→ Raging_Frog joined	09:34
	← Shashikant86 left	09:34
	→ HurricaneHarry joined	09:37
_ikke_	visual: what does git status say?	09:37
visual	a lot of modified	09:37
	← clemf_ left	09:38
visual	even files that arent(and shouldnt be) in gitignore	09:38
	i guess it looks by the date	09:38
_ikke_	Only to see if it should check for changes	09:39
	if git status says modified, it means it has different contents	09:39
	← Snugglebash left	09:40
_ikke_	So I expect that what you have cloned is a different commit	09:40
	← sbulage left	09:40
_ikke_	visual: do you see ignored files in there?	09:40
	→ sbulage joined	09:40
_ikke_	(files that should be ignored)	09:40
visual	1 moment	09:41
	→ pur3eval joined	09:41
visual	doesnt seem so	09:42
	→ j7k6 joined	09:43
visual	but im not 100%, the git status displayed more files than im able to scroll	09:43
	← Gloomy left	09:43
	← dsdeiz left	09:44
	→ achadwick joined	09:44
visual	well what now? do i add them?	09:44
	→ Shashikant86 joined	09:44
_ikke_	git ls-files -c -i --exclude-standard	09:45
	this shows tracked files that would've been ignored	09:45
visual	yes the same 2 files from before, Sitemap.xml	09:45
	→ Snugglebash joined	09:45
	→ dsdeiz joined	09:45
_ikke_	right	09:45
visual	i should maybe write these commands somwhere too.. thx about that )	09:45
	→ dcy joined	09:45
	← Raging_Frog left	09:45
	← pur3eval left	09:46
_ikke_	You only care about the cachefiles from the archive, correct?	09:46
	→ mischat_ joined	09:46
	→ Serpent7776 joined	09:46
visual	yeah	09:46
	→ hwoarang joined	09:47
_ikke_	git checkout HEAD .	09:47
	(this would overwrite the 2 sitemap.xml files though)	09:48
	← Derperpe1 left	09:48
visual	alright did that	09:48
_ikke_	So now your working tree should be clean again	09:48
	correct?	09:49
visual	http://prntscr.com/e83fj8	09:49
	i dont think so	09:49
	i mean it stil shows in the --exclude-standard c	09:49
	← mischat left	09:49
_ikke_	Yeah, that is the next step	09:50
	→ acetakwas joined	09:50
_ikke_	git rm --cached <sitemap_files>	09:50
	← dcy left	09:50
	← Shashikant86 left	09:50
visual	alright done	09:51
_ikke_	Now you can commit these changes	09:51
visual	do i do add . first?	09:51
_ikke_	No, that's not necessary. Check git status	09:51
visual	http://prntscr.com/e83gqa	09:52
	weird, why does it not show all the modified files from before?	09:52
	→ dcy joined	09:53
visual	wew, the push went through	09:53
	← peterR`` left	09:53
visual	thanks a lot man, appreciate it :^)	09:53
	now 2 more repos to go, hopefully the same commands will suffice	09:53
_ikke_	visual: that's what the git checkout HEAD . command did	09:54
	← dave0x6d left	09:55
	→ King_Hual joined	09:55
	→ ocbtec joined	09:55
visual	i see	09:55
	thank you	09:55
	what would one need to do in this situation?	09:56
	http://prntscr.com/e83iag	09:56
	it complains that they're untracked, but i cant remove them	09:56
_ikke_	They are already untracked	09:56
	you cannot 'untrack' them if they're not being tracked in the first place	09:56
	if you want them gone, just rm them	09:56
	(or add them to .gitignore)	09:57
visual	got it, thanks man	09:57
	→ denisMone joined	09:58
	→ borkr joined	09:58
	→ marcogmonteiro joined	09:59
visual	sigh	09:59
	in another repo, doing git checkout HEAD . outputs error	10:00
	error: pathspec '.' did not match any file(s) known to git.	10:00
	→ hussam joined	10:00
	→ MattMaker joined	10:00
visual	my bad, wrong folder	10:00
	→ mquin_ joined	10:01
	→ Shashikant86 joined	10:03
	→ Tobbi joined	10:04
	← jozwior left	10:04
	→ m4sk1n joined	10:04
	← MattMaker left	10:05
	→ askb joined	10:05
	→ IntruderSRB joined	10:06
	← dcy left	10:06
	→ jozwior joined	10:06
	→ nettoweb joined	10:07
	← mquin_ left	10:11
	→ mquin_ joined	10:12
	← Shashikant86 left	10:12
	← cqi left	10:12
	→ rnsanchez joined	10:13
	→ inbx joined	10:14
	→ chll_ joined	10:14
	→ TomyLobo joined	10:14
	→ elsevero_ joined	10:15
	← elsevero left	10:16
	elsevero_ → elsevero	10:16
	→ bongjovi joined	10:16
	← Tobbi left	10:16
	→ ruxu joined	10:17
	← askb left	10:19
	← aidalgol left	10:19
	→ Tobbi joined	10:19
	← troulouliou_div2 left	10:23
	← IntruderSRB left	10:23
	→ venmx joined	10:25
	← inbx left	10:27
	← dsdeiz left	10:27
	→ Gloomy joined	10:28
	← Snugglebash left	10:29
	← gelei007 left	10:29
	← venmx left	10:30
	← mischat_ left	10:33
	→ dcy joined	10:33
	→ mischat joined	10:33
	→ Snugglebash joined	10:34
	→ Anticom joined	10:35
	→ gelei007 joined	10:36
	→ flaviodesousa joined	10:39
	→ tvw joined	10:40
	→ dwts joined	10:40
	→ BooK joined	10:40
	→ IntruderSRB joined	10:40
	→ inbx joined	10:41
	→ vivuroy joined	10:41
	← IntruderSRB left	10:41
	→ pur3eval joined	10:41
	← mehola left	10:42
	→ mehola joined	10:43
	← mehola left	10:43
	→ Derperpe1 joined	10:43
	← ocbtec left	10:43
	→ mehola joined	10:45
	← pur3eval left	10:46
	← vivuroy left	10:46
	→ johnny56_ joined	10:47
	← Derperpe1 left	10:48
	← johnny56 left	10:48
	→ Spherical joined	10:49
	← mehola left	10:50
	← gelei007 left	10:51
	← zeroed left	10:51
	← King_Hual left	10:51
	← Spherical left	10:52
	→ vivuroy joined	10:53
	→ zeroed joined	10:53
	← zeroed left	10:54
	← dc5ala left	10:57
	← tvw left	10:57
	← vivuroy left	10:57
	mquin_ → mquin	10:58
	→ vivuroy joined	10:58
	→ ozmage joined	10:59
	← inbx left	10:59
	→ ferr1 joined	11:01
	→ newbie1 joined	11:01
	→ geoid_ joined	11:01
	→ tvw joined	11:02
	→ bvtton joined	11:03
	← _UniFreak left	11:06
	← kent\n left	11:10
	→ kent\n joined	11:11
	← ozmage left	11:11
	→ _cyril_ joined	11:12
	→ IntruderSRB joined	11:12
	→ Gravious joined	11:13
	← vivuroy left	11:15
	← IntruderSRB left	11:16
	→ jfr joined	11:17
	→ miczac\away joined	11:17
	gitinfo set mode: +v	11:18
	→ inbx joined	11:18
	← jameser left	11:20
	→ jnewt1 joined	11:25
	→ venmx joined	11:26
	→ mohabaks joined	11:27
	← jnewt1 left	11:30
	← mohabaks left	11:31
	← inbx left	11:32
	← venmx left	11:32
	→ redeemed joined	11:33
	→ IntruderSRB joined	11:34
	← Snugglebash left	11:35
	← finalbeta left	11:35
	→ finalbeta joined	11:36
	→ re1 joined	11:36
	← re1 left	11:37
	→ Snugglebash joined	11:37
	→ re1 joined	11:37
	← re1 left	11:38
	→ wrouesnel1 joined	11:38
	→ freimatz joined	11:38
	← dcy left	11:38
	→ re1 joined	11:38
	← re1 left	11:39
	→ mischat_ joined	11:40
	→ re1 joined	11:40
	← re1 left	11:40
	→ re1 joined	11:41
	← re1 left	11:41
	← PioneerAxon left	11:42
	→ re1 joined	11:42
	← kyan left	11:42
	→ pur3eval joined	11:42
	← swalladge left	11:42
	← mischat left	11:43
	← cebor left	11:43
	← re1 left	11:43
	→ re1 joined	11:44
	→ cebor joined	11:45
	→ MattMaker joined	11:46
	← blackwind_123 left	11:47
	← Andrew_K left	11:47
	← pur3eval left	11:47
	→ PioneerAxon joined	11:47
	→ blackwind_123 joined	11:49
	← Gloomy left	11:49
	← MattMaker left	11:51
	→ Dumblez0r joined	11:51
	← SwiftMatt left	11:51
	→ LBV_User joined	11:52
	← Tobbi left	11:52
	← NullableTruth left	11:53
	→ Rico joined	11:53
Rico	hi	11:53
_ikke_	hello	11:53
Rico	wan anybody tell me the way to create a repository from a "git clone" directory backup ?	11:54
	s/wan/can/	11:54
	→ ertesx joined	11:54
	→ NullableTruth joined	11:54
_ikke_	if you have the .git directory, you already have a complete repository	11:55
	→ dsdeiz joined	11:55
	← dsdeiz left	11:55
	→ dsdeiz joined	11:55
	→ gelei007 joined	11:56
Rico	_ikke_: yes I have it. I've done a "git init --bare repo.git" in my /home/git folder (that's where my git repos are). then I cd in my local copy and do a "git push [email@hidden.address]	11:57
	← ertes left	11:57
	ertesx → ertes	11:57
Rico	is that the correct way to do it ?	11:57
_ikke_	Not understanding what you want to achieve with that	11:58
Rico	oops, did not see that it's lunch time, I'll be back in 1 hour	11:58
	sorry	11:58
	→ BSAlb joined	11:58
	← theoceaniscool left	12:00
	→ Tobbi joined	12:00
	→ swalladge joined	12:01
	← ruxu left	12:02
	← BSaboia left	12:02
	← mischat_ left	12:03
	→ raijin joined	12:04
	← ferr1 left	12:07
	→ mischat joined	12:07
	→ ferr1 joined	12:07
	← mischat left	12:07
	← Orbitrix left	12:07
	→ mischat joined	12:07
	→ Orbitrix joined	12:08
	← JeroenT left	12:09
	→ deinspan- joined	12:09
	→ JeroenT joined	12:12
	← JeroenT left	12:13
	← dsdeiz left	12:13
	→ Gloomy joined	12:13
	← gelei007 left	12:15
	gitinfo set mode: +v	12:15
deinspan-	Hey folks, could someone help me figure out something I'm doing wrong please? I have a clone of a project begriffs/postgrest. Some time ago I made a pull request for it in a branch named feature/stack-docker-build. I want to update and rebase that patch.	12:15
	my problem is, I left my local clone of it with some trash so I did a "git reset —hard deinspanjer feature/stack-docker-build" and that looks fine. "git status" says it is clean and up to date.	12:15
	← raijin left	12:15
deinspan-	next I try to do a "git pull origin master", and it does a rewind and replay, but that leaves me in an unusual state.	12:15
	→ sophiag joined	12:15
deinspan-	after the pull of master, "git status" reports that my branch and deinspanjer/feature/stack-docker-build have diverged. How could they have diverged?	12:15
sophiag	hi. on here as usual because i did something weird and am freaking out over a lost file :(	12:16
	my situation is i seem to have too instances of git...one in the outer project folder and one in an inner src directory	12:17
	→ JeroenT joined	12:17
	← JeroenT left	12:17
sophiag	i tried committing and pushing my change and it overwrote everything except what was in the inner src directory	12:17
	so i did a hard reset back one commit and pushed that	12:18
	→ JeroenT joined	12:18
	→ YuGiOhJCJ joined	12:18
sophiag	now the file in question is back to some really really old version	12:18
	reflog obviously allows me to see everything, but i can't seem to be able to just open the version i saved by resetting it back	12:18
	can anyone help me troubleshoot this?	12:18
	the outer instance of git is clearly the correct one	12:21
	i think i just need to figure out how to pull the file i saved this morning from the inner instance from the commit i see in reflog and can't seem to figure out how to do that :(	12:21
	→ theoceaniscool joined	12:22
	← alexandre9099 left	12:22
deinspan-	@sophiag did you try diffing or reseting that file when you were in the directory where your nested .git exists?	12:22
sophiag	yes	12:23
	← ash_workz left	12:23
deinspan-	@sophiag when you end up with nested .git folders, the git commands use the first one they find starting at the current working directory and going up.	12:23
sophiag	the problem seems to be i did a hard reset in the nested .git and htat brought it way back several months	12:23
deinspan-	oh, so the nested one is the old one?	12:23
sophiag	yes	12:24
	→ treia joined	12:24
deinspan-	hmm	12:24
sophiag	except that was where i committed the file i'm trying to recover	12:24
deinspan-	and before the reset, had you ever done a commit of the file?	12:24
sophiag	no	12:24
deinspan-	hmm	12:24
sophiag	what's confusing me is why i can't just reset the inner .git to after i committed that file and copy it	12:25
	right now the outer one is correct except for that file...which is very very old	12:25
	← salamanderrake left	12:25
deinspan-	wait, but you just said you hadn't committed it	12:25
sophiag	you asked if i reset it	12:26
	→ tsdev joined	12:26
deinspan-	okay, let me ask something different.. are there any changes you made to that file that would be lost if you just blew everything away and worked with only the repo that is in the outer .git?	12:26
sophiag	yes	12:26
	that's my problem	12:26
deinspan-	okay.	12:27
sophiag	and right now i have the outer git pushed to remote and it's displaying the super old version of that one file	12:27
	what i need is to just recover it from the inner .git	12:27
	then copy it and commit to the outer one	12:27
	→ alexandre9099 joined	12:27
deinspan-	so at some point, you made changes to the file, you committed those changes to the inner .git repo, and then you did a reset of the inner .git, right?	12:27
sophiag	yes	12:27
	but i can see everything in reflog obviously	12:27
deinspan-	what does "git fsck —lost-found" tell you?	12:28
sophiag	in the inner one?	12:28
deinspan-	yes	12:28
sophiag	i have three dangling blobs	12:28
deinspan-	we need to deal exclusively in the inner one until we get that file back since the outer doesn't have the changes you need	12:28
sophiag	yes	12:28
deinspan-	how far back did you reset? multiple commits or just one?	12:29
sophiag	just one	12:29
	← waveclaw left	12:29
sophiag	but then tried resetting it forward once as well	12:29
deinspan-	ew	12:29
	so can you see the SHA1 of the commit you want in "git reflog"?	12:29
sophiag	yeah...from my bad troubleshooting the commit i actually need is 3 right now	12:29
	the one i need is HEAD@{3}	12:30
	← JeroenT left	12:30
sophiag	for that one file	12:30
	→ JeroenT joined	12:30
	→ waveclaw joined	12:30
deinspan-	okay, so try "git merge <SHA1>" of head 3	12:30
sophiag	but i already tried resetting to that	12:30
	and that screwed it up wrose	12:30
	oh ok	12:30
	lemme see	12:30
	→ eroux joined	12:30
	→ jab416171 joined	12:31
sophiag	it says already up to date...	12:31
_ikke_	ls	12:31
	← Bizkit left	12:31
sophiag	i did ls and cat and it's the super old file tho...	12:32
deinspan-	hmm.. so either the second reset you did put you in a state I don't understand, or the SHA1 you used is actually the old version...	12:32
	try deleting the file and then doing the merge again?	12:32
sophiag	already up to date...	12:33
	→ ChiLL_SurF joined	12:33
	← netj left	12:33
	→ netj joined	12:33
sophiag	altho now the file is gone	12:34
	don't i need to commit after merging	12:34
	?	12:34
	→ l4v2 joined	12:34
sophiag	like i deleted it, merged again, now it's still gone	12:34
deinspan-	after the merge, you should have the file in your current working state which is all you need	12:34
	okay, try doing just a checkout of that SHA1 instead	12:34
sophiag	:D	12:35
	← rajat left	12:35
deinspan-	good	12:35
	← nowhereman left	12:35
deinspan-	So are you sure this is the only file you care about from this inner .git?	12:35
	→ nowhereman joined	12:36
deinspan-	And your team isn't doing anything with git subtrees or git submodules?	12:36
	← JeroenT left	12:36
sophiag	yes. if i could just swap this with the one that's currently in my remote i'd be golden	12:36
	→ JeroenT joined	12:36
	← eroux left	12:37
sophiag	altho i have a ton of old formerly deleted junk in that folder too	12:37
deinspan-	If yes to the second question as well, then what I would recommend is doing a mv of that inner .git to some safe out of the way place just in case	12:37
	when the inner .git isn't there any more, the outer one will be in charge again	12:37
	← JeroenT left	12:38
deinspan-	as soon as the inner is gone, you should be able to do a git status and see that one file is waiting for an add	12:38
	→ eroux joined	12:38
sophiag	hmmm	12:38
	ok. i copied it to a gist anyway to be safe	12:38
deinspan-	of course. :)	12:38
	← Groovin left	12:39
	deinspan- → deinspanjer	12:39
	← l4v2 left	12:39
sophiag	ok moved it	12:40
	and status in the right one has it waiting for me	12:40
deinspanjer	and git diff still shows it being the changes you want?	12:40
	→ JeroenT joined	12:40
sophiag	yes	12:41
deinspanjer	then commit that and you should be good to go. If everything continues to look good after a while, you can throw away that spurious .git folder.	12:41
sophiag	but i should probably roll back one commit in the outer git?	12:41
deinspanjer	ah	12:41
sophiag	there was one stupid one made	12:41
deinspanjer	So in this git, you have a commit of the old version?	12:41
sophiag	yes	12:41
	i think i should reset back one and manually copy it?	12:42
deinspanjer	one sec	12:42
	have you pushed that change?	12:42
	the one with the bad version?	12:42
sophiag	yes	12:42
deinspanjer	hum	12:42
sophiag	i think best to act like i never edited the file and then paste it in	12:43
deinspanjer	so a revert is basically just a new commit of an older version with a fancy message.	12:43
sophiag	frankly	12:43
	→ pur3eval joined	12:43
sophiag	yup	12:43
deinspanjer	since you pushed, that bad commit will still be in people's history	12:43
sophiag	but really really old	12:43
	people is just me	12:43
deinspanjer	So I'd just commit the new version with the same explanatory message	12:43
sophiag	yeah you're right	12:44
	→ Derperpe1 joined	12:44
sophiag	btw the shitty old files are there	12:44
	just untracked	12:44
	i suppose i can rm them	12:44
deinspanjer	If you hadn't pushed, then you could do a git commit —amend instead, but oh well. :)	12:44
	after you commit that important file, you can just do a git clean -fd	12:45
	← visual left	12:45
	← Tobbi left	12:46
	→ vivuroy joined	12:47
	→ salamanderrake joined	12:47
	← m4sk1n left	12:47
	→ F0rTh3J3st joined	12:47
	← F0rTh3J3st_ left	12:47
	← mischat left	12:47
	→ mischat joined	12:48
	← pur3eval left	12:48
	← mischat left	12:48
deinspanjer	Now then.. back to my problem I have to figure out. :)	12:48
sophiag	haha	12:49
	thanks so much	12:49
	tbh i only come on this channel in panic mode	12:49
deinspanjer	Very happy to pay it forward.	12:49
	Same here.	12:49
sophiag	i should try to learn more and then come here and help out	12:49
deinspanjer	well, right now I'm not panicing, just annoyed	12:49
	← JeroenT left	12:49
deinspanjer	stackoverflow is a goldmine for learning the inner mysteries of git	12:50
	→ JeroenT joined	12:50
	← Derperpe1 left	12:51
	← vivuroy left	12:51
	→ mischat joined	12:51
	← nowhereman left	12:53
sophiag	i always feel like i know it until things go wrong :/	12:53
tobiasvl	you'll get the hang of it	12:54
sophiag	mainly i did stupid things when i started out that carried over	12:54
	like moving directories the wrong way	12:54
	that's a huge one	12:54
	→ al-damiri joined	12:54
	→ Rr4sT joined	12:55
	→ Somelauw joined	12:58
	→ str_ joined	12:58
	← JeroenT left	12:58
Rico	_ikke_: hi again	12:59
	← re1 left	12:59
Somelauw	Am I bit disoriented by rebasing. When in an interactive rebase, does head refer to the commit I'm editing or the HEAD of not rebasing?	12:59
	← str_ left	12:59
	→ str joined	12:59
_ikke_	Somelauw: You mean in case of a merge conflict?	12:59
Somelauw	no, if just doing 'edit'	13:00
_ikke_	HEAD is then the commit you want to edit	13:00
Somelauw	then i don't know where i am, because git log shows the full tree of commits	13:00
	→ inbx joined	13:01
Somelauw	even though i thought i would be editing an old one	13:01
	← netj left	13:01
	→ plos joined	13:01
	→ netj joined	13:02
Rico	somebody sent me a .tgz containing a local copy of a git repo. I need to create a repo from this tgz. I have "git push" to an empty repository (created with git init --bare). when I wan to clone this repo, I have the following error :	13:03
	warning: remote HEAD refers to nonexistent ref, unable to checkout.	13:03
Somelauw	okay, i'll abort the rebase and start again. I want to edit commit C, so I start by doing git rebase -i C; then replacing the line by 'edit'	13:03
	then when i press git lg, I see my full commit history	13:04
	← ayogi left	13:06
tobiasvl	Rico: if the .tgz contains a git repo, why do you need to create a repo from it?	13:06
Somelauw	okay, i now understand i should have done "git rebase -i C~", so the ~ is important	13:06
	→ JeroenT joined	13:07
Rico	tobiasvl: because I need to work on this repository, apply bundles to it, create diffs, keep an history, ...	13:07
tobiasvl	Somelauw: yes, you want to rebase ONTO the base, which is C~ (the parent of C)	13:07
	Rico: I still don't understand. if the .tgz file contains a git repo, you can do all of that without creating a new repo.	13:07
Rico	other people have to work on this copy and get copies of that	13:08
	→ Wind0r joined	13:09
Rico	tobiasvl: is this the right way ? http://fpaste.scsys.co.uk/551998	13:09
	← JeroenT left	13:10
	→ cousteau joined	13:11
	→ JeroenT joined	13:11
tobiasvl	Rico: that looks OK, but the only branch you pushed to [email@hidden.address] was 13.9.1-ambe-edmr? is HEAD supposed to be that?	13:11
Rico	tobiasvl: yes	13:11
	I think I'm missing a step	13:12
cousteau	a branch is just a pointer (head) in the commit tree, right? Not quite like a physical tree branch (i.e. a set of commits made while on a certain branch)	13:12
tobiasvl	Rico: run "git symbolic-ref HEAD refs/head/13.9.1-ambe-edmr" inside asterisk-ambe-full.git	13:12
selckin	!compsci	13:13
cousteau	or do commits "know" which branch they belong?	13:13
tobiasvl	cousteau: correct, a branch is a pointer to a ref. it's not a physical tree branch in itself, but by traversing the ref's parents it kind of is one	13:13
selckin	cousteau: !cs	13:13
gitinfo	cousteau: "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	13:13
_ikke_	cousteau: nope	13:13
Rico	tobiasvl: in the "git clone" copy (/usr/local/src/...à ?	13:13
_ikke_	cousteau: a commit can be seen from numerous branches	13:13
cousteau	I see	13:13
	thanks!	13:13
	← jeffreylevesque_ left	13:13
	→ ash_workz joined	13:13
cousteau	(I'm no computer scientist but thanks for the link)	13:14
	→ GodGinrai joined	13:14
_ikke_	cousteau: You don't really need to be one	13:14
tobiasvl	Rico: no, in /home/git/asterisk-ambe-full.git	13:14
Rico	ok	13:14
cousteau	(well, I'm the kind of non-computer scientist who may get scared by words like "Directed Acyclic Graph"...)	13:14
_ikke_	Sounds more complicated than it really is	13:14
cousteau	ok if "Directed Acyclic Graph" is the strongest word I'm going to find then ok	13:14
e	it doesn't sound complicated	13:15
cousteau	I mean, I know what that is	13:15
Somelauw	tobiasvl: thanks, do professional git users rebase their commits all the time or do they just let them be?	13:15
_ikke_	commits are nodes on a graph	13:15
Rico	tobiasvl: still have the same warning, and onli have '.git' folder after cloning	13:15
	→ codedmart joined	13:15
_ikke_	the edges are the references to the parent(s) of commits	13:15
e	anyway, the point i suppose is that there is a set of commits, but it depends only on where the branch points	13:16
	commits don't know which branch they "belong to"	13:16
	Somelauw: it varies. i rebase all the time	13:16
	cousteau tries to read § "Storage" and gets discomforted by the UML-like charts... let's see if § "History" is friendlier	13:16
e	some people hate merge commits (which are the alternative, generally speaking) and some people for some reason really like them	13:16
tobiasvl	Rico: what does "git rev-parse HEAD" say inside the bare repo?	13:16
	→ gpkfr joined	13:17
	← sophiag left	13:17
cousteau	e: thanks, I somehow was expecting that when I made the branch "change this", it'd somewhat be a "group of related commits"	13:17
Rico	tobiasvl: http://fpaste.scsys.co.uk/551999	13:17
	← santagada left	13:18
	miczac\away → miczac	13:18
tobiasvl	Rico: that doesn't seem right. that's, like, an infinite loop. what about "git rev-prase 13.9.1-ambe-edmr"	13:19
Rico	d0fa05b9e0af303c94b9064da0782a6932d4bcac	13:20
	← marcogmonteiro left	13:20
Rico	tobiasvl: ^	13:20
tobiasvl	Rico: oof, sorry. "git symbolic-ref HEAD refs/heads/13.9.1-ambe-edmr"	13:20
	should work. I had refs/head instead of refs/heads.	13:21
	→ CheckDavid joined	13:21
cousteau	I had seen git tree charts that used different colors for different ramifications. I thought that represented different branches, but I guess that was actually different authors.	13:21
	← Gloomy left	13:21
e	you can visualise a concept a bit like branches	13:22
Rico	tobiasvl: thank you ! can you explain me what was wrong / what I did wrong ?	13:22
	→ jameser joined	13:22
tobiasvl	Rico: by default, HEAD points to master, at least it seems like it from man git-symbolic-ref. you do not have a master branch, so you had to tell git that you had your own, non-standard default branch	13:25
gitinfo	Rico: the git-symbolic-ref manpage is available at http://jk.gs/git-symbolic-ref.html	13:25
	→ Gloomy joined	13:25
Rico	tobiasvl: so a "git clone [email@hidden.address] -b 13.9.1-ambe-edmr" would have work ?	13:26
	→ mozzarel1 joined	13:26
Rico	(not sure about the "would have work" ...)	13:26
	→ puff` joined	13:27
tobiasvl	Rico: that would probably have worked (but is cumbersome to do every time someone wants to clone)	13:28
	→ venmx joined	13:28
Rico	ok	13:28
	thank you	13:28
	→ ronskisika joined	13:28
	← IntruderSRB left	13:29
	→ jtfidje joined	13:29
	→ boshhead_ joined	13:29
	→ tanuki_ joined	13:30
	→ Jan- joined	13:30
	→ BinGOs_ joined	13:30
	→ Renter_ joined	13:30
	→ milki_ joined	13:30
	→ hegge joined	13:30
	→ vals_ joined	13:30
	→ arand_ joined	13:30
	→ gusnan_ joined	13:30
	→ maxb_ joined	13:30
	→ timewalk1r joined	13:30
	→ GodGinra1 joined	13:30
	→ RichiH_ joined	13:30
	→ jj-_ joined	13:30
	→ Ariadeno joined	13:30
	→ Ramen_ joined	13:30
	→ DistantS1ar joined	13:30
	→ Gaga joined	13:30
	→ CEnnis91 joined	13:30
	→ ec\_ joined	13:31
	→ tier2villain_ joined	13:31
	→ INSANU_ joined	13:31
	→ tazle__ joined	13:31
	→ KMaia2 joined	13:31
	→ mikap joined	13:31
	→ chll__ joined	13:31
	→ beuker_ joined	13:31
	← timewalk1r left	13:31
	→ timewalk1r joined	13:31
	← timewalk1r left	13:32
	→ GT4066 joined	13:32
	← Ramen left	13:32
	← tazle_ left	13:32
	← Juri_Agarin left	13:32
	← KekSi left	13:32
	← maxb left	13:32
	← covey left	13:32
	← danielmahon left	13:32
	← arunpyasi left	13:32
	← SCHAAP137 left	13:32
	→ timewalk1r joined	13:32
	← JeroenT left	13:32
	← mozzarella left	13:32
	← Karazhan left	13:32
	← Nilesh_ left	13:32
	← tanuki left	13:32
	← chll_ left	13:32
	→ imMute joined	13:32
	← GodGinrai left	13:32
	← beuker left	13:32
	→ arunpyasi joined	13:32
	→ ajpiano_ joined	13:32
	← imMute left	13:32
	→ imMute joined	13:32
	mikap → mika	13:32
	mozzarel1 → mozzarella	13:32
	→ PasiFist_ joined	13:32
	→ hide joined	13:32
	→ parasite_ joined	13:32
	→ ollien joined	13:32
	→ Jupelius_ joined	13:32
	→ ngladitz joined	13:32
	← ngladitz left	13:32
	→ ngladitz joined	13:32
	← Snugglebash left	13:32
	← venmx left	13:32
	→ Karazhan joined	13:32
	→ cwillu_at_work joined	13:32
	→ madknight joined	13:32
	→ rt joined	13:33
	→ Snugglebash joined	13:33
	→ ddavidd joined	13:34
	→ jeffreylevesque joined	13:34
	→ JeroenT joined	13:34
	→ Perspicaciosity joined	13:35
	→ tonyj joined	13:35
	← Ranhir left	13:35
	→ ismithers joined	13:36
	← Raging_Hog left	13:36
	→ Ranhir joined	13:36
	→ esc joined	13:37
	→ rajat joined	13:37
	→ marcogmonteiro joined	13:38
	→ Impaloo joined	13:41
	← qt-x left	13:41
	→ SCHAAP137 joined	13:42
	→ pur3eval joined	13:44
	→ vivuroy joined	13:45
	→ MattMaker joined	13:47
	← pur3eval left	13:48
	← timewalk1r left	13:49
	← BinGOs_ left	13:49
	→ timewalker joined	13:49
	← vivuroy left	13:49
	→ BinGOs joined	13:50
	← MattMaker left	13:51
	→ IntruderSRB joined	13:51
	← plasticle left	13:52
	← jfr left	13:52
	→ jfr joined	13:54
	← dikiaap left	13:55
	→ mizu_no_oto joined	13:55
	→ skered joined	13:57
	← overlord_tm left	13:58
	← alexandre9099 left	14:00
	→ vivuroy joined	14:00
	→ alexandre9099 joined	14:00
	← theoceaniscool left	14:01
	→ BSab joined	14:01
	→ algun_ joined	14:01
	← finalbeta left	14:01
	→ _xor joined	14:02
	→ finalbeta joined	14:02
	→ theoceaniscool joined	14:02
	← BSab left	14:02
	← rajat left	14:03
	→ nickabbey joined	14:03
	→ BSab joined	14:03
	→ Eryn_1983_FL joined	14:04
	← BSAlb left	14:05
	→ Joel joined	14:05
Joel	does anyone know of/have a link to/thoughts on - how to handle a change log in git? it's like a non stop conflict factory	14:05
	← ubuntu_ left	14:06
	→ cdg joined	14:06
	→ raijin joined	14:06
	← gpkfr left	14:06
	→ averell joined	14:06
	← cdg left	14:06
	→ plasticle joined	14:07
	← Taikibansei left	14:07
	→ cdg joined	14:07
	→ masuberu joined	14:07
	← tsdev left	14:08
	← cdg left	14:08
	← cdown left	14:08
	→ tsdev joined	14:08
	→ Taikibansei joined	14:08
	→ ubuntu joined	14:08
	→ cdg joined	14:08
	→ gpkfr joined	14:08
	ubuntu → Guest79609	14:09
	→ jameser_ joined	14:09
	gitinfo set mode: +v	14:10
	← jameser left	14:12
	RichiH_ → RichiH	14:15
	→ qqx joined	14:15
	← Snugglebash left	14:17
	→ xall joined	14:17
	← raijin left	14:18
	→ raijin joined	14:18
	→ WayToDoor joined	14:20
	← _xor left	14:20
	→ ikelso joined	14:20
	← INSANU_ left	14:20
	← cdg left	14:20
	→ Snugglebash joined	14:20
	→ cdg joined	14:21
	← raijin left	14:21
	→ raijin joined	14:21
	→ cdg_ joined	14:22
	← Wulf left	14:22
	← raijin left	14:22
	← ddavidd left	14:22
	→ ddavidd joined	14:22
	← ddavidd left	14:22
	→ ddavidd joined	14:22
	← WayToDoor left	14:22
	→ raijin joined	14:22
	← raijin left	14:23
	→ raijin joined	14:23
	← cdg_ left	14:23
	→ basdb joined	14:23
	→ ShekharReddy joined	14:25
	← cdg left	14:26
	← raijin left	14:26
	→ reliability joined	14:26
	→ raijin joined	14:26
	→ cdg joined	14:27
HedgeMage	Joel: Most of my projects do the Changelog at release time, rather than per commit, and generate it from commit messages between that release and the previous (with a chance for human to edit)	14:27
	→ cdg_ joined	14:28
HedgeMage	Joel: Of course, this means that if your team writes shitty commit messages, you have to cane them until they cooperate.	14:28
	← IntruderSRB left	14:28
	← gpkfr left	14:28
	→ venmx joined	14:28
	← marcogmonteiro left	14:28
	← basdb left	14:28
	→ mischat_ joined	14:29
skered	When merging from another branch that has N number of commits does git rollup all those commits on the merge or would you see N number of extra commits when looking at the log?	14:29
	← mischat_ left	14:29
_ikke_	skered: git just creates a new commit tying both branches together	14:30
	← mizu_no_oto left	14:30
Joel	HedgeMage, either way you have to deal with shitty commit messages :)	14:30
	→ mischat_ joined	14:30
	← raijin left	14:30
	→ raijin joined	14:30
Joel	generating was what I was looking at, wasn't sure if there some magical other way people have come up with	14:31
	← cdg left	14:31
	← wrouesnel1 left	14:32
	← Taikibansei left	14:33
	← mischat left	14:33
	← raijin left	14:33
	→ sbeller joined	14:33
	→ raijin joined	14:33
	← venmx left	14:34
	← mischat_ left	14:34
HedgeMage	Joel: Other projects I've been on have tried other methods, but nothing that's excited me, especially since you always end up having to human-edit before release anyhow: the important bit is not missing anything you might want to include or should be telling users about.	14:34
	→ chipotle joined	14:34
	→ mischat joined	14:34
	→ Wulf joined	14:35
Joel	HedgeMage, Yeah, I have a group of dev's who don't understand the difference between an internal changelog, and an external changelog. They scream against automating it, but it doesn't go public. I think public facing should be made by hand off of tickets. They also want one entry per commit, which is funny, because git already has a pretty list...	14:35
	← ShekharReddy left	14:35
	← Gloomy left	14:35
	HedgeMage facepalms.	14:36
	→ gpkfr joined	14:36
HedgeMage	Your internal changelog should be "git log" ....if that isn't working for you, your devteam needs training in how to handle commit messages.	14:36
	→ ResidentBiscuit joined	14:36
Joel	"Yeah but people don't write good commit messages!" - and you think they will do a better job when they duplicate it into a changelog?	14:36
	← Murrito left	14:36
HedgeMage	So, this is where I say something horrible and politically incorrect and mean.	14:37
	→ Murr joined	14:37
	→ wrouesnel1 joined	14:37
_ikke_	HedgeMage: Usually a commit log is a bit higher level than each commit message	14:37
Joel	what's a commit log?	14:37
	^not a troll question, seriously, do you mean change log?	14:38
_ikke_	yes. I meant a change log	14:38
Joel	_ikke_, when externally facing, I agree, an internal log for other dev's to follow though?	14:38
	I think for higher level that's why you include an issue #.	14:38
	← raijin left	14:38
HedgeMage	When the lead dev and/or software security lead (my usual roles) is a cute but slightly scary 34yo female hacker with a tendency to thwart people with things like pre-receive hooks that reject commits that are >10% profanity, or >5% punctuation, or < 3 words... people tend to behave eventually.	14:39
	→ raijin joined	14:39
	→ thethorongil joined	14:39
	← mindfart left	14:39
	← armyriad left	14:40
HedgeMage	"this commit is not tagged as a security patch and lacks a reference to our public issue tracker, cannot accept"	14:40
	→ armyriad joined	14:40
_ikke_	Well, the log is as usefull as its commit messages	14:40
HedgeMage	Joel: If you can train them to write in the changelog like grownups, you can train them to write commit messages like grownups.	14:41
	→ Derperpe1 joined	14:41
HedgeMage	Starting by showing them that you are reducing their workload through automation is a good thing.	14:41
reliability	Hi. Why does git-flow suggest deleting release branches? What about fixes that need to be backported to older releases?	14:41
	← nettoweb left	14:42
	→ nettoweb1 joined	14:42
	→ IntruderSRB joined	14:42
_ikke_	reliability: That's what you have tags for	14:42
	→ Gsham joined	14:42
	→ thorongil joined	14:42
	← thorongil left	14:42
_ikke_	You can just create a new branch starting from a specific tag	14:42
	← eroux left	14:43
Joel	people can put crap onto a branch that's never been released	14:43
	another good reason to use tags	14:43
_ikke_	right	14:43
	That's why I never understood svn's tag model	14:44
	← raijin left	14:44
	→ elsevero_ joined	14:44
	→ F0rTh3J3st_ joined	14:44
	→ Murrito joined	14:44
	→ tsdev_ joined	14:44
	→ pur3eval joined	14:44
	→ JanC_ joined	14:45
	→ marcogmonteiro joined	14:45
reliability	_ikke_, Joel: true, thanks for your answers.	14:45
	← tsdev left	14:45
	← elsevero left	14:45
	← F0rTh3J3st left	14:45
	← mikecmpbll left	14:45
	← nikivi left	14:45
	elsevero_ → elsevero	14:45
	→ mikecmpb_ joined	14:45
	→ canuk joined	14:45
	← JanC left	14:46
	→ eroux joined	14:46
	→ ugglan joined	14:46
	← Derperpe1 left	14:46
	→ Tanfrieze joined	14:46
	JanC_ → JanC	14:46
	← Murr left	14:47
	→ SporkWitch joined	14:48
	→ nikivi joined	14:48
	→ MuffinMedic joined	14:48
	→ daynaskully joined	14:48
	← Joel left	14:48
	← pur3eval left	14:49
	→ mizu_no_oto joined	14:50
	→ cdown joined	14:50
	← plos left	14:50
	→ reynierpm joined	14:50
reynierpm	hi there, let's suppose I am on a branch "branch1" and I want to checkout a file from "branch2" the right way to do it is git checkout branch2 path/to/file.ext, if I want to checkout all the file under /path/to the right command should be git checkout branch2 path/to/* ??	14:51
	← jameser_ left	14:52
	→ shinnya joined	14:53
	→ jimi_ joined	14:53
_ikke_	reynierpm: no need for an asterisk	14:53
reynierpm	_ikke_, good thx	14:54
_ikke_	reynierpm: checking out a directory equals to checking out all the files in there (recursively)	14:54
	→ dcy joined	14:54
	← gpkfr left	14:54
	→ Dougie187 joined	14:54
	← skered left	14:55
	→ Gloomy joined	14:57
	→ rgrinberg joined	14:57
	→ Intruder_ joined	14:58
reynierpm	_ikke_, ummm I am doing something wrong: `git checkout esd /application/views/scripts/company/` ==> "fatal: ambiguous argument 'esd': both revision and filename Use '--' to separate paths from revisions"	14:58
	← rscata left	14:58
_ikke_	git checkout esd -- /application/..	14:59
	← Snugglebash left	14:59
	← dec0n left	14:59
reynierpm	_ikke_, is complaining about the path it says doesn't exists how do I find the right path?	14:59
	→ mischat_ joined	15:00
_ikke_	reynierpm: git ls-tree -r esd	15:00
	← IntruderSRB left	15:00
	→ mohabaks joined	15:00
	← mischat_ left	15:00
	→ skered joined	15:00
	→ ocbtec joined	15:00
	← cousteau left	15:00
	→ noecc joined	15:01
	→ mischat_ joined	15:01
	→ uwe joined	15:01
	→ e14 joined	15:01
	← miczac left	15:02
	← marcogmonteiro left	15:03
	gitinfo set mode: +v	15:03
	gitinfo set mode: +v	15:03
reynierpm	_ikke_, thx it works	15:03
uwe	greetings, I'm seeking advise on getting code that has not been maintained in git in sync with a vanilla version of that software (roundcube) ... my question is very generic, and maybe this is the wrong place to ask, so please enlighten me	15:03
	← mischat left	15:03
	← Intruder_ left	15:05
	→ miczac\away joined	15:06
	← ismithers left	15:06
	gitinfo set mode: +v	15:07
	miczac\away → miczac	15:07
	→ btyne79 joined	15:07
	→ IntruderSRB joined	15:07
	← ferr1 left	15:07
_ikke_	uwe: not maintained in what sense?	15:08
	→ LeBlaaanc joined	15:09
	→ marcogmonteiro joined	15:10
	→ AaronMT joined	15:10
	← masuberu left	15:10
	← xissburg left	15:11
	← mohabaks left	15:12
	→ _ADN_ joined	15:13
	← d1z left	15:15
	→ xissburg joined	15:16
	← Remramm left	15:17
	→ Remramm joined	15:17
	← Remramm left	15:17
	→ Remramm joined	15:17
	← str left	15:17
	← sbulage left	15:18
	→ dendazen joined	15:18
	← IntruderSRB left	15:18
	→ IntruderSRB joined	15:18
	← jj-_ left	15:19
	→ str joined	15:20
	← mischat_ left	15:20
	→ mischat joined	15:20
	← IntruderSRB left	15:22
uwe	_ikke_: i mean was not in any versioning system	15:23
	→ King_Hual joined	15:23
	← dcy left	15:23
	← Dumblez0r left	15:23
	→ sostenuto joined	15:24
	→ IntruderSRB joined	15:25
	← mizu_no_oto left	15:25
uwe	i.e.; I imagine something along the lines of finding the closest version by looking up version or date, then fetch the whole code, and roll back to that version, fork, add the new code, and go one commit at a time checking the changes with vanilla somehow getting the changes from there to the fork until I'm at head ... then try to encapsulate those changes in lets say a skin or module if possible ...	15:27
	→ staafl joined	15:27
staafl	Does the recursive merge strategy consider intermediate commits or is it just base/ours/theirs?	15:28
	→ Tobbi joined	15:28
	→ jj- joined	15:28
qqx	staafl: Just base/ours/theirs.	15:28
	→ ToBeCloud joined	15:28
	gitinfo set mode: +v	15:28
	← Gravious left	15:29
staafl	qqx, doesn't sound very recursive to me :-)	15:29
	→ dikiaap joined	15:29
qqx	It's recursive with respect to the trees being merged, not history.	15:29
moritz	it's job isn't to sound recursive :-)	15:30
	→ axilaris joined	15:30
axilaris	hi.... anyone can tell me how to force a merge from master to a branch ?	15:30
moritz	axilaris: git checkout yourbranch; git merge --no-ff master	15:31
axilaris	master overwrites everything on the branch	15:31
	ok thanks @moritz	15:31
moritz	axilaris: that doesn't override; it just merges	15:31
axilaris	how can i override ?	15:31
	← jagob left	15:31
kba	So this seems to hapen quite often. I have two branches, master and devel. They were both at commit X. Then I create a commit on devel Y and push it. Now the branch is at Y.	15:31
moritz	axilaris: why not just start a new branch?	15:32
	→ Noldorin joined	15:32
kba	Then I switch to master, chery-pick Y and push Y, but now master is at Z.	15:32
	→ d1z joined	15:32
axilaris	i prefer to maintain this branch for the customer	15:32
kba	master and devel were both at X. I pushed Y to both of them. Now they're not on the same commit. What's happening?	15:32
	https://github.com/Webstrates/Webstrates/commits/devel and https://github.com/Webstrates/Webstrates/commits/master	15:33
axilaris	otherwise its confusing, so much has been done on master, i dont care the merge, just want to override master to the branch and make the config changes	15:33
kba	Why is that happening?	15:33
	Does that make sense? Am I misunderstanding something?	15:34
	→ vibhavp joined	15:34
axilaris	@moritz you know how to do the override ?	15:34
	← miczac left	15:34
	→ miczac joined	15:35
	← KMaia2 left	15:35
jast	kba: cherry-picking copies commits and, in the process, creates a new committer/commit time entry, so the resulting commit ID is different even if the diff is exactly identical	15:35
axilaris	git checkout dev_branch, git reset --hard master ?	15:35
	gitinfo set mode: +v	15:35
	→ Gravious joined	15:35
kba	jast: I see! So what's the correct way to do it?	15:35
	If I don't want the branches to diverge	15:35
moritz	kba: merge	15:35
jast	kba: well, if both branches were identical before, you can use 'git merge'	15:36
	merge will automatically 'fast forward' (make the branch identical) the target branch is still at the base version	15:36
moritz	axilaris: after a git reset, you have to push with --force, which won't preserve history	15:36
jast	*if the target branch	15:36
moritz	axilaris: so that's basically the same as deleting the branch, and starting a new branch with the same name as before	15:37
axilaris	@moritz oh thats not good	15:37
	→ djh joined	15:37
kba	Won't that create an ugly commit with "Merge branch" commit message?	15:37
	Or can I just change that to the other commit messages, and both branches will look identical again?	15:37
jast	that's if the target branch has had new commits in the meantime	15:37
kba	Ah, otherwise not? Great	15:37
jast	if you're not sure, you can use --ff-only to make it abort if fast-forwarding is impossible	15:37
moritz	axilaris: you can git checkout otherbranch; git checkout master .; git commit -m 'bring files to the state of the master branch' # or something along those lines	15:38
kba	That's perfect! Thanks, moritz and jast	15:38
	→ gugah joined	15:38
jast	anyway, now that you've already pushed the cherry-picked commit, the only way to get the two branches identical again is to rewrite history, using force push	15:38
	← gugah left	15:38
moritz	or to merge them, and have the nearly identical commits twice in the history	15:38
	← al-damiri left	15:38
jast	technically you can get them identical using a merge commit, but I got the impression you'd rather avoid that	15:38
	→ gugah joined	15:38
	→ patarr joined	15:39
	← Electrometro left	15:39
	← IntruderSRB left	15:41
	→ IntruderSRB joined	15:42
	← Gravious left	15:43
	← Gloomy left	15:45
	→ mischat_ joined	15:45
	→ pur3eval joined	15:45
	← mischat_ left	15:46
	→ mischat_ joined	15:46
	← mischat left	15:46
	→ TheDcoder joined	15:47
	← cdown left	15:47
TheDcoder	Hi, how do I sign existing commits and tags?	15:47
	→ MattMaker joined	15:47
	→ cdown joined	15:47
	← pur3eval left	15:50
	← elsevero left	15:50
	→ shgysk8zer0_ joined	15:51
	← e14 left	15:51
	← MattMaker left	15:52
moritz	TheDcoder: if it happens to be the newest commit, and not yet pushed, probably with git commit --amend	15:53
	git commit --amed --gpg-sign	15:53
TheDcoder	no, its neither the newest nor un-pushed	15:53
	actually, I was planning to sign ALL of my commits	15:54
moritz	TheDcoder: then signing amounts to rewriting history, afaict	15:54
	→ Murii joined	15:54
moritz	somebody please correct me if I'm wrong	15:54
	→ dreiss joined	15:54
morfin	when unreachable nodes are removed?	15:55
TheDcoder	hmm...	15:55
morfin	only when you manually start gc?	15:55
	← redeemed left	15:55
_ikke_	morfin: unreferenced objects are not removed before 14 days, and the reflog keeps a reference for 90 days	15:55
	morfin: some git commands automatically run gc	15:55
	→ Gravious joined	15:55
	← peeps[lappy] left	15:58
	← IntruderSRB left	15:58
	→ gpkfr joined	15:58
morfin	hmm	15:59
	→ mischat joined	16:00
	← gpkfr left	16:00
	← TheDcoder left	16:00
_ikke_	TheDcoder: Note that signing each commit has not much added benefit than signing a tag	16:01
	→ gpkfr joined	16:01
	← gpkfr left	16:01
	← lb1c left	16:02
	→ gpkfr joined	16:02
	← gpkfr left	16:02
	← rewt left	16:02
	→ rewt`` joined	16:02
	rewt`` → rewt	16:03
	← mischat_ left	16:03
	→ gpkfr joined	16:03
	← gpkfr left	16:03
timvisher	is there any way to disable a remote for fetch/push purposes but to keep it for historical reference?	16:04
	→ Snugglebash joined	16:04
	← Snugglebash left	16:04
perlpilot	timvisher: you could rename it so that it's not easy to use.	16:05
	→ lss8 joined	16:06
	← lss8 left	16:06
	→ lss8 joined	16:06
	← inflames left	16:06
BlessJah	_ikke_: no benefit from end-user perspective, there are certain scenarios though where you might not want to truct code you downloaded from server unless signed	16:06
	→ gpkfr joined	16:07
	→ amagawdd joined	16:07
BlessJah	timvisher: remotes are tied to particular clone (i.e. it exists only on your hard drive)	16:07
	← j7k6 left	16:07
morfin	i created second commit, reset --hard, then changed file, commited again and checked reflog	16:08
BlessJah	timvisher: you might go to $REPOSITORY/.git/config and comment-out certain lines, it's pointless though - it's better to keep such information somwhere under doc/ if it's important	16:08
	← Murii left	16:08
	← thethorongil left	16:09
morfin	it was looking like Initial -> second -> reset: moving to HEAD~1 -> third(which is second again)	16:09
	← mischat left	16:10
_ikke_	BlessJah: If the tag is signed, it covers the commits	16:10
	→ Murii joined	16:10
	→ mischat joined	16:10
BlessJah	_ikke_: are you sure that tag~ is ok to be signed? :>	16:11
	← ThomasLocke left	16:11
	boshhead_ → boshhead	16:11
	← gugah left	16:12
	→ Peetz0r joined	16:12
	← bvtton left	16:12
_ikke_	ok in what sense?	16:12
	→ zivester joined	16:13
	← btyne79 left	16:13
	← JeroenT left	16:14
	→ Derperpe1 joined	16:15
	vals_ → tango_	16:15
	← inbx left	16:16
	→ tribly joined	16:16
BlessJah	_ikke_: malicious root user, some lines slipped in during rebase, server-side merges or rebases, "please apply this patch" sociotechnic	16:17
	→ raijin joined	16:18
	→ Raed\|Mobile joined	16:19
	→ mrVandermare joined	16:20
_ikke_	BlessJah: Then a signed commit is not going to help you too	16:20
	At least, not going to guarantee that something has slipped in	16:20
	→ dcy joined	16:20
_ikke_	has not*	16:20
	← uwe left	16:21
	→ Nilesh_ joined	16:21
	← ronskisika left	16:21
_ikke_	rebases necessitate resigning of commits, and I doubt everyone is examining what they sign closely	16:21
	→ IntruderSRB joined	16:21
	← gpkfr left	16:22
BlessJah	yeah, rebase isn't best example	16:22
_ikke_	a gpg signature means that the commit came from someone, not that what they signed is benign	16:23
	← lordjancso left	16:23
	← Rr4sT left	16:23
	→ clemf joined	16:23
	← diogenese left	16:24
BlessJah	but root won't sign a commit and victim of soctiotechnic cannot deny he/she applied the patch	16:24
_ikke_	(even if someone examines what they sign properly, the signature does not capture that	16:24
	)	16:24
	→ jagob joined	16:24
	← IntruderSRB left	16:26
	→ thiago joined	16:26
	→ inbx joined	16:26
	← marcogmonteiro left	16:28
	→ troulouliou_div2 joined	16:28
	→ mgver joined	16:28
	← xall left	16:29
	→ inbx_ joined	16:29
	← Peetz0r left	16:29
	→ venmx joined	16:29
	→ jimklo joined	16:30
	← raijin left	16:30
	← inbx_ left	16:31
	→ ShekharReddy joined	16:31
	→ Peetz0r joined	16:32
	→ diogenese joined	16:32
	→ Endorphine joined	16:32
	← inbx left	16:32
	→ marcogmonteiro joined	16:33
	→ Glooomy joined	16:33
	→ raijin joined	16:33
	← Murii left	16:34
	← venmx left	16:34
	→ Murii joined	16:34
	← Endorphine left	16:35
	← Tobbi left	16:36
	→ kavilraj joined	16:37
	← Darcidride left	16:37
	→ IntruderSRB joined	16:38
	← rivarun left	16:39
	→ rivarun joined	16:39
	← ocbtec left	16:39
	→ inbx_ joined	16:40
	← basiclaser left	16:40
	← troulouliou_div2 left	16:41
	→ jnewt1 joined	16:41
	← eroux left	16:41
	→ crose joined	16:42
	← Peetz0r left	16:42
	→ Ryanar joined	16:42
	← Balliad left	16:43
	← jnewt1 left	16:43
	→ brent__ joined	16:43
	← Murii left	16:45
	→ Murii joined	16:45
	→ Peetz0r joined	16:45
	→ flashpoint9 joined	16:45
	→ vuoto joined	16:46
	← ShekharReddy left	16:46
mgver	how to create/restore backup from Gitlab?	16:46
	→ robattila256 joined	16:46
	→ pur3eval joined	16:46
flashpoint9	mgver: https://docs.gitlab.com/omnibus/settings/backups.html	16:47
	← flashpoint9 left	16:47
_ikke_	whow	16:48
	Did flashpoint9 join just to answer that?	16:48
	→ sofly joined	16:49
mgver	maybe haha	16:49
	→ Electrometro joined	16:49
	← Somelauw left	16:50
	← pur3eval left	16:51
	← Electrometro left	16:51
mgver	but still not understand	16:52
	→ Ozymandy joined	16:52
mgver	All configuration for omnibus-gitlab is stored in /etc/gitlab. To backup your configuration, just backup this directory.	16:52
	where are those files	16:52
	→ Electrometro joined	16:53
	← Electrometro left	16:54
	→ lmclinskey joined	16:55
	← jason237 left	16:55
	← Murii left	16:55
	→ xall joined	16:55
	→ sbulage joined	16:56
	→ Murii joined	16:56
	← IndigoTiger left	16:57
	← kristofferR left	16:57
	← lmclinskey left	16:58
	→ Tobbi joined	16:59
	→ EricPoe joined	16:59
	← xissburg left	16:59
	← EricPoe left	17:00
mgver	how to access /etc/gitlab folder in windows?	17:00
	by cmd?	17:00
	or gitlab.com ?	17:00
	← clemf left	17:00
	→ svm_invictvs joined	17:00
	→ clemf joined	17:01
	← jnavila left	17:01
	← lss8 left	17:01
	← ihradek left	17:01
_ikke_	You have to login to that server	17:02
	ssh probly	17:02
	← newbie1 left	17:02
_ikke_	probably	17:02
	→ newbie1 joined	17:03
	← xall left	17:03
	→ madewokherd joined	17:03
	→ IndigoTiger joined	17:05
	← geoid_ left	17:06
	→ Jellyg00se joined	17:08
	← reliability left	17:08
	→ Darcidride joined	17:09
	→ Snugglebash joined	17:10
	← sbeller left	17:11
	← Serpent7776 left	17:11
	→ Motoko joined	17:13
	← dRealm left	17:14
	← vibhavp left	17:14
	← raijin left	17:14
	← axilaris left	17:14
	← thiago left	17:16
	← Peetz0r left	17:18
	← MineCoins left	17:19
	← Anticom left	17:19
	← Murii left	17:19
	→ KMaia2 joined	17:19
	← IntruderSRB left	17:19
	→ clemf_ joined	17:20
	→ Murii joined	17:20
	← clemf left	17:20
	← Murii left	17:20
	→ Murii joined	17:20
	← chele left	17:22
	→ reconx86_ joined	17:22
	← crose left	17:25
	← reconx86 left	17:25
	→ NaN joined	17:26
	← duderonomy left	17:26
NaN	what will happen if I do a rebase in my branch that someone has already merged into their own?	17:27
	→ jstimm joined	17:27
NaN	I want to do a clean merge from my branch (not clean, lots of commits) to master	17:28
Phil-Work	NaN, not a lot	17:28
	if/when they merge/rebase it'll dedup	17:29
	might get some conflicts if you have to change the commits you're rebasing to resolve conflicts	17:29
	→ bennigraf_ joined	17:29
	← theoceaniscool left	17:29
	← marcogmonteiro left	17:30
	→ venmx joined	17:30
	← ToBeCloud left	17:31
	→ Peetz0r joined	17:31
	← Murii left	17:31
NaN	so my coworker will have conflicts if I do a rebase to clean my branch?	17:31
	what about if I do a new branch, clean it an merge with master?	17:31
	→ Murii joined	17:31
	→ btree joined	17:32
	→ BSAlb joined	17:32
	→ marcogmonteiro joined	17:32
	← mikecmpb_ left	17:32
	→ MineCoins joined	17:32
	← Murii left	17:32
	→ Murii joined	17:32
	← BSAlb left	17:33
	→ BSAlb joined	17:33
	→ Naan joined	17:33
	← Kaisyu left	17:34
	ajpiano_ → ajpiano	17:35
	← BSab left	17:35
	→ xissburg joined	17:36
	← sbulage left	17:37
	→ jost__ joined	17:37
	← Peetz0r left	17:37
	← shinnya left	17:38
	← danemacmillan left	17:38
	→ durham joined	17:39
	← jost_ left	17:39
	← venmx left	17:40
	← Snugglebash left	17:41
	→ hahuang65 joined	17:41
	→ Guest85 joined	17:43
	→ Peetz0r joined	17:43
	← Murii left	17:44
	→ Murii joined	17:44
	→ nixjdm joined	17:44
	← Murii left	17:45
	← xissburg left	17:45
	→ Murii joined	17:45
	→ xissburg joined	17:46
	← Derperpe1 left	17:46
	← rgrinberg left	17:46
	→ pur3eval joined	17:47
	← kavilraj left	17:47
	← chipotle left	17:48
	← mischat left	17:48
	→ MattMaker joined	17:48
	← Tobbi left	17:48
	→ mischat joined	17:49
NaN	squach or rebase to master?	17:49
	← pur3eval left	17:51
	→ danemacmillan joined	17:51
	→ dviola joined	17:53
	← MattMaker left	17:53
	→ robotroll joined	17:54
	→ thiago joined	17:54
	← mischat left	17:54
	← King_Hual left	17:54
	← dsantiago left	17:55
	← apotry left	17:55
	← Murii left	17:55
	→ Murii joined	17:56
	← Murii left	17:56
	→ gugah joined	17:57
	← gugah left	17:57
	→ Murii joined	17:58
	→ tyreld joined	17:58
	→ rgrinberg joined	17:58
	← dcy left	17:58
	→ King_Hual joined	17:59
	← King_Hual left	17:59
	→ King_Hual joined	17:59
	→ kristofferR joined	17:59
	← Jellyg00se left	17:59
	← freimatz left	18:00
	→ navidr joined	18:00
	→ publio joined	18:01
	← ikelso left	18:02
	← tristanp left	18:03
	→ j7k6 joined	18:03
	← jstimm left	18:04
	← bennigraf_ left	18:06
	→ sbeller joined	18:07
	← achadwick left	18:07
	← Glooomy left	18:07
	→ j7k6_ joined	18:08
	← mar77i left	18:08
	→ Glooomy joined	18:08
	→ jnavila joined	18:08
	← Murii left	18:08
	← Glooomy left	18:08
	→ reliability joined	18:08
	← j7k6 left	18:08
	→ Glooomy joined	18:08
	→ Murii joined	18:09
	← Glooomy left	18:09
	→ Levex joined	18:09
	→ Glooomy joined	18:09
	← orzo left	18:09
	← Glooomy left	18:09
	→ Glooomy joined	18:10
	← Glooomy left	18:10
	→ Glooomy joined	18:11
	← Glooomy left	18:11
	→ jstimm joined	18:13
	→ Brain joined	18:14
	→ ratdeptrai joined	18:14
	← khisanth_ left	18:15
	→ orzo joined	18:17
	← danemacmillan left	18:18
	→ bennigraf_ joined	18:18
	→ tang^ joined	18:19
	→ danemacmillan joined	18:19
	→ g105b joined	18:19
	→ inbx__ joined	18:20
	← inbx__ left	18:20
	→ mda1_ joined	18:20
	← brent__ left	18:21
	← flaviodesousa left	18:21
	→ gugah joined	18:22
	← gugah left	18:22
	← mda1 left	18:22
	← inbx_ left	18:23
	→ boombatower joined	18:23
	← Murii left	18:24
	← sbeller left	18:24
	→ xissburg_ joined	18:24
	→ sbeller joined	18:24
	→ Murii joined	18:24
	← _ADN_ left	18:25
	→ overlord_tm joined	18:25
	← xissburg left	18:25
	← matoro left	18:26
	← ChiLL_SurF left	18:26
	→ MattMaker joined	18:27
	→ inbx__ joined	18:27
	→ xissburg joined	18:29
	← xissburg_ left	18:29
	← Nilesh_ left	18:29
	← inbx__ left	18:29
	→ brent__ joined	18:31
	← dreiss left	18:32
	→ zzz joined	18:33
	→ jason237 joined	18:33
	→ duderonomy joined	18:34
	← bongjovi left	18:34
	→ j7k6 joined	18:34
	→ satifant joined	18:35
	→ mar77i joined	18:36
	← j7k6_ left	18:37
	→ chardan joined	18:37
	→ matoro joined	18:37
	→ theoceaniscool joined	18:40
	→ joshszep joined	18:41
	← chardan left	18:41
	← jstimm left	18:42
	→ fcas joined	18:42
	→ mohabaks joined	18:43
	→ chardan joined	18:43
	→ eroux joined	18:43
	← Murii left	18:44
	→ baastrup joined	18:44
baastrup	hey	18:44
gitinfo	baastrup: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	18:44
	→ Murii joined	18:44
	← bennigraf_ left	18:45
	← e01 left	18:45
baastrup	hey any ideas how to run git push origin from crontab with ssh	18:45
	I need it for a backup job	18:45
	→ e01 joined	18:45
	← e01 left	18:45
	→ e01 joined	18:45
	← e01 left	18:45
baastrup	but the ssh-wont allow it	18:46
	→ raynold joined	18:46
	← HurricaneHarry left	18:46
	→ e01 joined	18:46
	← e01 left	18:46
	→ e01 joined	18:46
	← e01 left	18:46
	← acetakwas left	18:46
	→ e01 joined	18:47
	← e01 left	18:47
	→ e01 joined	18:47
	← e01 left	18:47
	Vampire0_ → Vampire0	18:47
	→ pur3eval joined	18:47
	→ e01 joined	18:48
	← e01 left	18:48
	→ e01 joined	18:48
	← e01 left	18:48
	→ e01 joined	18:48
	← e01 left	18:48
	→ e01 joined	18:48
	← e01 left	18:49
Vampire0	baastrup, What do you mean by "won't allow it"? I guess authentication fails which is most probably because the cron job is run as root while your SSH key is in your user configuration. Either let the cron job run as your user, or use `sudo -u youruser command` or `su -c command youruser` or specify the identity file (key for authentication) exlpicitly, e. g. by using SSH config files.	18:49
	→ e01 joined	18:49
	← e01 left	18:49
	→ e01 joined	18:49
	← e01 left	18:49
	→ kasual joined	18:51
	→ vdv joined	18:51
	→ flavius joined	18:52
	← pur3eval left	18:52
	→ dreiss joined	18:54
	← treia left	18:55
	← Murii left	18:56
baastrup	Vampire0: its a user called rancid and it will run in crontab as that user, but still dont work, I think it has something to do with ssh-agent only working in the current terminal	18:56
	→ Murii joined	18:56
raynold	ahh it's a wonderful day	18:58
	← matoro left	18:58
	→ dsantiago joined	18:58
	→ hfkhjgjhgkjhbyug joined	18:59
	← _ng left	19:01
	← chll__ left	19:01
	← mohabaks left	19:01
	← dsantiago left	19:02
	→ gugah joined	19:02
	← Murii left	19:02
	→ jstimm joined	19:03
	→ Murii joined	19:05
	← reynierpm left	19:05
	→ Sasazuka joined	19:06
Vampire0	baastrup, of course, if your key is challenge-protected it cannot work as you cannot unlock the key	19:07
	→ Darren_ joined	19:09
	← Darren_ left	19:09
	← Gravious left	19:09
	← j7k6 left	19:09
	→ Darren_ joined	19:10
	← marcogmonteiro left	19:10
	← robotroll left	19:12
	← jstimm left	19:13
	→ emg joined	19:14
	← fcas left	19:16
	→ fcas joined	19:17
	→ matoro joined	19:17
	→ marc_v92 joined	19:18
	← tsdev_ left	19:18
	← hfkhjgjhgkjhbyug left	19:18
	← btree left	19:20
	→ muldover joined	19:20
	→ jstimm joined	19:21
	← jimi_ left	19:22
	← Raed\|Mobile left	19:22
	← fcas left	19:22
	→ peterR`` joined	19:23
	← theoceaniscool left	19:23
	→ shgysk8zer0__ joined	19:25
	← shgysk8zer0_ left	19:26
cjohnson	baastrup: you would need to figure out what "doesn't allow it " specifically means	19:28
	to solve the issue	19:28
	← bocaneri left	19:28
	→ cdg joined	19:28
	→ efeuska joined	19:29
	→ kst123 joined	19:29
	← Levex left	19:29
	→ Doow joined	19:30
	→ mischat joined	19:30
	← efeuska left	19:30
	← BackEndCoder left	19:30
	← shgysk8zer0__ left	19:31
	→ BackEndCoder joined	19:32
	→ gk-1wm-su joined	19:32
	← cdg_ left	19:32
	← cdg left	19:33
	← NullableTruth left	19:34
	← danemacmillan left	19:35
	→ venmx joined	19:35
	← nettoweb1 left	19:35
	← gk-1wm-su left	19:35
	→ ecuanaso joined	19:35
	→ jstein_ joined	19:36
	← jstein_ left	19:37
	← chardan left	19:37
	→ nettoweb joined	19:37
	→ Vampire0_ joined	19:38
	→ pbrewczynski joined	19:38
	→ crose joined	19:39
	→ sgen joined	19:39
	← Vampire0 left	19:39
	← ash_workz left	19:40
	← mar77i left	19:40
	→ mar77i joined	19:40
	→ nckpz joined	19:42
	← BackEndCoder left	19:42
	→ Levex joined	19:42
	→ reznord joined	19:42
	← LBV_User left	19:42
	→ BackEndCoder joined	19:43
	← scoobertron left	19:43
reznord	hi, I want to make xhr call to the github API so, I can fetch the data of an user from github and render it in my application.	19:43
	How can i do that?	19:43
	→ danemacmillan joined	19:44
	← venmx left	19:44
reznord	when I try to make normal API call, it is throwing me an error saying,	19:44
	https://www.irccloud.com/pastebin/2MnJzIvW/	19:44
	← KMaia2 left	19:44
	→ j7k6 joined	19:44
	→ btyne79 joined	19:45
	→ g0th joined	19:46
g0th	hi	19:46
	how do I revert the commited change on one file so that the push doesn't see anything of it?	19:46
	the rest of the commit is fine	19:46
	← borkr left	19:47
	→ Derperpe1 joined	19:47
	→ solarfly joined	19:48
	→ scoobertron joined	19:48
	→ pur3eval joined	19:48
g0th	or simpler: can I transform a commit back to staged or unstaged?	19:49
	git reset --soft HEAD^ ?	19:49
	→ LiftLeft joined	19:49
	→ e01 joined	19:49
	← e01 left	19:49
	→ e01 joined	19:49
solarfly	Hi! I have a question. I have a branch with a new feature on it that is done and awaiting PR approval. I have a second feature that builds on top of that one. If I base the new feature B off of feature A, what do I do in the B branch when A is finally merged to master? Do I just git merge master into B to update my branch?	19:49
	→ HuskyApocalypse joined	19:49
	Jupelius_ → Jupelius	19:50
	→ shgysk8zer0_ joined	19:50
	→ jnewt joined	19:52
	← pur3eval left	19:53
	→ raijin joined	19:54
	← e01 left	19:54
Eugene	solarfly - how much do you / the project care about the prettiness of the history?	19:54
solarfly	Not much. I was just looking at maybe I can git merge Feature A into my feature B, as long as A gets PR'd into master first, will eveyrthing be clean?	19:55
Eugene	Basically, yes	19:55
	← jstimm left	19:55
Eugene	merging from master back to B before merging B into master(or rebasing B upon new-master) is something that you "can do", but not must	19:56
	If you don't care what the log looks like then just go for it and stop worrying - git will merge things together exactly how it sounds like, and so long as the result works then you're good	19:56
solarfly	So I could merge A into B, work, then A get merged into master, and I can update my branch B with the changes from master to reduce the chance of diverging	19:57
	Yep, don't care what it looks like as long as we can read the logs	19:57
Eugene	If master has diverged by the time you merge B then yes, you'll need to resolve differences	19:57
	This is only an issue if any conflicts have happened - if you're the only one working on a given portion of the repo then it would be darned hard for that to happen....	19:58
	← rgrinberg left	19:58
Eugene	I would go ahead and start B directly from A: eg `git checkout -b B A`	19:59
	If there's anything new in master that B needs then yes, merge it in	19:59
solarfly	I've run into this type of thing repeatedly for years, but decided today I need to try to understand things better. I found https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging and http://stackoverflow.com/questions/8963375/how-does-one-work-on-a-new-git-branch-that-depends-on-another-git-branch-that-is	19:59
	→ IntruderSRB joined	19:59
	→ Balliad joined	19:59
solarfly	Now that I'm a core developer and not managing engineers anymore (first time in 8 years)	20:00
Eugene	!flow is a great read	20:00
gitinfo	[!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	20:00
Eugene	Make up a flowchart that works for your project and stick to it	20:01
solarfly	the team uses some semblence of git-flow. Very loosely defined though; there's feature branching and master. That's about it so far	20:01
reznord	can anyone help me with that?	20:01
Eugene	I think that is just fine for $MADE_UP_PERCENTAGE of users	20:01
	reznord - !github	20:01
gitinfo	reznord: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)	20:01
solarfly	nice :) Thank you for your help Eugene	20:01
	much appreciated	20:02
Eugene	g0th - !fixup	20:02
gitinfo	g0th: 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!	20:02
	→ UrsoBranco joined	20:02
	→ concerti joined	20:02
timvisher	perlpilot, BlessJah: i'm thinking more in terms of `git fetch --all` etc. which i use a lot.	20:03
	→ aidalgol joined	20:03
timvisher	i basically don't want the remote to be considered for pushing or pulling when generic commands are used	20:03
	→ j7k6_ joined	20:04
	← Dougie187 left	20:05
	→ BSab joined	20:05
	→ Guest4891 joined	20:06
	← crose left	20:06
	← Guest4891 left	20:07
	→ Guest4891 joined	20:07
	← Guest4891 left	20:07
	← YuGiOhJCJ left	20:09
	← j7k6_ left	20:09
	→ SwiftMatt joined	20:09
	← BSAlb left	20:09
	← dviola left	20:12
	→ gijga joined	20:14
	← byte512 left	20:15
	← alexandre9099 left	20:17
	← amagawdd left	20:18
	← Darcidride left	20:19
	→ jimi_ joined	20:21
	← marc_v92 left	20:21
	→ marc_v92 joined	20:22
	→ amagawdd joined	20:22
	← austin987 left	20:22
	→ alexandre9099 joined	20:24
	← gijga left	20:24
	→ Sasazuka_ joined	20:27
	← Sasazuka left	20:28
	→ jdl joined	20:28
	← g105b left	20:28
	→ sveinse joined	20:28
sveinse	Is there a way I can update/fetch all new updates, including all new branches, into a bare mirror?	20:30
	← kasual left	20:30
	← finalbeta left	20:31
	← zzz left	20:31
	→ finalbeta joined	20:31
sveinse	I thought git remote update --prune did, but it does not	20:33
	← durham left	20:33
	→ bernardio joined	20:34
	→ guest joined	20:34
	← Levex left	20:35
	← rnsanchez left	20:36
	← bernardio left	20:36
_ikke_	What are you missing?	20:37
sveinse	_ikke_: A new remote branch that have come into existence since the mirror was created	20:38
	I'd like to create a script that can inspect the origin and completely mirror it (that is include all branches and their refs)	20:39
	→ durham joined	20:39
	← ribasushi left	20:39
	← clemf_ left	20:41
	→ Vampire0 joined	20:41
	→ clemf joined	20:41
	← Vampire0_ left	20:41
	→ ilpanda joined	20:42
	← BackEndCoder left	20:43
sveinse	The horrible, inefficient naive approach is to delete the mirror and git clone --mirror --bare whenever you'd need to sync the repos	20:45
	→ BackEndCoder joined	20:45
	← mda1_ left	20:46
	→ m0viefreak joined	20:46
	← guest left	20:47
	→ Emperor_Earth_ joined	20:47
	← NaN left	20:47
_ikke_	git remote update or git fetch origin should wrok	20:47
	work	20:47
	← Emperor_Earth left	20:48
	→ pur3eval joined	20:49
sveinse	_ikke_: no, it does not pick up a new remote branch. I see it with git branch -av thou	20:49
_ikke_	Then you have it	20:49
sveinse	_ikke_: Have what?	20:50
	→ e01 joined	20:50
	← IntruderSRB left	20:51
sveinse	_ikke_: I need a cron-job tool to keep our mirrors in completely sync with the remote origin. If a remote branch is created, then it needs to be picked up and fetched automatically	20:51
qqx	sveinse: Was your "mirror" actually created as a mirror?	20:51
sveinse	qqx: Created with git clone --bare --mirror	20:52
	← UrsoBranco left	20:52
	← pur3eval left	20:54
	→ chipotle joined	20:54
	← e01 left	20:55
	← navidr left	20:56
sveinse	Think I solved it. Some repos wasn't properly mirroring. Their remotes were showing up as remotes/origin/.. instead of having only one like you do for mirror repos	20:56
	← raijin left	20:58
	← Peetz0r left	20:58
	← Motoko left	20:59
	→ Motoko joined	20:59
	→ ribasushi joined	20:59
	→ Peetz0r joined	21:00
	← baastrup left	21:00
	← tyreld left	21:00
	→ mda1 joined	21:01
	← jeffreylevesque left	21:02
	→ xissburg_ joined	21:03
	← xissburg left	21:03
	← durham left	21:05
	→ chardan joined	21:06
	→ durham joined	21:06
	→ tyreld joined	21:09
	← Murii left	21:10
	← algun_ left	21:10
	→ algun_ joined	21:11
	← mmlb left	21:11
	← Murrito left	21:12
	→ Murr joined	21:12
	→ Levex joined	21:12
	← kst123 left	21:13
	→ masuberu joined	21:13
	← vuoto left	21:13
	→ cdg joined	21:14
	→ RxMcDonald joined	21:15
	← Balliad left	21:15
RxMcDonald	how do you find when a file got deleted in the commit history?	21:15
	← mrVandermare left	21:15
kadoban	git log -- the_file should give you a good idea	21:16
	→ crayon joined	21:16
	→ durham_ joined	21:18
	→ Sasazuka joined	21:19
	← Sasazuka_ left	21:19
	→ dsdeiz joined	21:20
	← durham left	21:21
	← durham_ left	21:22
	→ Sasazuka_ joined	21:22
	← Sasazuka left	21:24
	← Vampire0 left	21:25
	← morfin left	21:25
	→ jeffreylevesque joined	21:25
	→ treehug88 joined	21:26
	→ Vampire0 joined	21:26
	→ theoceaniscool joined	21:28
	→ Alienpruts joined	21:28
	→ durham joined	21:28
	← joshszep left	21:28
	← aidalgol left	21:29
	← durham left	21:30
	← tvw left	21:31
	→ joshszep joined	21:32
	← nettoweb left	21:32
	→ nettoweb1 joined	21:32
	← bgerber left	21:34
	← Levex left	21:35
	→ levex_ joined	21:35
	→ LaptopBrain joined	21:36
	← Ozymandy left	21:36
	→ viktor4 joined	21:37
	← marc_v92 left	21:37
	← masuberu left	21:37
	← reliability left	21:37
	← shgysk8zer0_ left	21:37
	← ecuanaso left	21:38
	→ durham joined	21:38
	← levex_ left	21:39
	→ marc_v92 joined	21:39
	→ l4v2 joined	21:39
	→ Guest55 joined	21:40
	→ cdg_ joined	21:40
	→ e01 joined	21:40
	← e01 left	21:40
	→ e01 joined	21:40
	← LaptopBrain left	21:41
	← clemf left	21:41
	← BSab left	21:41
	→ BSaboia joined	21:41
RxMcDonald	kadoban: well, it's not enough	21:43
	← j7k6 left	21:43
RxMcDonald	now showing when the file got deleted to be honest	21:43
	not ^	21:43
	← cdg left	21:43
	→ j7k6 joined	21:43
kadoban	Should just be the first commit you see usually ... can't imagine a case it wouldn't be.	21:44
	→ dviola joined	21:44
	→ clemf joined	21:44
	→ invisbl_ joined	21:44
RxMcDonald	oh maybe because its a diff branch	21:44
	yea that's it	21:44
	← invisbl_ left	21:45
	→ invisbl_ joined	21:45
	← Dil3mm4 left	21:45
	← ilpanda left	21:48
	← newbie1 left	21:48
	→ newbie1 joined	21:49
	→ Tobbi joined	21:49
	← durham left	21:50
	→ pur3eval joined	21:50
	→ durham joined	21:52
	← marc_v92 left	21:52
	← madewokherd left	21:53
	← jimi_ left	21:54
	← BackEndCoder left	21:54
	← pur3eval left	21:54
	→ m4sk1n joined	21:55
	← jnavila left	21:55
	→ BackEndCoder joined	21:56
	← durham left	21:56
	← flavius left	21:56
	→ durham joined	21:57
	← durham left	21:57
	→ texasmynsted joined	21:57
	← satifant left	21:57
	→ shgysk8zer0_ joined	21:57
	→ durham joined	21:57
texasmynsted	if somebody rebases a branch and pushes it and I try to pull and am unable to ff. How can I force my local to match the remote?	21:57
	← Karazhan left	21:58
RxMcDonald	texasmynsted: rm -rf && git clone	21:58
	→ Karazhan joined	21:58
	→ mutex joined	21:58
	→ kst123 joined	21:58
solarfly	He would lose local changes doing that	21:58
texasmynsted	I ended up git branch -D foo	21:59
	← joshszep left	21:59
	→ heroux_ joined	21:59
texasmynsted	then git checkout foo	21:59
	I am sure there is a better way	21:59
RxMcDonald	if you don't have any stashed stuff or anything	22:00
	← heroux left	22:00
	→ Levex joined	22:00
	heroux_ → heroux	22:00
kadoban	texasmynsted: Probably 'git checkout the_branch && git reset --hard @{u}' or something	22:01
texasmynsted	@{u}	22:01
	what is that? The upstream HEAD?	22:02
	← invisbl_ left	22:02
	→ invisbl joined	22:02
kadoban	It's short for upstream, ya	22:03
	→ joshszep joined	22:03
kadoban	man gitrevisions	22:03
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	22:03
kadoban	It's in there	22:03
	→ olivetree joined	22:03
	→ elsevero joined	22:04
	← blackwind_123 left	22:04
	← Derperpe1 left	22:05
	→ j7k6_ joined	22:05
	← Gsham left	22:06
	← jdl left	22:06
	→ blackwind_123 joined	22:06
	← noecc left	22:06
	← kst123 left	22:07
	← l4v2 left	22:07
	← viktor4 left	22:07
	→ kst123 joined	22:08
	← olivetree left	22:09
	← nickabbey left	22:09
	← kst123 left	22:09
	← Levex left	22:09
	→ nettoweb joined	22:10
	→ nickabbey joined	22:10
	← j7k6_ left	22:10
	← nettoweb1 left	22:10
	← afuentes left	22:13
	→ Endarked joined	22:13
	→ ThiefMaster joined	22:13
	← mischat left	22:14
	← nickabbey left	22:14
	→ mischat joined	22:15
	→ ISmithers joined	22:15
	→ l4v2 joined	22:15
	← vdv left	22:16
	← dersand left	22:16
	← SwiftMatt left	22:17
	→ M-ou-se joined	22:17
	← mischat left	22:19
	tanuki_ → tanuki	22:21
	← Alienpruts left	22:21
	→ inflames joined	22:23
	← l4v2 left	22:26
	← treehug88 left	22:26
	→ hdon joined	22:27
hdon	hi all :) if i want to get an overview of the anatomy of my branches and heads, is there a way to use log --graph but filtering to only see heads and nearest common ancestors of heads?	22:27
	← Karazhan left	22:28
	→ Karazhan joined	22:28
	→ CarlFK joined	22:28
	→ todd_dsm joined	22:29
	← Limes left	22:30
Eugene	hdon - man git-log; see --all, --branches, --tags, etc	22:30
gitinfo	hdon: the git-log manpage is available at http://jk.gs/git-log.html	22:30
Eugene	Or you can manually specify anything you want for <revision range>	22:31
	← ThiefMaster left	22:31
	→ ThiefMaster joined	22:31
	← chardan left	22:31
	← Doow left	22:31
	← ThiefMaster left	22:31
hdon	hm	22:32
	Eugene, but these options do not filter out the boring intervening revision history that i don't want to see	22:33
Eugene	"History Simplification" section in the same man page	22:34
	hdon looks	22:35
	→ Khep joined	22:38
	→ kappy joined	22:39
	← NeverDie left	22:42
	→ NeverDie joined	22:43
	→ Levex joined	22:44
	→ mischat joined	22:44
	→ ThiefMaster joined	22:44
	← Levex left	22:45
	← RxMcDonald left	22:46
	→ Levex joined	22:46
	← Levex left	22:46
	← chipotle left	22:46
hdon	maybe i'm not literate enough in git but i'm not seeing what i want here :C	22:49
	i thought --dense would do it	22:50
	actually i should test this in an isolated repo. this repo may not be a great test case	22:50
	→ SwiftMatt joined	22:50
	→ pur3eval joined	22:50
	→ l4v2 joined	22:51
	→ peeps[lappy] joined	22:52
hdon	yeah i'm not seeing what i want	22:53
	→ fstd_ joined	22:53
	→ nowhereman joined	22:54
hdon	11608 newchicagoproperties.com	22:54
	11889 philhornback.com	22:54
	11945 jeffbrumfieldrealestate.com	22:54
	11954 gregoryreecesmith.org	22:54
	← fstd left	22:54
	fstd_ → fstd	22:54
	← pur3eval left	22:55
hdon	11944 dclenterprisesinc.com	22:55
	12069 hollowayrealtyus.com/	22:55
	john lvm on 12069	22:56
	11954 grsglobalenterprisesinc.com	22:56
	11646 hallmarkproperties.net john lvm	22:56
bremner	please stop.	22:56
hdon	oh shit	22:56
Vampire0	Don't spam hdon	22:56
hdon	sorry bremner wrong chan	22:56
Vampire0	Use pastebin if it is real conten	22:56
bremner	okie dokie	22:56
hdon	:3	22:56
	← Tobbi left	22:56
	→ gk--1wm- joined	22:56
Vampire0	mmh, eyes with tits?	22:57
	← jimsio left	22:57
	→ chardan joined	22:59
	← fmeerkoetter left	23:01
	→ fmeerkoetter joined	23:01
	← gk--1wm- left	23:01
	← MonsterKiller left	23:01
	← dsdeiz left	23:02
	→ denis_M joined	23:02
hdon	is it perhaps simply the case that git does not have the history simplification mode that i want? i want to filter out any revisions that are neither: explicitly listed on the command line (or with --branches or similar) nor are the nearest common ancestors of such revisions	23:03
	← newbie1 left	23:03
	← denisMone left	23:03
	→ newbie1 joined	23:04
	→ MonsterKiller joined	23:04
	→ aidalgol joined	23:05
	← cdown left	23:07
	→ henriquev joined	23:08
	← chardan left	23:08
	xissburg_ → xissburg	23:08
	→ jimi_ joined	23:09
	← gugah left	23:10
	← zivester left	23:10
	→ Derperpe1 joined	23:11
	→ Gloomy joined	23:12
	→ gugah joined	23:14
	→ BSAlb joined	23:16
	← BSaboia left	23:17
	→ durham_ joined	23:17
	← durham_ left	23:18
	→ venmx joined	23:19
	← scoobertron left	23:19
	→ scoobertron joined	23:19
	← Khep left	23:19
	→ Raed\|Mobile joined	23:19
	→ chardan joined	23:21
	← durham left	23:21
	← Guest79609 left	23:21
	→ Khisanth joined	23:24
	← CheckDavid left	23:24
	← Endarked left	23:24
	← elsevero left	23:24
	→ durham joined	23:26
	← rivarun left	23:27
	→ rivarun joined	23:28
	← patarr left	23:28
	→ Kaisyu joined	23:28
	← mischat left	23:29
	← j7k6 left	23:31
	→ askb joined	23:33
	← gugah left	23:34
	→ Somelauw joined	23:35
	→ dsdeiz joined	23:35
	← dsdeiz left	23:35
	→ dsdeiz joined	23:35
	← chachasmooth left	23:36
	← BackEndCoder left	23:37
	→ BackEndCoder joined	23:37
	→ ubuntu joined	23:38
	ubuntu → Guest34234	23:38
	gitinfo set mode: +v	23:39
	Guest34234 → _Marek_	23:39
	→ captain joined	23:40
	→ chachasmooth joined	23:40
	← Gloomy left	23:40
	← Darren_ left	23:42
	← clemf left	23:43
	← venmx left	23:44
	← matoro left	23:44
	← svm_invictvs left	23:45
	← muldover left	23:45
	← ResidentBiscuit left	23:46
	→ matsaman joined	23:49
	→ matoro joined	23:50
	→ Mindi joined	23:50
	→ utrack joined	23:50
	← AaronMT left	23:50
	→ pur3eval joined	23:51
	→ _jaysen joined	23:52
	→ lauren joined	23:53
	← Wulf left	23:53
lauren	hallo! anyone know if there's an already written way to do sub-file "rename"-style tracking of hunks in git blame?	23:54
	or something like git blame	23:54
	→ rgrinberg joined	23:54
	← peeps[lappy] left	23:55
lauren	what I want is a git-blame-like-thing that shows me when a hunk was copied between files	23:55
	or just git log, but blame would be more useful	23:55
	← pur3eval left	23:56
	← TomyLobo left	23:56
	← _jaysen left	23:56
	← pbrewczynski left	23:56
	→ Onionnion joined	23:57

Logs Search ←Prev date Next date→

Channels Documentation