IRCloggy #git 2019-01-09

Provider of IRC logs since 2005.

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

	2019-01-09
	← dege left	00:00
	→ rkazak joined	00:00
	← jinak left	00:00
LordRyan	nothing that i know of, i don't look too much into the internals	00:01
Bradipo	What parts of git would require a tty?	00:01
	→ virmagicis joined	00:02
Bradipo	Should be easy enough to configure ssh to not allocate a tty and see what breaks.	00:02
	→ oscurochu joined	00:03
LordRyan	exactly the point, i think that it's a version of ssh that runs without xterm	00:04
	← oscurochu left	00:04
Bradipo	ssh only requries a terminal when running interactive commands (e.g. a remote shell in interactive mode).	00:04
	I believe git+ssh will have the git client send a remote git command over the wire that does all the talking remote-side.	00:05
	→ oscurochu joined	00:06
Bradipo	e.g. git-upload-pack	00:07
	I don't see how either git-upload-pack or git-receive-pack (and their corresponding client-side commands) would require a tty.	00:08
	→ aleph- joined	00:12
	→ SwiftMatt joined	00:12
HZun	it makes sense if ssh not always requires a terminal. i did not know that. i guess i will read up on ssh in general then.	00:13
	thanks for the help.	00:13
	← regedit left	00:13
	← SwiftMatt left	00:14
Bradipo	The git command might want a tty if it has pretty colorized output, but that has nothing to do with SSH.	00:15
	← dslegends left	00:17
	← oscurochu left	00:17
	← jokajak left	00:21
	→ jokajak joined	00:24
	← WolfOrwell left	00:24
	→ oscurochu joined	00:27
	→ andyhuzhill joined	00:27
	← andyhuzhill left	00:29
	→ andyhuzhill joined	00:30
	← m1dnight_ left	00:30
	← diogenese left	00:31
	← oscurochu left	00:31
	→ diogenese joined	00:31
	← HZun left	00:35
	← bn_work left	00:39
	→ Sasazuka joined	00:41
	→ afidegnum joined	00:45
afidegnum	hello, git push origin 1.0.0 gives me an error of emote: Repository not found.	00:46
	how do i create one through git ?	00:46
	→ pionen joined	00:47
Hello71	tty doesn't have anything to do with colors	00:48
	TERM does	00:48
	afidegnum: you can't	00:48
	!xy	00:48
	← rkazak left	00:48
Hello71	hm	00:48
	← pionen left	00:48
afidegnum	do i mean to creat ea new repo manually via github ?	00:50
	→ rkazak joined	00:51
Bradipo	Hello71: Right, good correction. I was thinking that it might use isatty() to determine whether or not to output colors, but clearly that would depend on the terminal as well (which uses a tty).	00:52
	→ kent\n joined	00:52
	← Bradipo left	00:52
	→ SwiftMatt joined	00:55
afidegnum	ok, can anyone take me through please?	00:56
	i have removed the .git directory	00:58
	how do i start ?	00:58
	→ orbyt_ joined	00:58
	← drbean left	00:59
	← \void left	00:59
	→ drbean joined	01:00
	→ reveller joined	01:01
	← rkazak left	01:02
	→ zulutango joined	01:04
	← SwiftMatt left	01:04
	→ voidSurfr joined	01:04
	→ thiago joined	01:05
	← troyt left	01:06
	← d10n-work left	01:06
	→ troyt joined	01:06
	→ Bobdude joined	01:08
	← armyriad left	01:09
	→ armyriad joined	01:10
	→ berndj joined	01:11
	→ ferdna joined	01:14
reveller	Hi. I work on a large, active open source project. I submitted a large, involved PR last July that I’ll call “july-branch”. The master branch has progressed significantly and now there are merge conflicts. I created a new branch today from master that I’ll call “january-branch”, merged in my old july-branch and resolved the conflicts. I’d like to make the original july-branch look like today’s january-branch and force-	01:17
	to july-branch so it updates the PR with a single commit. Help?	01:17
	→ shicks2525 joined	01:17
	← snowgoggles left	01:18
	→ snowgoggles joined	01:18
	← n3wborn left	01:19
	← shicks_ left	01:19
	→ shicks_ joined	01:21
	← shicks2525 left	01:22
	← GreenJello left	01:22
	→ Wetmelon joined	01:23
	→ oscurochu joined	01:24
	→ GreenJello joined	01:25
	← drbean left	01:26
	→ drbean joined	01:27
	← drbean left	01:31
	→ drbean joined	01:31
	← oscurochu left	01:37
	← lacrymology left	01:38
	← jhulten left	01:41
	← mat001 left	01:42
	→ mat001 joined	01:43
	→ jakogut_ joined	01:44
	← orbyt_ left	01:47
	← sanscoeur left	01:50
	← ketas left	01:50
	→ ketas joined	01:55
	← netj left	01:57
	→ netj joined	01:58
	← PocketKiller left	02:00
	→ orbyt_ joined	02:03
	← aw1 left	02:04
	→ waveclaw joined	02:09
	→ finalbeta joined	02:09
	→ aw1 joined	02:10
	← virmagicis left	02:11
	← mloskot left	02:12
	← boombatower left	02:13
	← mat001 left	02:14
	← justanotheruser left	02:14
	→ justanotheruser joined	02:15
	→ mat001 joined	02:15
	← manuelschneid3r left	02:16
	→ fission6 joined	02:18
	← mat001 left	02:20
	← dfee left	02:20
	← waveclaw left	02:22
	← khisanth_ left	02:23
	← fission6 left	02:26
	← orbyt_ left	02:30
	← jokajak left	02:30
	→ jokajak joined	02:32
	← m0viefreak left	02:35
	→ khisanth_ joined	02:36
	← snowgoggles left	02:36
	← pks left	02:37
	← TomyLobo left	02:38
	→ orbyt_ joined	02:41
	→ dfee joined	02:41
	→ z8z joined	02:42
	→ shaarad joined	02:43
	← Dirak left	02:44
	← timvisher left	02:45
	→ timvisher joined	02:49
	→ esrse joined	02:49
	← Sasazuka left	02:50
	← drbean left	02:52
	→ drbean joined	02:52
	← orbyt_ left	02:53
Hello71	git checkout july; git reset --hard january; git push --force-with-lease	02:53
	or if you already have january checked out you could do something like git branch -f july; git push --force-with-lease july:july	02:55
	← jubal left	02:58
	→ jubal_ joined	02:58
supernovah	is there a way to initiate a completely manual merge, as in everything in the diff I choose using my mergetool, no-ff and no-commit on top?	03:01
	because I need to make subtle changes along the way and the auto-merge will introduce errors	03:01
	← shaarad left	03:02
supernovah	like if I just modified the files as is and committed - there would be no merge, is there like a git merge --init or similar, which tells git I'm merging manually	03:05
	and like a git merge --finalise to complete it	03:05
	→ Dirak joined	03:06
	→ waveclaw joined	03:07
	→ rpjsf joined	03:08
	← waveclaw left	03:08
supernovah	git merge --no-ff --no-commit <hash> creates a bunch of output of auto-merging ./path/to/file.c, and it's breaking the code	03:10
	← diegoaguilar left	03:10
	→ SwiftMatt joined	03:12
supernovah	this is not the classic master vs feature-branch, it's master vs master - divergence and mating	03:13
reveller	Hello71: Thanks for the info!	03:13
Hello71	!backup	03:13
	→ Ookma-Kyi joined	03:13
Hello71	oh right	03:13
	anyways, as long as you committed it's pretty hard to fuck it up badly enough that you can't recover it via reflog	03:14
Ookma-Kyi	question: how should i handle this We found a potential security vulnerability in one of your dependencies.	03:14
Hello71	#github	03:14
Ookma-Kyi	i mean branchwise	03:14
supernovah	git told you it found a security vulnerability lol what?	03:14
	does git do codean now?	03:14
Ookma-Kyi	feature, hotfix, bugfix branch?	03:15
	basically i have to regenerate my package-lock.json	03:15
supernovah	am I in the wrong channel?	03:16
Ookma-Kyi	no	03:16
supernovah	then why are you talking about nodejs?	03:16
Ookma-Kyi	because i'm asking branchwise	03:16
Hello71	Ookma-Kyi: please go to #github	03:16
Ookma-Kyi	ok	03:16
Hello71	and prepare to wait	03:16
	→ rchavik joined	03:17
	← SwiftMatt left	03:17
	← Ookma-Kyi left	03:18
	→ Goplat joined	03:21
	← aleph- left	03:24
	→ SwiftMatt joined	03:28
	→ redrambl1s joined	03:33
	← Essadon left	03:34
	← finalbeta left	03:34
	← redrambl1s left	03:41
	← bookworm left	03:41
	→ mat001 joined	03:42
	← seventh__ left	03:42
	← mat001 left	03:44
	← rpjsf left	03:44
	← SwiftMatt left	03:44
	→ mat001 joined	03:47
	← robotman321 left	03:51
	← Cabanossi left	03:56
	→ bookworm joined	03:56
	→ Cabanossi joined	03:57
	→ yyy joined	03:58
	← lagothrix left	03:58
	→ lagothrix joined	03:58
	→ orbyt_ joined	04:00
	← orbyt_ left	04:00
	← freeman42x left	04:05
	← yyy left	04:06
	→ KeyJoo joined	04:06
	→ seventh__ joined	04:07
	→ cdown joined	04:09
	→ bdonnahue joined	04:19
bdonnahue	hey guys what FOSS clients are you using? I am sick of giteye's bugs	04:19
	← justanotheruser left	04:20
	→ justanotheruser joined	04:21
	← justanotheruser left	04:22
	→ justanotheruser joined	04:25
	→ ToBeFree joined	04:29
	← dfee left	04:32
	← GreenJello left	04:32
	→ Cabanoss- joined	04:33
	← Cabanossi left	04:34
	→ sauvin joined	04:35
	← voidSurfr left	04:37
	← cdown left	04:39
	← Dirak left	04:39
	→ cdown joined	04:40
	→ TomyLobo joined	04:43
	→ dreiss joined	04:46
	← andyhuzhill left	04:46
	→ crimastergogo joined	04:47
	→ andyhuzhill joined	04:47
	→ Dirak joined	04:48
	← surfist left	04:50
	→ surfist joined	04:50
	← Mattiaslndstrm left	04:50
	← aw1 left	04:52
	→ MACscr_ joined	04:53
	← rewt left	04:53
	→ rewt`` joined	04:53
	→ rchavik_ joined	04:53
	rewt`` → rewt	04:53
	→ tgunr_ joined	04:53
	→ bookworm_ joined	04:54
	← crimastergogo left	04:55
	→ ashka` joined	04:55
	→ craftyguy_ joined	04:56
	← mitchell left	04:56
	← hyperair left	04:57
	→ hypera1r joined	04:57
	→ axisys_ joined	04:57
	→ Puffball_ joined	04:57
	→ mingdao_ joined	04:57
	→ mooasaur1s joined	04:58
	→ jakogut__ joined	04:58
	→ lghtstkr joined	05:00
	→ pks joined	05:00
	← bookworm left	05:02
	← rchavik left	05:02
	← jakogut_ left	05:02
	← bvdw left	05:02
	← greatgatsby left	05:02
	← Zohnuqu3pah5iejo left	05:02
	← Puffball left	05:02
	← mooasaurus left	05:02
	← MACscr left	05:02
	← moei left	05:02
	← osse left	05:02
	← causasui left	05:02
	← synthmeat left	05:02
	← tgunr left	05:02
	← gde33 left	05:02
	← Impaloo left	05:02
	← fflam left	05:02
	← Geezus42 left	05:02
	← sentriz left	05:02
	← craftyguy left	05:02
	← mingdao left	05:02
	← ashka left	05:02
	← SJr left	05:02
	← q-chymera left	05:02
	← axisys left	05:02
	← paraxial left	05:02
	← serialoverflow left	05:02
	← Admish left	05:02
	← g2anj left	05:02
	← lightstalker left	05:02
	← meLon left	05:02
	craftyguy_ → craftyguy	05:02
	ashka` → ashka	05:02
	→ SJr joined	05:02
	→ bvdw joined	05:02
	→ serialoverflow joined	05:03
	→ paraxial joined	05:03
	→ Geezus42 joined	05:04
	→ q-chymera joined	05:04
	← alyptik left	05:05
	→ Impaloo joined	05:06
	← Dirak left	05:06
	→ sentriz joined	05:06
	→ tjagad joined	05:06
	← bket left	05:07
	← tjagad left	05:08
	→ gde33 joined	05:08
	→ meLon joined	05:09
	→ synthmeat joined	05:09
	→ fflam joined	05:09
	→ duderonomy joined	05:10
	→ bket joined	05:10
	← dreiss left	05:11
	→ cdown_ joined	05:11
	← cdown left	05:12
	cdown_ → cdown	05:12
	→ Dirak joined	05:12
	→ tjagad joined	05:14
	← bket left	05:15
	→ bket joined	05:15
	← bket left	05:16
	← tjagad left	05:17
	← mat001 left	05:17
	→ tsdh joined	05:19
	← ToBeFree left	05:19
	→ bket joined	05:19
	→ tjagad joined	05:21
	← tjagad left	05:21
	→ dreiss joined	05:26
	→ waveclaw joined	05:26
	→ mowcat joined	05:29
	← mowcat left	05:29
	→ Kaisyu joined	05:29
	→ mowcat joined	05:30
	← waveclaw left	05:31
	→ tjagad joined	05:32
_ikke_	bdonnahue: git	05:32
	bdonnahue: and tig	05:33
	→ waveclaw joined	05:34
	→ GreenJello joined	05:34
	→ dfee joined	05:36
	← waveclaw left	05:36
	→ mat001 joined	05:37
	→ FermiDirak joined	05:37
	→ alyptik joined	05:37
	→ waveclaw joined	05:37
	→ wxg joined	05:37
	← waveclaw left	05:38
	→ devang_2401_ joined	05:38
	← Inline left	05:38
	→ waveclaw joined	05:39
devang_2401_	hi I'm Devang. I am a GSOC aspirant, are there beginner level projects I can working on?	05:39
	← dreiss left	05:40
	← mat001 left	05:41
_ikke_	devang_2401_: Welcome devang_2401. Here are some ideas, though they are mostly from last year, I haven't seen any updates yet: https://git.github.io/	05:41
	← waveclaw left	05:46
	→ waveclaw joined	05:46
	← devang_2401_ left	05:47
	→ keepLearning512 joined	05:49
	← FermiDirak left	05:54
	→ finalbeta joined	05:54
	→ crimastergogo joined	05:55
	→ hofmann3900 joined	05:59
	← cdown left	06:01
	→ cur8or joined	06:03
	← thiago left	06:04
	→ randominternetus joined	06:07
	← crimastergogo left	06:10
	← Wetmelon left	06:10
randominternetus	There's a repo I like to do some modification on. I like to know how it'll be like exactly to handle new codes. Lets say I fork the repo and do the modifications on file A. Now the original repo maintainers do a bug fix on the same line. What will I have to do? handle conflicts?:/	06:10
	→ crimastergogo joined	06:10
	→ orbyt_ joined	06:12
	← cur8or left	06:13
	→ FermiDirak joined	06:16
	← FermiDirak left	06:25
	← ngui left	06:25
	→ ngui joined	06:26
	→ fairuz joined	06:27
	← ferdna left	06:28
	→ dreiss joined	06:28
	→ aleph- joined	06:29
	← ngui left	06:30
	← Goplat left	06:32
	← orbyt_ left	06:34
	← Dirak left	06:35
	→ mat001 joined	06:35
	← mikecmpbll left	06:36
grawity	yes	06:38
	← crimastergogo left	06:39
	→ mikecmpbll joined	06:39
	← mat001 left	06:39
	→ m1dnight_ joined	06:43
	→ oxymoron93 joined	06:48
	→ Dirak joined	06:49
	← timvisher left	06:49
	← dpyro left	06:52
	→ SwiftMatt joined	06:52
	→ gusgg joined	06:52
gusgg	Is there any workflow that would allow me to squash some commits in one branch, but if I wanted to, I could see the invidiual commits that comprised the squash? I could manully keep a reference to some commit hashes, but they'd only live in a feature branch, and I would like to avoid keeping arbitrarily many brnaches.	06:53
	← Dirak left	06:55
	→ cur8or joined	06:55
	→ andrzejv joined	06:56
	← SwiftMatt left	07:00
	← cur8or left	07:01
randominternetus	grawity, like manually doing merge conflicts?:/	07:02
	→ osse joined	07:04
	← keepLearning512 left	07:06
	→ sQVe joined	07:07
	← dreiss left	07:12
	← gusgg left	07:18
	→ ngui joined	07:31
	← wxg left	07:31
	→ WolfOrwell joined	07:34
	← ngui left	07:35
	→ ngui joined	07:35
	← manojbagari left	07:36
	→ dreiss joined	07:37
	→ Dirak joined	07:40
	→ n3wborn joined	07:41
	→ carb0n joined	07:45
	← seventh__ left	07:45
	→ manojbagari joined	07:47
	← Bobdude left	07:48
	← mikecmpbll left	07:49
	→ keepLearning512 joined	07:50
	← mooasaur1s left	07:52
	← justanotheruser left	07:56
	→ dege joined	07:57
	→ Phylock joined	07:58
	→ mooasaurus joined	07:59
	→ d^sh_ joined	08:00
	→ chele joined	08:01
	← d^sh left	08:04
	→ kjartan joined	08:04
	→ mbagari joined	08:06
	← manojbagari left	08:10
	← mbagari left	08:11
	→ manojbagari joined	08:11
	← rchavik_ left	08:12
	→ rchavik_ joined	08:14
	→ Makaveli7 joined	08:20
	→ gitinfo joined	08:21
	ChanServ set mode: +o	08:21
	→ void__ joined	08:24
	→ strugee joined	08:25
	← fairuz left	08:26
	← Makaveli7 left	08:27
	→ jast joined	08:27
	→ TripFandango joined	08:27
jast	hi guys, sorry for gitinfo outage, server needed a manual reboot for some reason	08:28
	← TripFandango left	08:28
	→ mona_x joined	08:31
	→ carb0n_ joined	08:37
	← carb0n left	08:39
_ikke_	jast: thanks :-)	08:40
	← mksybr left	08:43
	← ngui left	08:45
	← sQVe left	08:45
	→ ngui joined	08:46
	→ bsaboia joined	08:49
	← ngui left	08:50
	→ ngui joined	08:50
	← nowhere_man left	08:50
	→ mikecmpbll joined	08:52
	← mikecmpbll left	08:54
	→ jubal joined	08:55
	→ nowhere_man joined	08:55
	← jubal_ left	08:57
	← carb0n_ left	09:00
	→ mloskot joined	09:00
	→ planetcall\|work joined	09:01
	→ floppydh joined	09:01
	← dfee left	09:01
	← rchavik_ left	09:03
	→ rchavik_ joined	09:03
	← dreiss left	09:05
	→ carb0n_ joined	09:10
	→ justanotheruser joined	09:10
	← rchavik_ left	09:10
	→ mikecmpbll joined	09:13
	← andyhuzhill left	09:17
	→ andyhuzhill joined	09:17
	← andyhuzhill left	09:21
	→ andyhuzhill joined	09:22
	→ Noti joined	09:23
	→ cswl joined	09:23
	← carb0n_ left	09:24
	← aleph- left	09:26
	← andyhuzhill left	09:27
	→ SwiftMatt joined	09:27
	→ andyhuzhill joined	09:27
	→ Tobbi_ joined	09:27
	← bsaboia left	09:28
	← GreenJello left	09:29
	← SwiftMatt left	09:30
	← drbean left	09:31
	← andyhuzhill left	09:31
	→ andyhuzhill joined	09:32
	← z8z left	09:33
	← Tobbi_ left	09:35
	← andyhuzhill left	09:35
	→ Tobbi_ joined	09:36
	← mona_x left	09:36
	→ mona_x joined	09:41
	→ crimastergogo joined	09:41
	→ SwiftMatt joined	09:43
	← SwiftMatt left	09:43
	← q-chymera left	09:44
	→ mzf joined	09:45
	→ T_UNIX joined	09:45
	← Tobbi_ left	09:46
	→ Tobbi_ joined	09:48
	← Noti left	09:49
	← ngui left	09:50
	→ ngui joined	09:51
	← crimastergogo left	09:51
	← im0nde left	09:52
	→ Noti joined	09:53
	→ yyy joined	09:53
	→ im0nde joined	09:53
	← void__ left	09:55
	→ svennidal joined	09:56
	← Tawonga left	09:56
	→ karoshi joined	09:58
	← Noti left	09:59
karoshi	Okay I'm probably doing something daft. I'm trying to push my django set-up to git. I had it working but due to a mistake in the django config I had to make a new repo - now when I push, it says everythings up to to date. But I can only see the README.md in the repo? https://hastebin.com/anelijedeg.coffeescript	10:00
canton7	karoshi, you haven't made any commits...?	10:00
	bookworm_ → bookworm	10:01
	→ Noti joined	10:02
karoshi	Oh, okay. Yeah that was it lol. I thought that was bundled under 'push'	10:02
	all working now, thx(: - Too used to github desktop treating me nice it seems	10:02
	← duderonomy left	10:03
	→ manuelschneid3r joined	10:03
	→ sQVe joined	10:04
karoshi	Another quick one, I've saved my credentials using git config credential.helper store -- If I give other people access to my VPS with their own username/directory. Will they be able to push to git fine? Or will it try and do it with my credentials?	10:05
	← ngui left	10:05
	→ ngui joined	10:05
	← manuelschneid3r left	10:05
	→ manuelschneid3r joined	10:06
	→ carb0n_ joined	10:07
canton7	git-credential-store puts your credentials in ~/.git-credentials, so it's local to you	10:08
	man git credential-store	10:08
gitinfo	the git-credential-store manpage is available at https://gitirc.eu/git-credential-store.html	10:08
	→ Tawonga joined	10:09
	→ D630 joined	10:11
	→ HZun joined	10:11
	← dege left	10:11
	← tgunr_ left	10:12
	→ tgunr joined	10:13
	→ blackntan joined	10:13
	← ngui left	10:15
	→ ngui joined	10:16
planetcall\|work	I am trying to migrate my source from TFS to Git. I want to remove and dereference some directories which contain large blobs like zip etc. I found the way to do it on this link. https://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-a-git-repository. The problem is that it is taking very long. I might be doing something wrong.	10:17
	executing something like -> git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch filename' --prune-empty --tag-name-filter cat -- --all is taking very long time	10:17
	any better idea?	10:18
	← Kaisyu left	10:19
	← catsup left	10:19
	→ catsup joined	10:19
	← ngui left	10:20
	← catsup left	10:20
	→ ngui joined	10:20
karoshi	canton7: ty	10:20
	→ catsup joined	10:21
	← Noti left	10:23
	← kjartan left	10:26
	← mona_x left	10:27
	→ kjartan joined	10:28
	→ crimastergogo joined	10:29
	← ngui left	10:30
	→ ngui joined	10:31
	← crimastergogo left	10:31
	→ mona_x joined	10:32
	→ [twisti] joined	10:32
	← manojbagari left	10:32
	→ manojbagari joined	10:33
[twisti]	i use git in the following setup: my dev machine is windows, the folder i am working on is a mounted volume from a linux VM. all the dev tools (eclipse etc) run on the windows host. i would like to be able to check in both from linux and from windows, from the same directory. naturally, my question is about line endings. is there any sane way of living with my setup, or am i screwed ?	10:33
	→ Noti joined	10:35
	← manojbagari left	10:36
janx	[twisti]++ (Personally, I've just heard that setting `core.autocrlf = false` and `core.whitespace = off` are generally good ideas, but I've never experimented with such an exciting setup. Good luck!)	10:36
	→ manojbagari joined	10:36
	← Dirak left	10:37
	← manojbagari left	10:39
	→ manojbagari joined	10:40
	← n3wborn left	10:40
	← manojbagari left	10:43
	→ tarkus joined	10:43
	→ manojbagari joined	10:43
	← ngui left	10:45
	→ ngui joined	10:45
	← mona_x left	10:46
	← manojbagari left	10:46
	→ manojbagari joined	10:47
	← karoshi left	10:50
	← manojbagari left	10:50
	→ manojbagari joined	10:50
	→ ahmed89 joined	10:51
	→ mona_x joined	10:51
	→ YuGiOhJCJ joined	10:52
	← manojbagari left	10:53
	→ manojbagari joined	10:54
	← Puffball_ left	10:54
	← manojbagari left	10:57
	carb0n_ → carb0n	10:57
	→ manojbagari joined	10:57
	← manojbagari left	11:00
	← Noti left	11:01
	→ manojbagari joined	11:01
	← mona_x left	11:02
	→ jungsubk joined	11:04
	→ SwiftMatt joined	11:04
	← manojbagari left	11:04
	← SwiftMatt left	11:04
	→ manojbagari joined	11:04
	← ngui left	11:05
	→ ngui joined	11:06
	→ stitched_unicorn joined	11:10
	← ngui left	11:10
	→ ngui joined	11:10
	← afidegnum left	11:11
	← keepLearning512 left	11:16
	→ troulouliou_div2 joined	11:16
	← jungsubk left	11:21
	→ jstein_ joined	11:22
	jstein_ → jstein	11:22
	→ rez- joined	11:22
	← stitched_unicorn left	11:25
	← yyy left	11:36
	→ q-chymera joined	11:37
	← m1dnight_ left	11:37
	← ngui left	11:40
	→ ngui joined	11:41
jast	[twisti]: if your windows dev tools respect platform defaults, a .gitattributes file should do the trick	11:42
	see !crlf	11:42
gitinfo	To fix problems with line ending on different platforms, check out http://line-endings.gitrecipes.de/. Line ending normalization can be the cause of changed files that appear to not go away.	11:42
	→ m1dnight_ joined	11:43
jast	you might get warnings, though, because the linux client will be expecting the files in the working tree to be LF-encoded, while Windows will expect CRLF	11:43
	→ mra90 joined	11:45
	← jubal left	11:46
	→ jubal joined	11:48
	← troulouliou_div2 left	11:48
	← ngui left	11:50
	→ ngui joined	11:50
mra90	why after "git pull master" I don't see commits history from master?	11:50
	hmm I think if that would be OK, expected	11:51
	→ keepLearning512 joined	11:52
canton7	mra90, you should get an error: the syntax is 'git pull <remote> <branch>' or 'git pull <remote>', and 'master' is a branch, not a remote	11:55
mra90	canton7: what if I have local branch called master	11:57
	I don't see any error here	11:57
canton7	'git pull' is for fetching updates to a branch from a remote repository, and then merging them into your current branch	11:58
	like I said, the first argument is the name of the remote repository to fetch changes from	11:58
mra90	canton7: ok make sense	11:58
canton7	now, it makes sense to run 'git merge master', as that will merge your local master branch into your current branch	11:59
mra90	canton7: yes this is what I did	11:59
canton7	you said you ran "git pull master"	11:59
jast	and 'git merge master' doesn't make sense, either, while you have master checked out :)	12:00
	→ rtjure joined	12:00
	← supernovah left	12:01
mra90	can I cherry pick specyfic file from other branch?	12:03
jast	not exactly - you can checkout an arbitrary version	12:03
	← sQVe left	12:03
jast	you can also apply a diff for a specific file from an arbitrary version but it's a little more work	12:03
	→ mona_x joined	12:04
	→ troulouliou_div2 joined	12:08
	← ngui left	12:10
	→ ngui joined	12:11
	← snakegums_ left	12:14
	← ngui left	12:15
	→ ngui joined	12:15
	→ sQVe joined	12:17
	→ sybariten joined	12:18
	→ dege joined	12:18
sybariten	hey, a question about Good Practice (TM). So i'm a real amateur programmer and make a script here and there to help with daily chores. Do you guys keep a folder like ~/usr/bin where you have different kind of script files? If so, do you version them, and is that in one big repo then? Cause git would want individual things to be in individual folders, right?	12:19
grawity	yes	12:20
	so I have a ~/bin and it's one big repo	12:20
	← alcohol left	12:20
jast	git doesn't really care about folders, but separate projects are best kept in separate repositories	12:20
grawity	1) it does; tree objects are folders	12:20
	2) it does; enjoy putting two git repos under the same ~/foo/	12:20
jast	in terms of versioning things properly, I mean	12:20
	that said, for a collection of small scripts that's probably overkill	12:21
grawity	I assume sybariten was asking about #2 here anyway	12:21
	which, well, it's possible but it's also annoying	12:21
	→ yyy joined	12:21
jast	so you could definitely do worse than stuffing your scripts in a repo in whichever way you like	12:21
	but if there's anything that evolves into more than a small script, I'd consider moving it into its own repo	12:21
sybariten	jast: ok, gotcha. grawity: yup, #2 in a way	12:23
grawity	my code repo has ended up in a bit of a mess, to put it mildly	12:23
sybariten	i'll make one common repo then... sigh.. and will try to think of a catchy name.... thanks for your help!	12:23
grawity	but whenever a script ends up outgrowing it, I try to extract its commits with filter-branch	12:23
jast	it's technically possible to have multiple repos use the same working tree (= essentially base folder), but it's a huge hassle to work with	12:23
	sybariten: here's a free name suggestion for you: 'scripts' :P	12:24
sybariten	jast: considering i'm still learning about the basic concepts of git and versioning (such as branches and trunk and what have ya), i think i'll stay as far away from hassle as possible	12:24
	→ g2anj joined	12:24
jast	yeah, smart choice.. I wouldn't recommend it to a seasoned git user	12:25
	← furrymcgee left	12:25
	← armyriad left	12:25
sybariten	btw, follow up question .... is git:ing directly from inside emacs also a hassle? I bet it's possible and some people do it. But i'm often surprised of how bloody complicated it can be to actually set up some things in emacs	12:25
	→ armyriad joined	12:25
grawity	https://magit.vc/	12:26
jast	there's a plugin called magit	12:26
grawity	because of course there is	12:26
jast	I tried it briefly when I test-drove emacs, looked good	12:26
	→ lucasb joined	12:26
sybariten	okay	12:26
	← treehug88 left	12:27
	← waffeln left	12:27
	← mobile_c left	12:32
	← troulouliou_div2 left	12:32
	← esrse left	12:32
	mingdao_ → mingdao	12:33
	← donofrio left	12:34
	→ donofrio joined	12:34
	← ngui left	12:35
	→ ngui joined	12:36
	← keepLearning512 left	12:36
	→ troulouliou_div2 joined	12:42
	→ kerframil joined	12:43
	← ngui left	12:45
	← tarkus left	12:46
	← jstein left	12:48
sybariten	cleanest? ~/bin/script or ~/bin/scripts ?	12:50
	→ ngui joined	12:51
dawik	both sheit	12:51
grawity	why not just ~/bin	12:51
	→ Essadon joined	12:54
	← ngui left	12:55
	→ ngui joined	12:55
mra90	why I have to use "force with lease" the second time I want to push my branch?	12:57
grawity	the second time, after what actions?	12:57
_ikke_	mra90: did you rewrite comits?	12:57
	ie, commit --amend, rebase	12:57
grawity	the short answer is "because of something you did between the first push and now"	12:57
mra90	_ikke_: yes I did --amend	12:57
	← blackntan left	12:58
_ikke_	Then that's the reason	12:58
grawity	then your push is trying to remove the old commit from the server	12:58
	and that's only allowed with --force	12:58
mra90	okay make sense	12:58
	i have one more problem, I pushed just one commit to github but there I see two commit for pull requests	12:59
	→ Noti joined	12:59
mra90	the new one and the one from a month ago	12:59
	how is that possible?	12:59
canton7	mra90, presumably the branch that you pushed had 2 commits on it	13:03
mra90	no there is only one above master	13:04
canton7	output of !lol ?	13:05
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	13:05
	→ alcohol joined	13:06
	→ treehug88 joined	13:06
	→ keepLearning512 joined	13:06
_ikke_	mra90: is the remote master behind?	13:07
mra90	_ikke_: yes	13:07
canton7	ah, good spot	13:07
	→ blackntan joined	13:07
_rgn	is there a tool that could come up with a simple commit message based on the git status, like, "added foo.png" if there's a single added file etc. obviously this is not how i typically write commit messages but sometimes the commit message can't be anything more informative	13:07
mra90	I noticed that in github it says that my new commit has two parents hmm weird isn't it?	13:07
_ikke_	mra90: that means it's a merge commit	13:08
grawity	did you do something like	13:08
mra90	yes, so what is wrong?	13:08
grawity	push, amend, push again, get an error about --force, try to pull instead, don't bother looking at what you pulled, push again	13:09
	→ dslegends joined	13:09
grawity	when you do that, you end up with a merge of both the old and new commits	13:09
_ikke_	That's plausible	13:09
mra90	grawity: I might have done it but I see no probelm with that	13:10
_ikke_	mra90: then you end up with what you see now	13:10
grawity	you just said it's "weird"	13:10
	if you've done it, then it's literally the cause for the merge commit (i.e. the commit with two parents)	13:10
mra90	grawity: I said the github outcome of all this action is weird	13:10
	not what I have done	13:10
grawity	what's weird about it?	13:10
	a merge by definition has two parents	13:11
	← troulouliou_div2 left	13:11
sybariten	grawity: if just ~/bin, should the repo be bin.git then? And the reason i thought about a subdir was that i might have small individual binaries that are compiled on a user level, in that dir	13:11
mra90	grawity: as I said I made single commit but end up with two	13:11
grawity	no	13:11
mra90	ok so I will reset it all and start over with pull instead of mege	13:11
grawity	you 1) made a single commit, 2) amended it, creating a new commit and throwing away the old one, 3) ran 'git pull', re-downloading the old commit alongside the new one	13:11
_ikke_	not redownloading mind you	13:12
grawity	not like it matters now	13:12
	whether it's redownloaded or whether it was cached doesn't change the outcome	13:12
mra90	so what sould I do now?	13:12
grawity	in order to achieve what?	13:13
mra90	single commit pull request in github	13:13
	^^	13:13
	My plan is reset to last commit before merge	13:15
	then pull upstream/master	13:15
	then make new commit & push again	13:15
	← ngui left	13:15
	→ ngui joined	13:16
mra90	ohh I still see that commit ;/	13:19
	← D630 left	13:20
	← manuelschneid3r left	13:22
	← ngui left	13:25
	→ ngui joined	13:25
	→ mbagari joined	13:25
	→ D630 joined	13:29
mra90	shit I just can't fix it! ;(	13:29
	why do I see that commit which has already been merged	13:29
	← manojbagari left	13:29
	← johnny56_ left	13:29
	← jubal left	13:29
	→ manojbagari joined	13:30
	← mbagari left	13:30
	→ jubal joined	13:32
	DLFRDG → dilfridge	13:33
	→ bbenz joined	13:33
	→ manuelschneid3r joined	13:34
treehug88	mra90 you could cut a new branch from master	13:35
mra90	treehug88: yes but I would like to fix that one	13:35
	← ngui left	13:35
bbenz	do you guys use git for deployment?	13:35
mra90	the strange thing is it look like pull from master doesn't work since at least one file has different content	13:35
	→ ngui joined	13:36
treehug88	at what cost in labor? :] the point is to get the branch/PR merged I presume. Sorry don't know how to fix your issue	13:36
	bbenz I've seen companies that used git for deployment	13:36
	worked at them, even	13:37
bbenz	treehug88: I'm using git for deployment at my current company	13:37
	I kind of had to defend my design yesterday and I fumbled	13:37
treehug88	every deployment method has pros and cons	13:38
bbenz	my best answer was "somebody I met at a hackathon says he does it all the time"	13:38
treehug88	yeah that's not a widely appreciated argument, it's not even a call to authority really	13:38
bbenz	yeah I know, like I said I was fumbling	13:38
treehug88	how about 'avoids an extra step bundling code into a tarball' and 'provides the exact files to production needed'	13:39
bbenz	well, the other dev at my company didn't know much about git	13:39
treehug88	and 'less moving pieces'	13:39
	→ CodeSlingerPaul joined	13:40
bbenz	he set the production code as the remote environment	13:40
	← ngui left	13:40
bbenz	the remote repo is the production environment	13:40
	→ ngui joined	13:40
bbenz	and I was like "that's not the point of a remote repo"	13:40
	he said it just skips a step, which is true in a sense	13:41
	so for the other major project in my company I set up a remote repo, and I log onto the production server and pull the repository whenever we want to roll out an update	13:42
	am I making a fool of myself? I don't want to prove myself right, I want to be less wrong. Git for deployment is a thing, right?	13:42
	← Eryn_1983_FL left	13:44
	→ Eryn_1983_FL joined	13:44
	← veegee left	13:45
	→ veegee joined	13:47
	← ngui left	13:55
	→ ngui joined	13:56
	→ mrom joined	13:57
	← mrom left	13:57
	→ mrom joined	13:59
	← mrom left	13:59
	← ngui left	14:00
	→ Guest1337 joined	14:03
	← xcm left	14:04
jast	!deploy	14:04
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	14:04
	→ xcm joined	14:04
bbenz	thanks jast	14:05
jast	it's not always a good idea to do it with git only, e.g. if permissions matter	14:05
	← KeyJoo left	14:05
jast	and ownership and stuff like that	14:05
	→ thiago joined	14:05
jast	or if any of the files need processing, e.g. built or reorganized from repo contents	14:06
	→ ngui joined	14:06
bbenz	jast: I am actually dealing with permissions issues right now	14:07
	← Guest1337 left	14:07
bbenz	jast: I don't want to stray off topic, but what is the solution for these deployment things?	14:07
	I mean, if you can just point me in the right direction I'll take my research elsewhere	14:08
	maybe not THE solution, but A solution would	14:08
mra90	ok I solved it	14:08
	← blackntan left	14:09
	← ngui left	14:10
	→ ngui joined	14:10
	← dege left	14:12
	→ fission6 joined	14:12
	→ johnny56_ joined	14:13
jast	bbenz: could range from a build server that creates container/VM images -- to a script that fetches data from git and then sets the permissions	14:13
	← xcm left	14:14
	→ xcm joined	14:16
	← Noti left	14:18
	→ dpyro joined	14:18
	→ dviola joined	14:19
bbenz	jast: thank you	14:21
	← random_yanek left	14:24
	→ SerialSmile joined	14:29
	→ blackntan joined	14:34
	← ngui left	14:35
	← andrzejv left	14:36
	← kjartan left	14:36
	→ ngui joined	14:36
	← HZun left	14:37
	→ kjartan joined	14:38
	→ topdownjimmy joined	14:39
topdownjimmy	Is it possible, when doing git log -Skeyword, to also show the hunks that contain my search keyword? If I add the -p flag, it shows me all diffs, but I'd like to see only the ones that contain the keyword.	14:40
	→ dege joined	14:41
	← thiago left	14:44
	← ngui left	14:45
	→ HolodocPrime joined	14:45
	← D630 left	14:45
	→ cdown joined	14:48
	← dviola left	14:50
	← sQVe left	14:51
	← manojbagari left	14:53
bdonnahue	bdonnahue	14:53
	→ manojbagari joined	14:53
	← randominternetus left	14:56
	← mra90 left	14:56
	→ ngui joined	14:56
	← manojbagari left	14:57
	→ boombatower joined	14:57
	→ manojbagari joined	14:57
	← manojbagari left	15:00
	← ngui left	15:00
	→ ngui joined	15:00
	→ manojbagari joined	15:00
	→ Inline joined	15:01
	← cdown left	15:01
	→ redrambl5s joined	15:01
	→ cdown joined	15:03
	← manojbagari left	15:04
	→ manojbagari joined	15:04
	→ greggerz joined	15:04
	→ redrambl6s joined	15:05
	← manojbagari left	15:07
	→ sjoshi joined	15:07
	→ manojbagari joined	15:08
	← ngui left	15:10
	→ ngui joined	15:11
	← manojbagari left	15:11
	→ maryo joined	15:11
	→ manojbagari joined	15:11
	← carb0n left	15:12
	→ carb0n joined	15:12
	← tsdh left	15:12
	→ Dougie187 joined	15:14
	← manojbagari left	15:14
	→ manojbagari joined	15:14
	← Raed left	15:15
	→ julius_ joined	15:15
julius_	hi	15:15
	← manojbagari left	15:18
	→ manojbagari joined	15:18
	← cdown left	15:19
	← ngui left	15:20
	→ ngui joined	15:20
	← downer06 left	15:20
	← manojbagari left	15:21
	→ sQVe joined	15:21
	→ manojbagari joined	15:21
	→ Noti joined	15:22
	← manuelschneid3r left	15:23
	← keepLearning512 left	15:24
	→ downer06 joined	15:24
	→ Raed joined	15:24
	← manojbagari left	15:25
	→ manojbagari joined	15:25
	→ keepLearning512 joined	15:25
	→ thiago joined	15:26
	← rez- left	15:26
	← Noti left	15:26
	← carb0n left	15:27
	← keepLearning512 left	15:27
	→ stitched_unicorn joined	15:27
	← manojbagari left	15:28
	→ llef joined	15:28
	→ manojbagari joined	15:28
	→ dudek joined	15:29
	← troyt left	15:30
llef	problem: the git-client that pushed a commit now doesn't seem to "see" that commit as pushed; meanwhile, a colleague's git-client doesn't "see" that commit either, but he cannot push to the given branch, because git says he needs to pull from it first; meanwhile, BitBucket's web-UI shows the commit	15:31
	there on the given branch	15:31
	... also, attempts to pull or fetch from the branch seem to all succeed (no visible errors)	15:31
	← manojbagari left	15:32
	→ manojbagari joined	15:32
llef	... also git fsck and git show (with the given commit) don't seem to show corruption	15:33
	← julius_ left	15:33
	← cswl left	15:33
wadadli	trying to write some automation here	15:40
	how can I get git to tell me all the things that changed in a commit since the last commit?	15:41
	by all the things I mean files	15:41
	← powerbit left	15:42
	→ troyt joined	15:44
	→ wxg joined	15:48
	→ jacksonisiahpro joined	15:48
	gitinfo set mode: +v	15:49
_ikke_	git show --name-only	15:51
	for scripts, it might be better to use git diff-tree --name-only HEAD~ HEAD	15:52
	→ julius_ joined	15:53
julius_	sorry...disconnect	15:53
	i simply redownloaded the code with git clone	15:54
wadadli	_ikke_: so many ways to achieve the same outcome but wonder what the implications are using git show, git diff-tree, git rev-parse, git diff etc	15:54
	→ cdown joined	15:59
	← dege left	15:59
	← ngui left	16:00
	→ ngui joined	16:01
wadadli	git diff-tree --no-commit-id --name-only -r HEAD	16:01
	does a good job for me	16:01
_ikke_	git show is an end-user command, the output could very from git version to git version	16:02
	git diff-tree and rev-parse are mean for scripting, so the output is more stable / defined	16:02
	→ al-damiri joined	16:03
wadadli	makes me wonder what the difference is between git-diff and git-diff-tree	16:04
	the issue is determining how many commits are in the PR	16:06
	→ mikeputnam joined	16:06
wadadli	or how many commits were added since the last commit	16:07
	I don't think git has a notion of this	16:07
	← ngui left	16:10
	→ ngui joined	16:10
	→ Neophyliam joined	16:10
	→ flying_penguin joined	16:11
	→ AllenJB joined	16:12
	← Neophyliam left	16:12
	→ AbleBacon joined	16:13
	← nowhere_man left	16:13
	← stitched_unicorn left	16:14
	→ dfee joined	16:14
	← dpyro left	16:15
	→ dege joined	16:16
	→ Peng_ joined	16:18
	← manojbagari left	16:20
	→ manojbagari joined	16:20
	→ ToBeFree joined	16:21
	← jacksonisiahpro left	16:21
	← dege left	16:21
	→ dviola joined	16:21
	← kerframil left	16:23
	← ToBeFree left	16:23
	← manojbagari left	16:24
	→ manojbagari joined	16:24
	→ mat001 joined	16:24
	→ stitched_unicorn joined	16:25
	→ sylario joined	16:26
	← lucasb left	16:26
	← oxymoron93 left	16:27
	← manojbagari left	16:27
	→ lacrymology joined	16:27
chrisml	how can i revert a patch to a file in a specific commit?	16:27
	→ dege joined	16:27
	→ manojbagari joined	16:28
chrisml	the commit has a lot of changes to different files, and the file in question has a lot of changes	16:28
	← mat001 left	16:28
thiago	git revert, then undo (don't commit) the changes to all other files	16:28
chrisml	i might just manually do it xD	16:29
osse	you can git diff -R commit~ commit \| git apply	16:29
	ehh	16:29
	git diff -R commit~ commit -- file \| git apply	16:29
	→ dpyro joined	16:29
	← ngui left	16:30
	→ mfoolb joined	16:30
	→ ngui joined	16:31
	← manojbagari left	16:31
	→ manojbagari joined	16:31
	← sQVe left	16:31
	→ keepLearning512 joined	16:32
	← tjagad left	16:34
mfoolb	I have a lame question.. sorry about that. I want to make;make install a specific revision from a git repo.. what else I should do after git checkout hex_code?	16:34
	→ nowhere_man joined	16:34
	← manojbagari left	16:34
osse	mfoolb: nothing git-specific.	16:34
	make; make install I guess	16:34
	→ manojbagari joined	16:35
	← ngui left	16:35
	→ ngui joined	16:35
	→ mitchell joined	16:35
	← floppydh left	16:36
	← Peng left	16:36
	→ Peng joined	16:36
	← chele left	16:36
mfoolb	osse: I did that but the git repo I'm using has only a branch so version is the same for all the revision I use, How can I check that I'm running the revision I need after installing?	16:37
	← keepLearning512 left	16:37
	← manojbagari left	16:38
	→ jwr joined	16:38
osse	mfoolb: how does the program determine the version number?	16:38
	→ manojbagari joined	16:38
jwr	If I setup support for git lfs, then add a large file and push, do all of my coworkers need to them set up support for lfs on their machines too?	16:38
mfoolb	osse: There's just one branch.. same version different committs/revision I need to test some of these.. I have the hex_code referring to the revisions	16:39
osse	I don't know then	16:40
	Manually change the version number before compiling and check that it is what you expect	16:40
	Do you have any reason to believe you're running the wrong version?	16:40
	→ GreenJello joined	16:40
mfoolb	osse: well no if they all don't work :/	16:41
	← manojbagari left	16:41
	→ snits joined	16:41
	→ manojbagari joined	16:42
osse	mfoolb: after git checkout you get the source code you asked for, and that's that. after make and make install that code is compiled I guess.	16:42
	what the version number is is not up to git	16:42
mfoolb	osse: Thank you.. that was what I thought.. bye	16:42
	← mfoolb left	16:43
	← manojbagari left	16:45
	← GreenJello left	16:45
	← ngui left	16:45
	→ manojbagari joined	16:45
	← mona_x left	16:45
	→ ngui joined	16:46
	→ manuelschneid3r joined	16:46
	← manojbagari left	16:49
	→ manojbagari joined	16:49
	→ \void joined	16:50
	← ngui left	16:50
	→ ngui joined	16:50
	← SerialSmile left	16:51
	← manojbagari left	16:52
	→ manojbagari joined	16:53
	← svennidal left	16:53
	← ngui left	16:55
	→ ngui joined	16:56
	← manojbagari left	16:56
	→ manojbagari joined	16:56
	→ czart joined	16:57
	← manojbagari left	16:59
	→ manojbagari joined	17:00
SmashingX	This should show me uncommited commits, am I right? git log --oneline @{upstream}..	17:02
	it used to work before	17:03
	← manojbagari left	17:03
	→ manojbagari joined	17:03
SmashingX	I mean, I think the part that I'm not sure if it's right is the @{upstream} one	17:03
	and the two dots	17:03
	← parsnip left	17:04
	← dpyro left	17:04
	← ngui left	17:05
	→ ngui joined	17:05
osse	SmashingX: unpushed, yes	17:06
	→ parsnip joined	17:06
osse	it's an abbreviation of HEAD@{upstream}..HEAD	17:06
	you can shorten it further: @{u}..	17:06
	← manojbagari left	17:06
SmashingX	unpushed commits, my bad	17:06
	commited but unpusshed	17:07
	unpushed	17:07
	→ manojbagari joined	17:07
SmashingX	osse: but I get an error	17:07
	that's why I ask	17:07
osse	ok	17:07
	which one	17:07
	← manojbagari left	17:10
	← sjoshi left	17:10
	→ manojbagari joined	17:10
	← ngui left	17:10
	← fission6 left	17:10
	→ ngui joined	17:11
	← manojbagari left	17:13
	→ random_yanek joined	17:13
	← random_yanek left	17:13
	→ manojbagari joined	17:14
	← ngui left	17:15
	→ ngui joined	17:15
	→ random_yanek joined	17:16
	← nowhere_man left	17:16
	→ nowhere_man joined	17:16
	← manojbagari left	17:17
	→ acercle joined	17:17
	→ manojbagari joined	17:17
	→ fission6 joined	17:20
	← manojbagari left	17:20
	→ crimastergogo joined	17:20
	→ afuentes joined	17:20
	→ Amnesia joined	17:21
	→ manojbagari joined	17:21
Amnesia	question, how can I squeeze two commits into a single one?	17:21
	(after stuff has been pushed)	17:21
	→ Mattiaslndstrm joined	17:21
	→ rick8024 joined	17:21
	← nowhere_man left	17:22
Amnesia	(and a MR has been created as well..)	17:23
	← KnoP left	17:23
	rick8024 → KnoP	17:23
osse	Amnesia: you will have to do an interactive rebase, then force push	17:24
	← manojbagari left	17:24
osse	if it's for an MR then that's usually not a problem. It's fairly common	17:24
	→ manojbagari joined	17:24
	← yyy left	17:25
	← ngui left	17:25
	→ yyy joined	17:25
	→ ngui joined	17:26
Amnesia	hm, lemme see how this works, vim openend:D	17:26
	tyvm osse	17:26
	← bbenz left	17:26
SmashingX	osse: https://paste.centos.org/view/09556d66	17:27
	← manojbagari left	17:27
	→ Siecje joined	17:27
	→ duderonomy joined	17:27
	→ manojbagari joined	17:28
Siecje	Is it possible to view all changes in meld, Right now I can do `git difftool --tool meld` and it will open each file one at a time.	17:29
	← parsnip left	17:29
	← Mattiaslndstrm left	17:29
	← mikecmpbll left	17:30
	← manojbagari left	17:31
	lghtstkr → lightstalker	17:31
	→ manojbagari joined	17:31
	→ mat001 joined	17:32
	→ parsnip joined	17:32
	← wxg left	17:33
Siecje	Okay it is git difftool --tool meld --dir-diff	17:33
	← maryo left	17:33
	← manojbagari left	17:34
	→ manojbagari joined	17:35
	← ngui left	17:35
	→ ngui joined	17:35
	→ Mattiaslndstrm joined	17:37
guardian	if I add * in a .gitignore, does it prevent git from looking at subdirs?	17:38
	→ GreenJello joined	17:38
	← manojbagari left	17:38
grawity	generally it should, because it will match the subdirs themselves	17:38
	→ manojbagari joined	17:38
guardian	I'm failing at using both "" and "!subdir/.foo" :(	17:38
	← Amnesia left	17:39
grawity	try **	17:39
	just to make sure, are those files currently untracked?	17:39
	→ TJ- joined	17:40
	← fission6 left	17:40
guardian	no they'r enot	17:40
	the .gitignore is in a subdir of the repo	17:40
	← crimastergogo left	17:40
guardian	that subdir has further subdirs	17:40
	and does the order of patterns have importance?	17:40
	(loooong time I didn't use all that)	17:41
	→ crimastergogo joined	17:41
grawity	if files are tracked, they will remain tracked regardless of what .gitignore says about them	17:41
	← manojbagari left	17:41
	→ manojbagari joined	17:42
	→ mikecmpbll joined	17:43
	← manojbagari left	17:43
	← Siecje left	17:43
	→ fission6 joined	17:43
	→ wootehfoot joined	17:44
	→ prg318 joined	17:44
guardian	yeah in fact I think my big mistake is now paying enough attention to * vs /*	17:44
	← jwr left	17:48
	→ Envil joined	17:50
	← ngui left	17:50
	→ ngui joined	17:51
	← manuelschneid3r left	17:51
	→ AtumT joined	17:52
	← prg318 left	17:52
sleepingforest	when merging from branches, is there a way to omit the commit "merge branch X"	17:53
	→ wildlander joined	17:54
	→ prg318 joined	17:54
	← ngui left	17:55
	→ ngui joined	17:55
	← czart left	17:56
	← AtumT left	17:58
	→ AtumT joined	17:58
	← mat001 left	18:00
	→ SGrover joined	18:00
	← ngui left	18:00
	→ sanscoeur joined	18:00
	→ mat001 joined	18:00
	→ ngui joined	18:01
	→ lmat joined	18:02
SGrover	Not sure if I'm dealing with a GIT issue, or a Gitea issue (most likely). I create a pull request in Gitea from my develop branch to my master branch. It lists commits/files from the past few months. If I run git diff master develop --names-only - I see a small handful of files I have modified today.	18:02
	→ iam730 joined	18:03
lmat	What is possible in git that is not possible in SVN?	18:03
	← julius_ left	18:03
SGrover	At this point I'm going to do the manual merge, but I'm concerned my repo may be out of whack. Any feedback on this?	18:03
lmat	One's distributed, one's centralized, so being able to work without everyone having a connection to the central repo is big.	18:04
_ikke_	lmat: sane branches	18:04
lmat	Another one maybe: SVN can't merge in changes more than once?	18:04
_ikke_	lmat: I think that's not true anymore	18:04
lmat	_ikke_: I'm more interested in what a developer can do rather than how the two are implemented...if that makes sense :-)	18:04
	→ mat001_ joined	18:04
_ikke_	lmat: Well, it does benefit the developer	18:05
	← ngui left	18:05
SmashingX	Why I'm getting an error then? https://paste.centos.org/view/09556d66	18:05
	→ ngui joined	18:05
	← mat001 left	18:05
_ikke_	SmashingX: Might be that you did not set an upstream for the current branch	18:05
SmashingX	? how do I set it up?	18:06
lmat	SmashingX: git help branch; look for --set-upstream or so.	18:06
_ikke_	git branch --set-upstream-to <remote>/<branchname> <branchname>	18:06
SmashingX	before I do that what's the definition of upstream in this case?	18:07
lmat	A lot of the differences between git and svn seems to focus on the client: "merging is easy" seems mostly to be a matter of tooling.	18:07
	← alyptik left	18:07
	→ plexigras joined	18:09
e	the big difference is local branches	18:10
	merging is easy (and most things git users like are possible) because of the decentralisation	18:10
	→ orbyt_ joined	18:10
lmat	e: "merging is easy" I agree that the git client is better at presenting merges to the user, but this isn't about "git"; given a better svn client, svn should be just as good, no?	18:11
	← redrambl6s left	18:12
e	did you finish reading the sentence	18:12
lmat	e: Oh, I didn't read it correctly. How does decentralization make merging easy?	18:12
	e: Because all branches concerned are local, so it works quickly?	18:12
	← hofmann3900 left	18:12
	← redrambl5s left	18:13
e	right, the "client" (it's not really a client though) knows everything	18:15
	← nuc left	18:16
e	in svn, iirc, merges are just something that happen on the server and you get a conflicted result to clean up if they didn't work, and in order to change it the repository would have to have more state (and there'd have to be more protocol, but i guess that's less important) until it was essentially like everyone running git remotely	18:17
	→ jhulten joined	18:18
	→ nuc joined	18:20
	← nuc left	18:21
lmat	e: "it's not really a client though"? Of course it is... you type "git checkout" rather than "git get" because the git client (that is, the command-line interface) doesn't understand "get". Likewise, I have to git clone --max-depth=1 ...proj; cd proj; rm -rf .git; instead of git export ...proj; because the git client doesn't understand "export".	18:22
	→ nuc joined	18:23
lmat	e: Now, there is also a set of protocols, and that's what I'm interested in. For instance, the fact that SVN branches and tags amount to copy-on-write directories, and "pointers" in git; these are more fundamental protocol differences.	18:23
	orbyt_ → rep_bot	18:24
	rep_bot → orbyt_	18:25
lmat	"svn creates .svn directories in every folder", again a client issue (fixed in svn 7, right?)	18:26
	"You have to tell SVN whenever you move or delete something. Git will just figure it out." Again, that's because the SVN client isn't very smart, right? I mean, some fairly simple code (lifted largely from git?) could be employed to make the same magic happen in SVN...	18:26
	→ durham joined	18:27
bremner	well, in principle svn could have been identical to git, except for the name.	18:28
	So I'm not sure how useful hypotheticals are here.	18:28
	→ JeffH joined	18:29
	← planetcall\|work left	18:30
	← ngui left	18:30
	→ ngui joined	18:31
	→ chamunks joined	18:31
	← tgunr left	18:32
	← ngui left	18:35
	→ ngui joined	18:35
	← stitched_unicorn left	18:35
	→ leeN joined	18:40
	← ngui left	18:40
	→ ngui joined	18:41
	← crimastergogo left	18:42
	← ngui left	18:45
	→ royal_screwup21 joined	18:45
	→ ngui joined	18:45
	← orbyt_ left	18:45
	→ geekodour08 joined	18:45
	→ manuelschneid3r joined	18:46
	← kjartan left	18:46
royal_screwup21	my git status looks like this: https://repl.it/repls/GorgeousIntelligentCoordinate	18:46
	→ irdr joined	18:47
royal_screwup21	how do I undo those unstaged commits?	18:47
_ikke_	unstaged modified files?	18:47
	→ ChrisLane joined	18:48
lmat	"Ignore semantics are easier in git." Certainly a client issue...he just doesn't like how the ignore properties are implemented in SVN	18:48
	→ kjartan joined	18:48
	← fission6 left	18:48
royal_screwup21	_ikke_: yup...actually just realized, I can do git checkout <file>	18:48
lmat	bremner: Maybe you're right; maybe it's silly to consider "svn" apart from the svn client. Also, maybe I'm looking for a difference that I'm not allowing to exist...	18:49
royal_screwup21	_ikke_: when I do add "git add .", for some reason it doesn't stage those files	18:50
	→ Makaveli7 joined	18:50
lmat	royal_screwup21: That would be because they're the same as the index already?	18:50
	(they're pristine?)	18:50
	← axisys_ left	18:50
royal_screwup21	ahh I think I know why, it might be because I'm git add . -- the "." there stages everything in the current directory	18:50
lmat	royal_screwup21: Sure...everything that's different from the index anyway (either added or modified).	18:51
	→ czart joined	18:51
	→ ngui_ joined	18:51
	→ axisys joined	18:51
	← JeffH left	18:52
	→ orbyt_ joined	18:52
	← ngui left	18:55
	ngui_ → ngui	18:55
	→ keepLearning512 joined	18:55
	→ anderson joined	18:57
	gitinfo set mode: +v	18:57
	← jhulten left	18:57
	→ Sasazuka joined	19:01
	→ eldritch joined	19:02
	← mat001_ left	19:02
	← ngui left	19:04
	→ ozcanesen joined	19:05
	→ mat001 joined	19:05
	→ ngui joined	19:05
	→ fission6 joined	19:05
	→ Dirak joined	19:06
	→ swift1 joined	19:07
	← mat001 left	19:09
	→ alyptik joined	19:10
	← ngui left	19:10
	→ ngui joined	19:11
	← sanscoeur left	19:11
	→ geekodur08_ joined	19:12
	← geekodour08 left	19:13
	← mattcen left	19:14
	→ mattcen joined	19:16
	← Phylock left	19:16
	→ sanscoeur joined	19:20
	← sanscoeur left	19:21
	← im0nde left	19:22
	→ stitched_unicorn joined	19:23
	→ psprint joined	19:25
psprint	n	19:25
	Hello. What happened that I've suddenly have to enter password on OS X, despite that the KeyRing is there, available like before when it was working?	19:25
	← blackntan left	19:27
	← ozcanesen left	19:27
	← ngui left	19:30
	→ ngui joined	19:30
psprint	I've tried rebooting	19:30
	← satifant left	19:30
	→ sanscoeur joined	19:32
	→ jhulten joined	19:32
	← ghost43 left	19:34
	← mattcen left	19:35
	← yyy left	19:35
	← T_UNIX left	19:35
	→ ghost43 joined	19:35
	→ yyy joined	19:35
	← stitched_unicorn left	19:36
	→ im0nde joined	19:36
	→ mattcen joined	19:36
	→ Scriptonaut joined	19:38
Scriptonaut	hey, I added a submodule to a branch, everything is working fine, however when I switch branches, my status shows me that the submodule directory is an untracked file. Why is the submodule moving branches with me, shouldn't it stay on the branch I put it on?	19:39
	→ mat001 joined	19:39
	→ altendky joined	19:41
	→ satifant joined	19:44
nextloop	Scriptonaut: maybe you do not have the submodule in the other branch yet?	19:45
	← wootehfoot left	19:46
_ikke_	psprint: can you check git config credential.helper?	19:47
	→ RuckusBringer joined	19:48
	→ rar joined	19:49
rar	hey. if I rebase my branch from master (this is github), then I have to force-push as otherwise I get errors about being behind	19:49
	is there a better way?	19:50
altendky	rar: i merge so as to keep history instead of rebase which rewrites history to make it look tidy	19:50
rar	i currently fetch --all and then rebase upstream/master	19:50
altendky	rar: rebase is literally destroying all your commits and rebuilding them from a different base	19:50
rar	altendky: ok, just a basic merge?	19:51
	from the branch?	19:51
altendky	rar: --no-ff personally	19:51
Scriptonaut	nextloop: it's not in the other branch, and I don't want it in the other branch	19:51
	I want it to stay on that branch	19:51
	or should I add it to both?	19:51
rar	altendky: but will my own commit then be on top of what others have done?	19:51
osse	SmashingX: your shell is removing the {} for some reason	19:52
rar	thought I had to rebase to make that happen	19:52
osse	SmashingX: quote it	19:52
SmashingX	osse: oh, is that the problem?	19:52
	I'm using fish	19:52
osse	judging from the error message it is	19:52
SmashingX	yup you were right	19:52
	it works now	19:53
	but what is the @{upstream} in this case?	19:53
altendky	rar: this has a couple pictures https://www.atlassian.com/git/tutorials/merging-vs-rebasing	19:53
	rar: or https://hackernoon.com/git-merge-vs-rebase-whats-the-diff-76413c117333	19:54
	← ngui left	19:55
rar	altendky: ok, just asking :) I know my team mates want clean looking pull requests on github	19:55
osse	SmashingX: it's a short way of referring to whatever is the current branch's upstream branch	19:55
	→ ngui joined	19:56
	← RuckusBringer left	19:56
osse	SmashingX: e.g. master's upstream branch is usually origin/mastër	19:56
	SmashingX: run git branch -vv. the upstream branches are inside [ ]	19:56
	→ flobin joined	19:56
altendky	rar: there's plenty of opinion on this. i prefer accurate history to tidy history in most cases. especially when it's already been shared (such as pushing to a server that isn't just yours)	19:57
flobin	hi everybody	19:57
Scriptonaut	so what do I do about my submodule, do I have to just add it on the other branch?	20:00
	← ngui left	20:00
Scriptonaut	you can't have submodules only exist on certain branches	20:00
	→ ngui joined	20:00
Scriptonaut	once you add them, they must be added to the whole project?	20:00
	← sanscoeur left	20:00
SmashingX	osse: but that branch is set to origin/master by default when you set up the repository?	20:00
	→ sanscoeur joined	20:01
	← irrgit left	20:03
psprint	_ikke_: you're right, the credential-helper ... osxkeychain was commented out, I did this and forgot about it, THANKS	20:05
	← yyy left	20:05
	← orbyt_ left	20:06
	→ tarkus joined	20:07
	← Sasazuka left	20:07
	← czart left	20:10
	← ngui left	20:10
topdownjimmy	Is it possible, when doing git log -Skeyword, to also show the hunks that contain my search keyword? If I add the -p flag, it shows me all diffs, but I'd like to see only the ones that contain the keyword.	20:10
	→ ngui joined	20:10
	← mattcen left	20:14
	← ngui left	20:15
_ikke_	psprint: no problem :-)	20:15
	→ Toadisattva joined	20:15
	→ ngui joined	20:15
	→ mattcen joined	20:16
	→ fstd_ joined	20:19
nextloop	Scriptonaut: maybe you need to use git submodule deinit	20:20
	← [twisti] left	20:20
nextloop	not sure, never was in your situation	20:20
	← dviola left	20:21
	← fstd left	20:23
	fstd_ → fstd	20:23
	→ orbisvicis joined	20:24
orbisvicis	does a git patch contain enough information to checkout the revision it was intended to be applied to ?	20:24
altendky	orbisvicis: do you have a patch you are curious about? a commit hash is generally fairly recognizable	20:26
orbisvicis	it was generated by git, so it contains "from: <hash>", but that's the hash of the patch without a parent. Then there is "github.com/darktable-org/darktable.git	20:27
	err, there is "index ced51f2..eae885c 100644", I'm not sure what that means	20:28
altendky	orbisvicis: yeah, i was checking that. those hashes don't match my HEAD or latest commit that changed the file in my diff	20:29
e	lmat: i had to go answer the phone, but no, there isn't a git client	20:30
	most of the git commands simply interact with a repository	20:30
	→ Zexaron joined	20:30
e	a few establish a client-server relationship, but most don't, and any git repository can be used as a server equally as well	20:31
orbisvicis	ok its a file index, need to read up on that	20:32
	← rar left	20:35
	← acercle left	20:37
	→ malmalmal joined	20:42
	← malmalmal left	20:43
	→ malmalmal joined	20:44
	→ troulouliou_dev joined	20:44
	← keepLearning512 left	20:44
	← malmalmal left	20:45
lmat	e: There's no git client? How can you say such a thing?	20:45
	← CheckDavid left	20:46
	→ malmalmal joined	20:46
e	it's sort of fundamental to what git is	20:46
lmat	e: Maybe you're talking about a "client" in a client-server relationship? I just mean "the application used to interact with the data". Like tortoise-svn is an svn client, and tortoise-git is a git client.	20:46
	→ yyy joined	20:47
lmat	And vim is a client used to edit files in /etc, etc.	20:47
e	well, ok, but i'm not going to say anything else, then, in case you've randomly decided other words i say mean things they don't mean	20:48
lmat	e: :'( You don't recognize that use of the word "client"?	20:48
	→ n3wborn joined	20:48
lmat	e: It's really okay to have misunderstandings like that... now I know what you mean, and I agree, there's no distinction between server and client except arbitrarily when pushing and fetching.	20:49
grawity	I don't think I've seen that use of the word "client" outside describing a network client-server relationship	20:49
lmat	e: Anyway, earlier what I meant is that the big differences cited between SVN and GIT seem to have to do with the client (the application that's used to interact with the repositories) and not with the actual differences between SVN and GIT.	20:50
	← jhulten left	20:50
	→ AtumT_ joined	20:51
lmat	grawity: Check the wikipedia page for Client and search for "windos 10"	20:51
	→ jhulten joined	20:52
	→ freeman42x joined	20:53
	← AtumT left	20:53
	← yyy left	20:53
	← alyptik left	20:54
lmat	grawity: nevermind, I just removed it. Anyway, it could be that I'm misusing the term (hence the misunderstanding with Mr. e)	20:54
	← Scriptonaut left	20:54
	← Envil left	20:55
	← cbrt64 left	20:55
	← Revan- left	20:56
	→ cbrt64 joined	20:58
	→ orbyt_ joined	20:58
	→ m0viefreak joined	20:59
	← orbyt_ left	21:00
	→ orbyt_ joined	21:02
	→ AtumT joined	21:04
	← AtumT_ left	21:04
	← xcm left	21:04
	→ xcm joined	21:05
	→ mobile_c joined	21:07
	→ supernovah joined	21:15
supernovah	what are you supposed to do if your computer turned off during a mergetool	21:16
_ikke_	supernovah: what does git status say?	21:16
supernovah	standard diverge comment then: you have unmerged paths, fix conflicts and run commit, abort to abort then standard semi-verbose modification output	21:19
	if I run git mergetool will it go over all my files again	21:20
	and what about the files _BACKUP _BASE _LOCAL and _REMOTE for the last file I was checking	21:20
	→ Sasazuka joined	21:21
	→ alyptik joined	21:22
	← Makaveli7 left	21:24
supernovah	oh well guess I just have to do the same eight hours of work from yesterday again	21:24
	← ngui left	21:25
	→ ngui joined	21:26
_ikke_	:-(	21:26
	← raulp left	21:27
supernovah	be nice if microsoft updates were my decision to apply	21:27
	← malmalmal left	21:27
	→ powerbit joined	21:28
	→ raulp joined	21:28
	→ greatgatsby joined	21:29
	→ Phylock joined	21:29
	← plexigras left	21:30
	← jhulten left	21:30
	← ngui left	21:30
	→ ngui joined	21:30
	→ craigo joined	21:31
	→ jhulten joined	21:31
	← jhulten left	21:32
	← orbyt_ left	21:35
	→ z\|bandito joined	21:36
	im0nde → donlaton	21:37
	→ manuels joined	21:37
	← dudek left	21:38
	donlaton → im0nde	21:38
	→ jhulten joined	21:38
	im0nde → donlaton	21:39
	← xcm left	21:43
	donlaton → im0nde	21:43
	→ jungsubk joined	21:43
	→ xcm joined	21:43
	← jhulten left	21:44
	← duderonomy left	21:44
	→ redrambles joined	21:48
	← jungsubk left	21:51
	← redrambles left	21:59
	hahuang6- → hahuang65	22:04
	→ jhulten joined	22:05
	→ Crell joined	22:05
Crell	Hi folks. From a script environment, what's the best/easiest way to tell if two local branches are in sync? Viz, I only want to push branch X if it has differences from branch Y.	22:05
	← troulouliou_dev left	22:07
supernovah	is there a special name for the working tree, so I can git diff <hash> <working-tree> and get the +'s and minuses the right way around	22:10
jast	Crell: one way is to do `git rev-parse` on both of them	22:11
thiago	supernovah: how are they wrong now?	22:11
jast	supernovah: git diff -R <hash>	22:12
	← lacrymology left	22:12
	← Dougie187 left	22:12
jast	of course "right way around" is a matter of perspective, but that's the flag to flip things around :)	22:13
	← fission6 left	22:13
	→ TheRuckus joined	22:17
	← jhulten left	22:17
	→ sostenuto joined	22:19
	← cebor left	22:21
	← TheRuckus left	22:21
	→ cebor joined	22:21
	→ malmalmal joined	22:23
	→ jhulten joined	22:24
	→ LionsMane joined	22:24
	→ redrambl5s joined	22:25
	← xcm left	22:25
	→ xcm joined	22:25
	← q6AA4FD left	22:25
	← malmalmal left	22:26
	→ q6AA4FD joined	22:28
	← tarkus left	22:29
	← mloskot left	22:30
	→ CheckDavid joined	22:30
	← redrambl5s left	22:32
	← jhulten left	22:33
	→ redrambles joined	22:36
	← TJ- left	22:37
	← shicks_ left	22:38
	← sweatsuit left	22:39
	← redrambles left	22:40
	→ sweatsuit joined	22:40
	← GinoMan2440 left	22:42
	← AbleBacon left	22:43
	→ fission6 joined	22:44
	→ jhulten joined	22:46
	→ shicks2525 joined	22:46
	← iam730 left	22:47
	← javaJake left	22:47
	→ AbleBacon joined	22:47
	← jhulten left	22:48
	→ orbyt_ joined	22:48
	→ iam730 joined	22:49
	→ aleph- joined	22:49
	→ waffeln joined	22:49
	← AtumT left	22:50
	← flobin left	22:50
	→ jhulten joined	22:51
	→ duderonomy joined	22:52
	→ malmalmal joined	22:52
	← jhulten left	22:53
	→ jhulten joined	22:54
	← afuentes left	22:55
	← malmalmal left	22:57
	← jhulten left	22:58
	→ jhulten joined	23:00
	jakogut__ → jakogut	23:01
	← sweatsuit left	23:02
	→ javaJake joined	23:03
	→ sweatsuit joined	23:04
	← fission6 left	23:05
	→ fission6 joined	23:10
	← AbleBacon left	23:12
	← jhulten left	23:12
	← leeN left	23:13
	← sweatsuit left	23:13
	← fission6 left	23:14
	→ jhulten joined	23:14
	← mikeputnam left	23:16
	→ sweatsuit joined	23:16
	← jhulten left	23:21
	← xcm left	23:23
	→ xcm joined	23:23
	→ snowgoggles joined	23:23
	→ gkatsev joined	23:25
	→ jhulten joined	23:27
	← jhulten left	23:29
	→ jhulten joined	23:31
	→ rullie joined	23:31
rullie	hello, how do I get the diff between branch A and B and staged that difference on A?	23:32
	say I'm on A right now, and I wanna "checkout" B, but I just want it staged	23:33
	→ seni joined	23:33
seni	does doing a hard reset delete the stash?	23:33
	← greggerz left	23:34
	← jhulten left	23:38
_rgn	no	23:38
	← thiago left	23:43
	← llef left	23:43
	→ jhulten joined	23:46
	← jhulten left	23:49
	→ dpyro joined	23:49
	→ jhulten joined	23:51
	← greatgatsby left	23:52
	← rewt left	23:52
	→ rewt`` joined	23:52
	rewt`` → rewt	23:53
	← jhulten left	23:53
	← n3wborn left	23:55
	→ jhulten joined	23:55
	← foul_owl left	23:57

Logs Search ←Prev date Next date→

Channels Documentation