IRCloggy #git 2018-07-31

Provider of IRC logs since 2005.

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

	2018-07-31
	← MrAureliusR` left	00:00
	← Guest73 left	00:00
	→ Guest73 joined	00:01
	→ Artymus joined	00:03
	← cjkinni left	00:04
	← jrnieder left	00:07
ashleyk	why does git diff look so ugly	00:07
	ugh...i dont get it	00:08
	← inovas left	00:08
Eugene	!why	00:08
gitinfo	Why? Because screw you, that's why.	00:08
ashleyk	ESC[32m+ESC[mESC[32	00:08
Eugene	Those look like unescaped shell color codes	00:08
	← gyant left	00:08
ashleyk	!why	00:08
gitinfo	Why? Because screw you, that's why.	00:08
ashleyk	yes, screw me.	00:09
	→ yohnnyjoe joined	00:09
	← veegee left	00:09
ashleyk	why cant i have nice things	00:09
	→ akushner joined	00:10
	← SmashingX left	00:11
	← devbaka left	00:12
	→ inovas joined	00:13
	← yohnnyjoe left	00:13
	AirCombat → MrAureliusR	00:13
	← tristanp left	00:18
	→ monoprotic joined	00:18
	← monoprotic left	00:18
	→ monoprotic joined	00:18
	→ m00sehead joined	00:19
	← cagomez left	00:20
	→ cagomez joined	00:21
	→ SmashingX joined	00:22
	← thiago left	00:24
	← cagomez left	00:25
	→ nowhereman joined	00:29
	← nowhere_man left	00:29
	← monoprotic left	00:29
	→ ismithers joined	00:34
	← maestrojed left	00:34
	→ wpcarro joined	00:36
	← wpcarro left	00:37
	→ wpcarro joined	00:38
	← wpcarro left	00:38
	→ wpcarro joined	00:38
	← courrier left	00:38
	← ilmostro left	00:38
	← eblip left	00:39
	← wpcarro left	00:40
	→ wpcarro joined	00:40
	→ ilmostro joined	00:41
	← wpcarro left	00:41
	← nowhereman left	00:41
nedbat	ashleyk: you're seeing ESC[32m in your terminal?	00:41
	→ nowhereman joined	00:41
	→ wpcarro joined	00:41
	← scrptktty left	00:43
	→ smallville7123 joined	00:45
	← wpcarro left	00:46
	→ wpcarro joined	00:46
	← wpcarro left	00:47
	→ cjkinni joined	00:47
	→ courrier joined	00:48
	← al-damiri left	00:48
	→ wpcarro joined	00:49
	← wpcarro left	00:49
	← m0viefreak left	00:49
	→ wpcarro joined	00:49
	← RoriconKnight left	00:49
	← Orion3k left	00:50
	← wpcarro left	00:50
	→ wpcarro joined	00:50
	→ tristanp joined	00:51
	← wpcarro left	00:51
	← upperdeck left	00:51
	→ wpcarro joined	00:51
	→ BallChang-CN joined	00:52
	← wpcarro left	00:52
	→ Bobguy joined	00:52
	→ chris349 joined	00:53
chris349	I do a git pull and theres a conflict. What is the best way to commit my local version without having to delete/stash, etc?	00:54
	← smallville7123 left	00:54
	← m00sehead left	00:54
	→ smallville7123 joined	00:55
	→ aFeijo joined	00:57
aFeijo	hey guys!	00:57
	→ upperdeck joined	00:57
aFeijo	a client asked me to remove all .PSD files from his project, past and present, from the whole git history. One reason is the files sizes, over 50mb each. How can that be done?	00:57
	← kfoonamalik left	00:59
	← smallville7123 left	00:59
	→ wpcarro joined	01:00
	→ _cyril_ joined	01:01
	→ [Brain] joined	01:01
	→ smallville7123 joined	01:03
	→ leah2 joined	01:03
	← wreed left	01:04
	← Brain left	01:04
	← ferdna left	01:07
	← smallville7123 left	01:08
	← Tobbi left	01:08
	← dc13ff left	01:10
	→ durham_ joined	01:12
	→ finalbeta joined	01:12
	← durham left	01:16
	← leah2 left	01:16
	← durham_ left	01:17
ismithers	I don't know if there will be an easy way. That's a pretty big request that likely affects a number of commits aFeijo ?	01:17
	Generally people don't commit binary files due to this issue.	01:17
	← SmashingX left	01:18
ismithers	Is it out of the question to create a new repository with a single Trunk commit that excludes binary files, start from the HEAD of the current repository? Then use something like SVN or one of the git plugins to control the files? I often used a dual repository setup like that in the past.	01:18
	← Sasazuka left	01:19
	MillerBOSS → ^MillerBOSS	01:20
	→ diogenese joined	01:20
ekleog	aFeijo: This will require a full history rewrite, so everyone pulling from the repository will have to manually reset to latest version	01:20
	That said if you want to do it, git help filter-branch has an example, iirc	01:20
	s/you want/you really want/	01:21
	→ Arcatech joined	01:21
	→ applecrumble joined	01:21
	→ leah2 joined	01:22
	← moei left	01:22
	→ smallville7123 joined	01:22
	→ Persondude joined	01:24
	← vorpalblade77 left	01:25
	→ marco-v joined	01:26
	← venmx left	01:27
	← Bobguy left	01:27
	→ Orion3k joined	01:27
	← leeN left	01:28
	→ gkatsev joined	01:28
	→ cagomez joined	01:29
	← prepend left	01:30
	← tristanp left	01:31
	→ spacesuitdiver joined	01:33
	← texinwien_ left	01:33
	→ Ben^ joined	01:34
	→ eng1n joined	01:35
	→ kn-928 joined	01:35
	→ eblip joined	01:38
	→ thiago joined	01:41
	← timj1 left	01:45
	← diogenese left	01:47
	← dangbiao left	01:48
	→ dangbiao joined	01:48
	← negaduck left	01:48
	← amosbird left	01:50
	→ amosbird joined	01:50
	← Guest73 left	01:50
	→ _Patrick_ joined	01:51
	→ Guest73 joined	01:52
	→ negaduck joined	01:54
	← smallville7123 left	01:56
	→ dreiss joined	01:57
	← dviola left	01:57
	→ Vortex35 joined	01:58
	→ diogenese joined	02:01
	← Vortex34 left	02:02
	→ smallville7123 joined	02:03
aFeijo	yes, it was stupid of my client to do it with the psd files. He need to migrate that repo to github but github is failing due to files > 50mb, my client cant work without this been done. The psd files need to go no matter what.	02:03
smallville7123	Why cant i find strbuf_avail https://github.com/git/git/search?q=strbuf_avail&unscoped_q=strbuf_avail	02:04
	← Arcatech left	02:04
	← Ben^ left	02:05
ekleog	aFeijo: well, git filter-branch you go, then :) (but make a backup first, just in case, so you don't need to go through git revlog if things go wrong)	02:05
aFeijo	we have many machines with that repo, backup is not an issue ;)	02:07
	← cjkinni left	02:07
aFeijo	would this be it: git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD	02:07
	*.psd works?	02:07
	← cagomez left	02:08
	→ cjkinni joined	02:08
	→ yohnnyjoe joined	02:10
	→ vorpalblade77 joined	02:10
	← Enphuego left	02:11
	← wpcarro left	02:12
	→ moei joined	02:12
ekleog	more something like git filter-branch --index-filter 'git rm --cached --ignore-unmatch *.psd' HEAD	02:13
	← eng1n left	02:13
	← yohnnyjoe left	02:14
aFeijo	yes, running it now, removed 125 files already	02:14
	fuck me!	02:14
ekleog	?	02:15
	← smallville7123 left	02:15
	→ Darren joined	02:16
	Darren → Guest63437	02:16
	← Guest63437 left	02:16
aFeijo	thanks guys!	02:17
	→ smallville7123 joined	02:18
ekleog	:)	02:19
smallville7123	LMFAO "GIT - The information manager from hell"	02:19
aFeijo	hmmm now I git push --force, or just change .git/config for the new repo and push there?	02:19
ekleog	if you're pushing to a new upstream the easiest will likely be to directly push to github, here	02:21
	and have all the people with their repos handle the moving from one repo (one history) to the other	02:21
	← smallville7123 left	02:21
aFeijo	ok I am trying it	02:22
	no errors, files are in github now :)	02:23
	← BallChang-CN left	02:25
	→ cagomez joined	02:26
	← kn-928 left	02:28
	→ Arcatech joined	02:28
	← amirpro left	02:29
	→ cjreynolds joined	02:29
	→ amirpro joined	02:32
	← dpyro left	02:32
	→ victor1 joined	02:33
	← akushner left	02:35
	← victor1 left	02:37
	→ smallville7123 joined	02:40
	→ lagothri1 joined	02:41
smallville7123	" BARF_UNLESS_AN_ARRAY(x))" 😂	02:41
	→ victor1 joined	02:41
	← victor1 left	02:42
	← smallville7123 left	02:43
	← lagothrix left	02:44
	← CheckDavid left	02:47
	→ victor1 joined	02:50
victor1	hello everyone!	02:50
gitinfo	victor1: 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.	02:50
	→ dpyro joined	02:55
	→ TonyP[m] joined	02:57
	← cjreynolds left	03:00
	← Arcatech left	03:04
	← courrier left	03:05
	→ TheRuckus joined	03:06
	→ tristanp joined	03:06
	→ upperdeck_ joined	03:07
	← upperdeck left	03:09
	← cagomez left	03:09
	→ cagomez joined	03:09
	← diogenese left	03:11
	→ SmashingX joined	03:11
	← SmashingX left	03:11
	→ Wetmelon joined	03:11
	→ diogenese joined	03:12
	→ Toadisattva joined	03:12
	← mlopezviedma left	03:13
	→ mlopezviedma joined	03:13
	← cagomez left	03:13
	← TonyP[m] left	03:14
michael2	whats the difference between the `checkout' and `reset' subcommands? they seem to perform exactly the same basic purpose?	03:15
	e.g. doesn't `git checkout <branch>' and `git reset --hard <branch commit>' do exactly the same thing?	03:16
	→ johndoe_ joined	03:17
michael2	but git reset, only moves HEAD, but doesn't change branches?	03:19
	← diogenese left	03:22
	← tristanp left	03:22
	← johndoe_ left	03:23
	← applecrumble left	03:24
	→ diogenese joined	03:29
	← MACscr left	03:29
	← ilmostro left	03:30
	← Gustavo6046 left	03:34
	← pengwens left	03:39
	→ wreed joined	03:39
	→ bjag9 joined	03:40
Eugene	michael2 - In general terms, checkout changes where you are to a new point (switch between branches, usually); reset changes the location of where you are to a new point (changing where the branch is attached)	03:43
	← RougeR left	03:44
Eugene	checkout is /usually/ what you want	03:44
	→ Darren joined	03:46
	Darren → Guest90994	03:46
	→ orbyt_ joined	03:47
	→ epanda joined	03:48
	← epanda left	03:48
	→ epanda joined	03:48
	→ imabanana21 joined	03:53
	→ cagomez joined	03:53
	→ YuGiOhJCJ joined	03:55
	← Guest73 left	03:57
	← imabanana21 left	03:57
	← aFeijo left	03:59
	← spacesuitdiver left	04:01
	→ Arcatech joined	04:03
	→ xinus_ joined	04:05
	← marco-v left	04:05
	← mud left	04:05
	→ marco-v joined	04:06
	← Kaisyu7 left	04:06
	← Arcatech left	04:06
	→ Kaisyu7 joined	04:06
	→ jorijn joined	04:06
	→ akushner joined	04:07
	← gruetzkopf left	04:07
	← kegster left	04:07
	→ gruetzkopf joined	04:07
	→ kegster joined	04:07
	→ byte512_ joined	04:07
	→ mort joined	04:07
	← xinus left	04:08
	← Timvde left	04:08
	← byte512 left	04:08
	→ tristanp joined	04:08
	← Orion3k left	04:08
	← wagle left	04:08
	→ boshhead joined	04:08
	← boshhead left	04:08
	→ boshhead joined	04:08
	→ Maskinen joined	04:08
	→ wagle joined	04:08
	← TheRuckus left	04:09
	→ LeMike_ joined	04:10
	→ Goplat joined	04:10
	→ yohnnyjoe joined	04:10
	← jp left	04:12
	→ alyptik joined	04:12
	← brainproxy left	04:12
	→ Timvde joined	04:13
	← bjag9 left	04:14
	alyptik → jp	04:14
	→ nicht joined	04:14
	→ ilmostro joined	04:15
	← yohnnyjoe left	04:15
	→ ColdKeyboard joined	04:15
	← tristanp left	04:16
	→ Kaisyu joined	04:17
	→ spacesuitdiver joined	04:18
	← Dreadnaught left	04:20
	→ Orion3k joined	04:21
	→ synthmeat joined	04:21
	→ Dreadnaught joined	04:22
	← Dreadnaught left	04:22
	→ Dreadnaught joined	04:22
	→ Shayan-To joined	04:22
	← jhaenchen left	04:23
	→ kgz joined	04:23
	← nielsk left	04:24
	→ vdamewood joined	04:25
	→ nielsk joined	04:25
	← nicht left	04:27
	→ TheRuckus joined	04:30
	→ ahf joined	04:30
	← marco-v left	04:30
	→ Arcatech joined	04:31
	→ vinleod joined	04:32
	← vdamewood left	04:33
	vinleod → vdamewood	04:33
	← cagomez left	04:34
	← TheRuckus left	04:34
	→ tristanp joined	04:35
	← Toadisattva left	04:35
	← troyt left	04:37
	← tristanp left	04:37
	← frem left	04:38
	← vorpalblade77 left	04:39
	← Wetmelon left	04:39
	→ brainproxy joined	04:40
	→ troyt joined	04:43
	→ marco-v joined	04:43
	← MrAureliusR left	04:47
	→ smallville7123 joined	04:48
	→ jhaenchen joined	04:48
smallville7123	for a file to be successfully committed does it need to disappear from the "Changes to be committed:" list	04:48
	← troyt left	04:49
_ikke_	correct	04:49
	← akushner left	04:50
	→ deepy joined	04:51
	→ Guest73 joined	04:51
	← janx left	04:51
	← PeterReid left	04:52
	← jhaenchen left	04:53
	→ troyt joined	04:53
	→ PeterReid joined	04:53
	→ n-st joined	04:54
	← Guest73 left	04:54
	→ janx joined	04:54
	→ jhaenchen joined	04:54
smallville7123	and i need to do "git commit file" in order to successfully commit it right? or do i need to do "git push origin master" aswell	04:55
_ikke_	smallville7123: no need to specify the file explicitly	04:55
	and no, pushing is not required	04:55
smallville7123	ok	04:55
GreenJello	smallville7123, a commit is like writing a letter, and a push is like sending it	04:55
	→ gitinfo joined	04:56
	ChanServ set mode: +o	04:56
smallville7123	so if i do git commit file and the file is still in the "Changes to be committed:" list has the commit failed?	04:56
GreenJello	smallville7123, both you and 'origin' (e.g. github) have a full copy of the repo and its history, so a 'push' is telling 'origin' about your changes, so it can update its copy	04:56
	smallville7123, you can do `git add file.txt` and then `git commit -m 'some message'`	04:57
_ikke_	smallville7123: if you do git commit <otherfile>, then that change will remain uncomitted	04:57
	→ maestrojed joined	04:57
	→ howdoi joined	04:57
GreenJello	smallville7123, or if it's not an 'untracked' file (git status shows this), you can do git commit file.ext -m 'something'	04:57
smallville7123	_ikke_: i know	04:57
_ikke_	!transcript	04:58
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	04:58
GreenJello	smallville7123, but most of the time, when modifying tracked files, you can run `git commit -am 'some message'`, which automatically adds all changed files to the commit	04:58
smallville7123	for example, i do "touch file; git add file; git commit file; git status" and file is still in the "Changes to be committed:" list	04:58
_ikke_	I do recommend being very explicit in what you commit	04:58
GreenJello	I have `alias gcam="git commit -am" in my shell config, because I use it at least 20 times per day	04:59
	smallville7123, did you enter a commit message?	04:59
smallville7123	no	04:59
_ikke_	GreenJello: I have gap='git add -p' as an alias	04:59
GreenJello	_ikke_, I don't know what that does	04:59
_ikke_	GreenJello: allows you to specify per change whether to stage it or not	05:00
	→ tristanp joined	05:00
GreenJello	_ikke_, oh interesting	05:00
	→ pks_ joined	05:01
GreenJello	_ikke_, and if there are 15 changed files, does it do anything special?	05:01
	I guess you rarely have more than that in one commit, so not a big deal	05:01
_ikke_	GreenJello: It will just go file by file	05:02
	but you can also specify the files you want to use	05:02
	gap <file1> <file2>	05:02
GreenJello	that's much nicer than falling back to manually specifying paths/globs	05:02
	thanks for the tip :-)	05:02
_ikke_	and much better than using git commit -a :)	05:02
GreenJello	have an pneumonic to remember the -p?	05:02
_ikke_	--patch	05:03
	← jhaenchen left	05:03
GreenJello	thanks	05:03
cmyers	the question I had about alternates appears to have an answer: see "git pack-objects --help" - specifically, --local can make it ignore objects coming from alternates, and git repack calls git pack-objects and with -l will pass that flag	05:03
	← pks left	05:04
	pks_ → pks	05:04
	← smallville7123 left	05:05
	→ johndoe_ joined	05:05
	→ igemnace joined	05:06
	← bt_dstw left	05:06
	← Arcatech left	05:06
	→ bt_dstw joined	05:07
	← nowhereman left	05:07
	← johndoe_ left	05:07
	→ nowhere_man joined	05:08
	→ Guest73 joined	05:09
_ikke_	cmyers: good to know	05:10
	→ MrNr joined	05:12
	→ jhaenchen joined	05:12
	← brainproxy left	05:13
	← lamont left	05:13
	← marco-v left	05:15
	← Artymus left	05:17
	← jhaenchen left	05:17
	→ skisela joined	05:18
	→ bjag9 joined	05:22
	→ jhaenchen joined	05:24
	→ jhaenche_ joined	05:27
	← jhaenchen left	05:29
	← maestrojed left	05:31
	← jhaenche_ left	05:32
	← msonntag left	05:33
	← Persondude left	05:34
	→ jhaenchen joined	05:35
	→ subhojit777 joined	05:35
	→ msonntag joined	05:38
	→ BallChang-CN joined	05:39
	← jhaenchen left	05:40
	→ MrAureliusR joined	05:40
	→ brainproxy joined	05:41
	→ texasmynsted joined	05:42
	→ tsdh joined	05:43
	← vdamewood left	05:44
	→ sauvin joined	05:45
	← Guest73 left	05:45
	→ Guest73 joined	05:46
	→ marco-v joined	05:46
	← fr33domlover left	05:47
	→ jhaenchen joined	05:48
	← tristanp left	05:50
	← jhaenchen left	05:53
	← Guest73 left	05:54
	← BallChang-CN left	05:54
	→ BallChang-CN joined	05:55
	← MrAureliusR left	05:55
	← Puffball left	05:56
	← staafl left	05:56
	← hermann_1ordung left	05:56
	← LionsMane left	05:57
	← igemnace left	06:00
	→ jhaenchen joined	06:00
	→ staafl joined	06:01
	→ igemnace joined	06:02
	→ \|DM\| joined	06:02
	→ obi_jan_kenobi_ joined	06:02
	← igemnace left	06:03
	→ hermann_nordung joined	06:03
	← marco-v left	06:05
	← jhaenchen left	06:05
	→ texinwien_ joined	06:06
	→ MACscr joined	06:07
	→ gtristan joined	06:08
	→ DMmd joined	06:09
	→ Guest73 joined	06:10
	→ chele joined	06:11
	← obi_jan_kenobi_ left	06:11
	→ yohnnyjoe joined	06:11
	jakogut_ → jakogut	06:11
	→ soee joined	06:11
	→ zais joined	06:11
	← \|DM\| left	06:12
	← thiago left	06:13
	← brainproxy left	06:14
	← fatalhalt left	06:14
	← yohnnyjoe left	06:16
	→ jhaenchen joined	06:16
	← jhaenchen left	06:20
	→ obi_jan_kenobi_ joined	06:21
	← orbyt_ left	06:21
	→ jhaenchen joined	06:22
	← BallChang-CN left	06:24
	→ BallChang-CN joined	06:24
	← Perflosopher left	06:26
	→ Perflosopher joined	06:26
	→ Hounddog joined	06:26
	← jhaenchen left	06:26
	← obi_jan_kenobi_ left	06:31
	← Raed\|Laptop left	06:32
	→ Masplus joined	06:33
	← TinkerT left	06:33
	← aenesidemus left	06:33
	← kerframil left	06:34
	← texinwien_ left	06:34
	→ texinwien_ joined	06:34
	← subhojit777 left	06:34
	← jfr left	06:34
	→ Raed\|Laptop joined	06:35
	→ Raed joined	06:35
	→ TinkerT joined	06:35
	← beatzz left	06:35
	→ marco-v joined	06:35
	→ vdamewood joined	06:36
	← NightMonkey left	06:37
	← zais left	06:40
	→ kostur86 joined	06:40
	← spacesuitdiver left	06:42
	→ jhaenchen joined	06:43
	→ brainproxy joined	06:47
	← jhaenchen left	06:48
	→ tristanp joined	06:50
	→ akushner joined	06:50
	← netlar left	06:51
	← sh3iny left	06:53
	→ netlar joined	06:53
	→ jungsubk joined	06:53
	→ martinus__ joined	06:54
	→ jhaenchen joined	06:54
	← tristanp left	06:55
	→ oxymoron93 joined	06:56
	← jhaenchen left	06:59
j416	cmyers: handy. thanks.	06:59
	→ NightMonkey joined	07:00
	→ schleppel joined	07:01
	← damoando_4 left	07:03
	→ keepLearning512 joined	07:04
	← Guest90994 left	07:04
	→ nowhereman_ joined	07:05
	← nowhere_man left	07:05
	← regedit left	07:06
	← marco-v left	07:07
	← kostur86 left	07:07
	→ dmone joined	07:09
	→ fred-fri joined	07:12
	← blahdodo left	07:12
fred-fri	i just 1. created and checked out a branch 2. did a change and staged it 3. commited the change (no pushes). is there a way to get back to the state of 2. ie with the staged but not yet committed change?	07:13
	→ jhaenchen joined	07:16
	← cfoch left	07:18
oxymoron93	git reset --soft HEAD^ fred-fri	07:19
	→ blahdodo joined	07:19
	→ bsaboia joined	07:19
	← mahem1 left	07:20
fred-fri	@oxymoron93 thanks! i assume if i change a thing or two, then commit, i can just push and no one would be any wiser any of this happened?	07:20
	→ charolastra joined	07:20
	← brainproxy left	07:20
	→ abba joined	07:20
oxymoron93	if you haven't push that bad commit (as you said), no one knows about it	07:21
	← jhaenchen left	07:21
	→ jhaenchen joined	07:23
	→ sysvalve joined	07:24
	→ jfr joined	07:25
	→ damoando_4 joined	07:26
	← blahdodo left	07:27
	→ zefferno joined	07:27
	← MACscr left	07:28
	← jhaenchen left	07:28
	→ soee_ joined	07:29
	← Guest73 left	07:29
	← soee left	07:29
	→ marco-v joined	07:30
	→ blahdodo joined	07:30
	→ MACscr joined	07:30
	→ Guest73 joined	07:31
	→ DUKE_ABC joined	07:31
	← dreiss left	07:31
	→ jhaenchen joined	07:34
	← DUKE_ABC left	07:36
	→ linux_hacks joined	07:37
	← jungsubk left	07:37
nikivi	in gitignore when something ends with * what does it mean?	07:37
	I know * is a wildcard that catches everything	07:37
	i.e. I have this in my gitignore https://hastebin.com/etoquvuzis.css	07:37
	→ igemnace joined	07:37
nikivi	I want to ignore all files that have name translations.js and all files that have t10s.js somewhere in their name	07:38
linux_hacks	If my local repo is pointing to a remote branch like develop-> Feature/Branch-1 .. then how do I rebase to develop and then go back to Feature/Branch-1 again to pull latest changes	07:38
nikivi	the first one seems to work while the latter doesnt	07:38
	← jhaenchen left	07:39
linux_hacks	@nikivi.. did you test by removing the second part and adding it again?	07:39
nikivi	I have yeah	07:40
	→ jhaenchen joined	07:40
oxymoron93	linux_hacks: pls elaborate better, you have 'develop' at same commit as 'Feature/Branch-1' and now you want to update 'Feature/Branch-1' from remote repository, and rebase you 'develop' onto updated version	07:41
	← xcm left	07:41
	→ xcm joined	07:41
	→ staafl_ joined	07:43
nikivi	linux_hacks actually that worked I think after all, nvm	07:43
linux_hacks	oxymoron93: essentially JIRA admin does pull request from Feature/Branch-1 and merge in to develop branch. My goal is to sync the merged changes in develop to my branch.	07:44
	→ damoand__ joined	07:44
linux_hacks	I specified as Branch-1 in this case.. but if 10 ppl are working on 10 individual feature branches then once it's merged.. I want to bring my local copy to the latest develop branch merged by admin	07:45
igemnace	linux_hacks: where does rebase come in here? do you have unpushed commits on develop on your local repo?	07:45
	← damoando_4 left	07:45
	← jhaenchen left	07:45
oxymoron93	true igemnace	07:45
linux_hacks	igemnace: there can be potential unpushed commits on my branch	07:46
	not to develop...	07:46
igemnace	ah. a git fetch then git merge should sync up develop nicely	07:46
	→ jhaenchen joined	07:47
igemnace	as for your branch, check it out then either git merge develop or git rebase develop, depending on your preference	07:47
	← ismithers left	07:48
linux_hacks	igemnace: Let's say if I do git rebase origin/develop then would git copy latest develop branches on to feature branch am working on?	07:49
	← damoand__ left	07:50
	→ brainproxy joined	07:50
oxymoron93	after you ran git fetch it would	07:50
igemnace	sure (in a sense)	07:50
	← jhaenchen left	07:51
	← rishi left	07:52
	→ rishi joined	07:53
nikivi	how do you deal with the situation where a project needs to use a file that contains private keys	07:54
linux_hacks	igemnace: how git rebase origin/develop diff. from git rebase origin/feature/Branch1	07:54
	nikivi: what are you trying to accomplish?	07:54
nikivi	its just there is a file in the project that can't be pushed to GitHub as it contains private keys (even though repo is private)	07:55
	→ nolfie joined	07:55
	← keepLearning512 left	07:55
nikivi	and cant git ignore it because of the way deploy system works	07:55
igemnace	linux_hacks: is Branch1 your own branch?	07:55
nikivi	its annoying to always have it unstaged	07:55
linux_hacks	igemnace:yes	07:55
nikivi	and I can't use git clean -fd because of it	07:55
igemnace	linux_hacks: git rebase origin/feature/Branch1 shouldn't do anything then, as long as your local branch is up to date	07:56
linux_hacks	nikivi: so if I understand it right.. you have a private keys which you want to push for the requirement of project but GitHub won't let you do it?	07:56
nikivi	GitHub lets you do it fine but we cant do it	07:56
linux_hacks	nikivi: what do you mean we can't do it? Is it system stopping you from doing? or GitHub or git command is not pushing private key file?	07:57
	→ _nd_ joined	07:57
igemnace	nikivi: how does your deploy system work, how come it relies on gitignore	07:58
linux_hacks	igemnace: I don't know if Build guy wants to make my life miserable.. and has a very odd process.. which is causing all sorts of confusion	07:58
	→ mikecmpbll joined	07:58
	→ Arcatech joined	07:59
	← jfr left	07:59
linux_hacks	igemnace: If am working on Feature/Branch1 then essentially if admin merges more branches to develop. To sync my code from the develop branch..I had to git fetch then rebase origin/develop..	08:00
	→ rominronin joined	08:00
nikivi	nvm `git checkout .` solves it	08:00
oxymoron93	yes that makes sense linux_hacks	08:00
	→ maret joined	08:01
igemnace	linux_hacks: yep, that's standard. although you also likely want to sync up your local develop branch, in which case you do git fetch, git checkout develop, git merge, git checkout feature/Branch1, git merge develop (or git rebase develop)	08:01
	← gtristan left	08:01
nikivi	what happens when you do `git checkout .`	08:02
	reading https://git-scm.com/docs/git-checkout and cant find i	08:02
	→ jhaenchen joined	08:02
	→ keepLearning512 joined	08:03
linux_hacks	igemnace: git fetch - ?, git checkout develop -> brings my local develop to latest, git merge -> merge local feature changes to develop branch, git checkout feature/branch1? or git rebase develop?	08:03
igemnace	nikivi: it changes the working tree at . to match the one in the index	08:04
	linux_hacks: not quite. git fetch - updates remote tracking branches (so that origin/develop matches the one on the server, as well as other origin/... branches)	08:04
	linux_hacks: git checkout develop - check out your local develop branch, so you can work on it	08:05
	linux_hacks: git merge - without arguments, by default will merge the upstream version with your local version (meaning merge the new commits in origin/develop into your local develop)	08:05
	linux_hacks: git checkout feature/Branch1 - check out your local feature/Branch1, so you can work on it	08:06
	← _nd_ left	08:06
igemnace	linux_hacks: git rebase develop - re-apply any commits you have on your local feature/Branch1 (that your develop branch doesn't have) on top of new commits on your develop (that your feature/Branch1 doesn't have)	08:06
	← Arcatech left	08:07
	→ soee joined	08:07
	← jhaenchen left	08:07
	← keepLearning512 left	08:08
	← soee_ left	08:08
linux_hacks	igemnace: Thank you for detailed explaination. Now, I'm not supposed to update anything to develop .. so should I still do git checkout develop and git merge	08:08
igemnace	yep, you can still do that. that operation is simply just updating your local develop branch to match the origin/develop branch	08:09
	→ _nd_ joined	08:09
	→ Arcatech joined	08:09
	→ jfr joined	08:09
igemnace	it won't put new work into develop	08:09
oxymoron93	it won't do harm, but also it is not needed, you can work on origin/develop as well	08:09
igemnace	you can also choose to skip it if you still feel iffy about the thing	08:09
linux_hacks	igemnace: Ok great. Now, the last git rebase develop is to make sure my subsequent commits to feature/branch1 is applied after the latest commit from develop branch	08:09
	psprint_ → psprint	08:09
	→ sim590 joined	08:10
	→ jhaenchen joined	08:10
	← _aeris_ left	08:10
	← tombusby left	08:10
	→ jungsubk joined	08:10
igemnace	yep, correct. btw, since you want to skip git checkout develop and git merge, simply do git rebase origin/develop so you don't touch local develop at all	08:10
	← texinwien_ left	08:10
	→ _aeris_ joined	08:11
	→ damoando_4 joined	08:11
	← damoando_4 left	08:11
linux_hacks	now is the git checkout feature/branch1 is mandatory before git rebase develop?	08:11
	→ damoando_4 joined	08:12
	→ yohnnyjoe joined	08:12
igemnace	yep, mandatory. otherwise you might mess up some other branch that just happened to be checked out	08:12
	← damoando_4 left	08:12
cbreak	not really	08:12
	you can tell git rebase what to rebase as part of the command	08:12
oxymoron93	well there is a git checkout develop feature/branch-1	08:13
cbreak	git rebase A B # this will check out B for you	08:13
oxymoron93	rebase*	08:13
igemnace	ah, true	08:13
	→ goTAN joined	08:13
	→ leeN joined	08:14
maret	hi :) I need to find out what commits are different between remote foo compared to specific tag from remote bar. I've used git cherry foo/master bar/master tagversion -v , seems like i got what I wanted I am just not sure	08:14
linux_hacks	oxymoron93: what's this simply mean git rebase origin/feature/branch1 ?	08:14
	← Arcatech left	08:15
oxymoron93	that shouldn't do anything as igemnace told you	08:15
	unless there are more people who work on feature/branch1 ?	08:16
	→ muelleme joined	08:16
	← yohnnyjoe left	08:17
oxymoron93	but this workflow sounds like each developer has its own branch	08:17
	← Masplus left	08:18
	→ texinwien joined	08:18
	← _nd_ left	08:18
linux_hacks	oxymoron93: Potentially, expected workflow is each developer has its own branch.. but we would like freelancers use system where their team should be able to commit in to one feature branch	08:18
	→ _nd_ joined	08:18
linux_hacks	oxymoron93: rather if 10 members in freelance team then we wouldn't like it to be boggled by creating 10 branches when we know they all be delivering as one single chunk	08:18
cbreak	maret: git log foobranch..bartag	08:19
	→ Masplus joined	08:19
cbreak	that'll show commits only on bartag	08:19
	swap the args to get the opposite	08:20
	this will only work with local history obviously	08:20
	← nowhereman_ left	08:20
maret	cbreak, what with both remotes have same tags? how git knows difference?	08:20
	→ M6HZ joined	08:20
cbreak	maret: you'll have to tell it	08:21
	→ nowhereman_ joined	08:21
	→ dre_ joined	08:21
maret	how exactly?	08:22
	← brainproxy left	08:22
zxd	hi	08:22
	what's the appropiate way of getting the last commit hash it's for use in a script	08:23
_ikke_	zxd: what is the last commit?	08:23
dawik	i belive there is a sha only option for git loh	08:23
	→ Tobbi joined	08:23
dawik	log	08:23
	or even git show	08:23
cbreak	maret: full ref name or sha	08:23
_ikke_	git rev-parse HEAD	08:24
	would show the hash of the currently checked out commit	08:24
	→ kurkale6ka joined	08:24
_ikke_	git rev-parse <branchname> for the specific branch	08:24
zxd	I saw someone using last_commit_id=$(git log --format="%H" -n 1)	08:24
maret	cbreak, ok so I need to check vat sha tag points to first	08:24
_ikke_	zxd: expensive way of doing git rev-parse HEAD	08:24
oxymoron93	rev-parse is more suitable	08:24
zxd	_ikke_: yea	08:24
dawik	never heard of git-parse before	08:25
cbreak	git for-each-ref	08:25
dawik	git never stops to teach me stuff	08:25
cbreak	zxd: for-each-ref will give you all branches' commit hash	08:26
	you can then look at which one is the latest by topo or temporally	08:26
oxymoron93	there are many commands suitable for running in a scripts that people don't use often dawik	08:26
	← _aeris_ left	08:26
	→ _aeris_ joined	08:27
	← _nd_ left	08:27
	→ _nd_ joined	08:27
	→ brainproxy joined	08:28
	→ wpcarro joined	08:30
	← fred-fri left	08:30
	→ wandering_vagran joined	08:32
	→ jhaenche_ joined	08:32
	← jhaenchen left	08:32
zxd	and is there a better way to check for changed files between the last commit and its parent? right now I have 'git diff-tree --no-commit-id --name-only -r $last_commit'	08:32
	← inovas left	08:33
	← brainproxy left	08:33
dawik	gitt diff HEAD~1 HEAD~2	08:34
	← wpcarro left	08:34
	← muelleme left	08:35
	← _nd_ left	08:36
	→ _nd_ joined	08:36
zxd	thanks	08:37
	→ inovas joined	08:38
_ikke_	git diff-tree is good	08:39
heftig	and you probably mean HEAD HEAD~, otherwise it's between the current commit's parent and its parent	08:40
	zxd: git diff-tree --no-commit-id --name-only -r HEAD	08:41
j416	also, probably HEAD~ and HEAD (or the diff would be reversed -- arguably what zxd wants given how the question was phrased, but mostly not what is desired)	08:41
oxymoron93	what about git diff --name-only -z ...	08:42
j416	which command is suitable depends on the need, naturally.	08:42
oxymoron93	-z rocks with diff-tree	08:43
	← \void left	08:44
	← Tobbi left	08:45
	→ rsrx joined	08:45
	← _nd_ left	08:45
zxd	dawik: what if there are two parents like in a merge	08:45
	→ _nd_ joined	08:46
	→ jesst joined	08:47
	→ keepLearning512 joined	08:48
dawik	i dont know, with a merge it would still have one parent	08:48
	← jhaenche_ left	08:49
dawik	in my mind	08:49
cbreak	merges have two or more parents	08:50
	that what makes a merge a merge :)	08:50
	→ ToBeCloud joined	08:50
dawik	right, but once the merge is done	08:50
	gitinfo set mode: +v	08:50
	→ texinwien_ joined	08:50
dawik	its still a linear history, i thought	08:51
cbreak	it's a DAG	08:51
	← jungsubk left	08:51
cbreak	!cs	08:51
gitinfo	"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	08:51
cbreak	dawik: also check out !lol	08:51
gitinfo	dawik: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	08:51
dawik	thanks	08:51
	→ unreal_ joined	08:52
	← keepLearning512 left	08:52
	→ deathwishdave joined	08:52
	→ jhaenchen joined	08:53
	← mort left	08:53
	→ mort joined	08:53
	← texinwien left	08:54
	← unreal left	08:54
	→ keepLearning512 joined	08:55
	← _nd_ left	08:55
	→ johndoe_ joined	08:55
	→ _nd_ joined	08:56
	← skisela left	08:56
	→ newnick joined	08:58
	← Guest73 left	08:58
	→ Wappi joined	08:58
	← johndoe_ left	08:58
	→ Guest73 joined	08:58
	→ soee_ joined	09:00
	← MagicTits8 left	09:00
	→ MagicTurtle8 joined	09:01
	← soee left	09:01
	→ dhollin3 joined	09:01
	← jesst left	09:01
	→ jottr joined	09:03
	← dhollinger left	09:04
	← _nd_ left	09:05
	→ _nd_ joined	09:05
	← Guest73 left	09:05
	← tomeaton17 left	09:07
	→ tomeaton17 joined	09:07
	tomeaton17 → Guest51243	09:08
	← Guest51243 left	09:09
	→ tomeaton17_ joined	09:09
	← dre_ left	09:12
	← tomeaton17_ left	09:12
	→ MrAureliusR joined	09:13
	← _nd_ left	09:14
	→ tomeaton19 joined	09:14
	→ _nd_ joined	09:14
	→ venmx joined	09:15
	→ damoando_4 joined	09:15
	→ ismithers joined	09:17
	← jhaenchen left	09:18
	← Goplat left	09:19
	← damoando_4 left	09:19
	← Masplus left	09:20
	← catsup left	09:20
ismithers	Is a pull request a feature of various git UI/sites rather than git itself?	09:20
	→ catsup joined	09:20
bremner	more or less	09:21
	→ Masplus joined	09:21
	← alcohol left	09:21
	← catsup left	09:21
bremner	at a high level, the idea of requesting people to "pull this branch" pre-existed. See e.g. man git request-pull	09:21
gitinfo	the git-request-pull manpage is available at https://gitirc.eu/git-request-pull.html	09:21
	→ catsup joined	09:21
ismithers	That was going to be my next question. :)	09:22
	← _nd_ left	09:23
	← ToBeCloud left	09:24
ismithers	I am setting up a code review process at work and looking for good workflows essentially.	09:24
	Happy to hear suggestions if anyone has any.	09:24
	← nivag left	09:24
	← BallChang-CN left	09:25
	→ _nd_ joined	09:25
	← goTAN left	09:26
	→ alcohol joined	09:27
	← jakogut left	09:27
	→ jakogut joined	09:27
	→ timj joined	09:28
	← goweol1 left	09:28
	→ nivag joined	09:28
	← Oatmeal left	09:31
	← _nd_ left	09:34
	→ _nd_ joined	09:34
	→ pfleck joined	09:36
	→ jesst joined	09:37
	→ Cork joined	09:37
	→ brainproxy joined	09:38
	→ jhaenchen joined	09:40
	← pfleck left	09:41
	→ CheckDavid joined	09:43
	← _nd_ left	09:43
	→ _nd_ joined	09:43
	→ gxt joined	09:52
	← _nd_ left	09:52
	→ _nd_ joined	09:53
	→ pfleck joined	09:53
	→ Ruday6 joined	09:54
	← reu left	09:55
	→ damoando_4 joined	09:56
	← hiroki left	09:57
	→ beatzz joined	09:57
	→ Oatmeal joined	09:58
	← damoando_4 left	10:00
	← lankanmon left	10:01
	← beatzz left	10:01
	gitinfo set mode: +v	10:02
	← jhaenchen left	10:02
Ruday6	The password for my id_rsa is always asked for. Funnily it's not asked for ssh -T. I'm running Win10 with 2.18.0.windows.1 and the ssh-agent should run (that's why ssh only asks once, right?)	10:02
	← _nd_ left	10:02
	→ _nd_ joined	10:02
Ruday6	I'm using git via cmd (because this is what some tools env from)	10:03
	→ mikemcowie joined	10:03
j416	have you added the key to the agent (ssh-add)?	10:05
Ruday6	ssh-agent -l prints nothing	10:06
	← mikemcowie left	10:06
Ruday6	ssh-agent --version and ssh-agent --help also do print nothing	10:06
	this is cmd behaviour. cygwin seems to work fine (altough uses a different env)	10:06
	← argoneus left	10:09
	← brainproxy left	10:10
	← _nd_ left	10:11
	→ argoneus joined	10:11
	tomeaton19 → tomeaton17	10:12
	→ yohnnyjoe joined	10:13
	→ _nd_ joined	10:13
	← Kaisyu left	10:15
	→ plexigras joined	10:16
	→ zulutango joined	10:16
	→ damoando_4 joined	10:17
	← yohnnyjoe left	10:18
Ruday6	The password for my id_rsa is always asked for. Funnily it's not asked for ssh -T. I'm running Win10 with 2.18.0.windows.1 and ssh-agent should run thansk to https://github.com/ericblade/ssh-agent-cmd	10:18
	→ jhaenchen joined	10:18
	→ beefjoe joined	10:19
	→ MarioBranco joined	10:20
Ruday6	okay, I've started the ssh-agent that came with git but cmd uses the one that came with OpenSSH. oops.	10:20
	← Ruday6 left	10:21
	← damoando_4 left	10:21
	← _nd_ left	10:22
	→ Tobbi_ joined	10:22
	→ _nd_ joined	10:23
	→ Ruday6 joined	10:24
Ruday6	problem persists	10:25
	→ lacrymology joined	10:25
	→ chaosfisch joined	10:27
Ruday6	Typing ssh-keygen -p asks me if C:\Users\myname/.ssh/id_rsa should be used. These slashes don't look healthy to me.	10:28
	← tmsmith left	10:28
_ikke_	sounds like windows and posix convention mixed	10:28
	→ Simonious joined	10:29
Ruday6	weirdly enough, when I type in no password the tool complaisn that it's wrong (which is expected). Meanign that apparently the SSH tools when accessed via CMD can deal with these slashes	10:29
tomeaton17	Its really confusing on windows due to the mix of windows openssh and git's version	10:30
Ruday6	ssh -T still requires no passphrase.	10:31
	oh dang. Does git use /their/ ssh version isntead of the installed one? I know this sounds stupid but maybe I shouldn't configure my "ssh" when it's not the git ssh	10:31
	thanks tomeaton17	10:31
	← _nd_ left	10:31
	→ _nd_ joined	10:32
tomeaton17	I can't really remember. I gave up didn't have enough time to sort it out. I remember there was some ssh-agent you can activate in powershell	10:32
chaosfisch	I wanted to merge my working branch to master believing that my branch can be fast-forwarded. I initiated a "git rebase master", "git checkout master", "git push". I then realized that my working branch has diverged from the origin branch and contains one additional commit. Is there a way to see the difference that existed before my merge to master?	10:33
	→ BallChang-CN joined	10:34
	← jhaenchen left	10:36
	→ tristanp joined	10:37
	→ damoando_4 joined	10:37
	← netj left	10:38
	→ brainproxy joined	10:38
	→ netj joined	10:39
	← YuGiOhJCJ left	10:39
	→ jhaenchen joined	10:40
	→ jungsubk joined	10:40
	← _nd_ left	10:41
	→ _nd_ joined	10:41
_ikke_	chaosfisch: use man git reflog to find the state of your branch before the rebase	10:41
gitinfo	chaosfisch: the git-reflog manpage is available at https://gitirc.eu/git-reflog.html	10:41
_ikke_	chaosfisch: specifically, git reflog <branchname>	10:42
	← damoando_4 left	10:42
	← maret left	10:42
	← tristanp left	10:42
	→ planetcall\|work joined	10:43
chaosfisch	_ikke_: thanks will try that	10:43
	→ hiroki joined	10:43
	← hiroki left	10:43
	→ hiroki joined	10:43
	→ Baron_Lentz joined	10:44
	→ lankanmon joined	10:44
	← ShapeShifter499 left	10:45
	→ manuelschneid3r joined	10:49
	← zulutango left	10:49
chaosfisch	Alright, seems like the rebase "fast-forwarded" as expected but removed a merge commit from a different branch. That is fine. Thanks for the help.	10:49
	← _nd_ left	10:50
	→ __nd__ joined	10:50
_ikke_	those two things seem contracdicting	10:51
	rebase cannot fast-forward and remove a commit at the same time	10:51
	→ RougeR joined	10:52
	← RougeR left	10:52
	→ RougeR joined	10:52
	← dpyro left	10:53
	← tomeaton17 left	10:54
chaosfisch	_ikke_, well, I'm not sure why I had this exact difference. One commit (the merge) is missing. I merged branch A to master and my working branch B used A as a start. I rebased B to master and the commit from the merge of A to master is no longer existing now.	10:55
	→ tomeaton17 joined	10:55
	→ TomyWork joined	10:55
oxymoron93	that does not sound as expected, what are the exact commands you ran chaosfisch ?	10:57
chaosfisch	oxymoron93, in working branch "git rebase master", in master: "git merge workingbranch".	10:58
	→ damoando_4 joined	10:58
	← __nd__ left	10:59
oxymoron93	in this case, there is no merge commit created anywhere, it will result in fast forward chaosfisch	10:59
chaosfisch	oxymoron93, that is right, but a previous merge commit was lost in this process	11:00
	→ _nd_ joined	11:00
chaosfisch	for me that is acceptable as it didnt contain much information.	11:00
	← _nd_ left	11:01
	← deathwishdave left	11:02
	← damoando_4 left	11:02
	→ deathwishdave joined	11:03
	→ _nd_ joined	11:05
oxymoron93	mhm, It does not come up my mind how that could happen	11:05
	→ kurkale61 joined	11:07
chaosfisch	I have one version with slightly older working branch as a backup somewhere. I could retry the process there to see what happened. Cant make the repo public though.	11:09
Ruday6	today a backup of my config file saved me a lot of hassle #praisebackups	11:09
	← kurkale6ka left	11:10
_ikke_	Ruday6: \o/	11:10
	← brainproxy left	11:12
	→ Kronuz joined	11:12
	← _nd_ left	11:14
	← jhaenchen left	11:14
	→ _nd_ joined	11:14
	← Ruday6 left	11:14
	→ Justanick joined	11:18
	← marco-v left	11:18
	→ muelleme joined	11:19
	→ jhaenchen joined	11:22
	→ wpcarro joined	11:23
	← _nd_ left	11:23
	→ __nd__ joined	11:23
	← keepLearning512 left	11:23
	← muelleme left	11:25
	← jesst left	11:25
	→ ohcibi joined	11:26
	← wpcarro left	11:27
	← amirpro left	11:28
	→ amirpro joined	11:30
	→ Anticom joined	11:31
	← __nd__ left	11:32
	→ _nd_ joined	11:32
	← amirpro left	11:32
	→ amirpro joined	11:33
	→ keepLearning512 joined	11:33
	→ aenesidemus joined	11:36
	← keepLearning512 left	11:38
	→ brainproxy joined	11:39
	← jhaenchen left	11:39
	→ jhaenchen joined	11:40
	→ jesst joined	11:40
	→ CodeSlingerPaul joined	11:41
	← _nd_ left	11:41
	→ xaa joined	11:42
	→ _nd_ joined	11:42
	← jp left	11:44
	→ mahem1 joined	11:45
	→ jp joined	11:45
	← bergice_ left	11:48
	← chaosfisch left	11:48
	→ RoriconKnight joined	11:49
	→ PedolordIV joined	11:50
	→ keepLearning512 joined	11:50
	← RoriconKnight left	11:51
	← PedolordIV left	11:51
	← _nd_ left	11:51
	→ PedolordIV joined	11:52
	→ _nd_ joined	11:53
	← PedolordIV left	11:53
	→ PedolordIV joined	11:54
	← Anticom left	11:54
	← PedolordIV left	11:55
	← rominronin left	11:57
	→ rominronin joined	11:58
	← DMmd left	11:59
	→ Darcidride joined	11:59
	← Darcidride left	12:00
	→ soee joined	12:00
	← Masplus left	12:01
	← jesst left	12:01
	← soee_ left	12:01
	← jhaenchen left	12:01
	→ muelleme joined	12:02
	← _nd_ left	12:02
	→ _nd_ joined	12:02
	→ soee_ joined	12:05
	← soee left	12:05
	→ jhaenchen joined	12:05
	← BallChang-CN left	12:06
	← muelleme left	12:07
	← Typhon left	12:08
	← ismithers left	12:10
	← _nd_ left	12:11
	→ Anticom joined	12:11
	→ _nd_ joined	12:11
	← brainproxy left	12:11
	→ rominron_ joined	12:14
	→ yohnnyjoe joined	12:14
	→ rominro__ joined	12:15
	← rominron_ left	12:16
	← rominronin left	12:16
	← yohnnyjoe left	12:18
	→ T_UNIX joined	12:20
	← _nd_ left	12:20
	→ _nd_ joined	12:21
	← MrAureliusR left	12:21
	← wreed left	12:22
	← jhaenchen left	12:22
	→ jhaenchen joined	12:23
	→ marco-v joined	12:25
	← MagicTurtle8 left	12:25
	← manuelschneid3r left	12:28
	→ wreed joined	12:30
	← _nd_ left	12:30
	→ m00sehead joined	12:30
	→ _nd_ joined	12:30
	→ courrier joined	12:31
	← courrier left	12:32
heftig	a tag object knows its own name?	12:33
	→ BallChang-CN joined	12:33
	← jhaenchen left	12:39
	← _nd_ left	12:39
	← Justanick left	12:39
	→ jhaenchen joined	12:40
	← rominro__ left	12:40
	→ Typhon joined	12:41
	→ _nd_ joined	12:41
	→ rominronin joined	12:41
	← MoziM left	12:41
	→ brainproxy joined	12:42
	→ kerframil joined	12:43
	← marco-v left	12:44
	→ nikio_ joined	12:44
	→ lamont joined	12:45
	← rominronin left	12:46
	← amirpro left	12:47
	← inovas left	12:47
	← GreenJello left	12:49
	← _nd_ left	12:49
	→ __nd__ joined	12:50
	→ GreenJello joined	12:50
	→ subhojit777 joined	12:50
	→ AndresInSpace joined	12:50
	→ marco-v joined	12:50
	← RougeR left	12:50
	← GreenJello left	12:51
	→ rominronin joined	12:51
	→ Raybih joined	12:52
	→ inovas joined	12:54
	← __nd__ left	12:59
	→ _nd_ joined	12:59
	→ fmcgeough joined	13:00
	← beefjoe left	13:02
	← Arcaelyx left	13:02
	← abba left	13:02
	← rominronin left	13:03
	← oxymoron93 left	13:03
	← jhaenchen left	13:05
	→ jhaenchen joined	13:06
	← _nd_ left	13:08
	→ _nd_ joined	13:09
	← BallChang-CN left	13:09
	→ diginaut joined	13:12
	← jhaenchen left	13:14
	→ Arcaelyx joined	13:15
	nowhereman_ → nowhere_man	13:15
	← brainproxy left	13:15
	→ rafasc joined	13:16
	→ rominronin joined	13:16
	→ fairuz joined	13:18
	← _nd_ left	13:18
	→ jhaenchen joined	13:18
	← Raybih left	13:19
	→ _nd_ joined	13:19
	→ ableto joined	13:21
	→ ok91 joined	13:22
	→ IanLiu joined	13:23
	→ LionsMane joined	13:24
	← jp left	13:24
	→ jp joined	13:24
	← jungsubk left	13:26
	← vdamewood left	13:26
	→ prepend joined	13:27
	← peepsalot left	13:27
	← _nd_ left	13:28
	→ _nd_ joined	13:32
	← prg318 left	13:32
	→ prg318 joined	13:34
	← keepLearning512 left	13:36
	← matth1askrgr left	13:36
	→ keepLearning512 joined	13:36
	← spaces left	13:36
	← nowhere_man left	13:37
	← argoneus left	13:37
	← pagios left	13:37
	→ nowhere_man joined	13:38
	→ _abs_ joined	13:39
	→ argoneus joined	13:40
	← tobiasvl left	13:40
	← _nd_ left	13:41
	→ _nd_ joined	13:41
	← rominronin left	13:44
	→ brainproxy joined	13:44
	→ rominronin joined	13:44
	→ nathdwek joined	13:46
nathdwek	Hey guys, is there an easy way to avoid doing the same manual merge over and over when merging from master to a feature branch?	13:46
	→ applecrumble joined	13:47
	→ MunchCrunch joined	13:47
nathdwek	I am working on master and feature at the same time, I must have done something not entirely "clear" to git because now everytime I merge from master into feature, I have to manually solve the same conflict	13:48
	← rominronin left	13:48
	← _nd_ left	13:50
	→ muelleme joined	13:51
	← subhojit777 left	13:51
	→ _nd_ joined	13:51
	→ z1haze joined	13:52
z1haze	Hi, I am wondering if force pushing to master being denied is a git issue in itself, or some default setting with github?	13:52
	I have a brand new repo. I'm the only one who uses it, there is no issue with me force pushing here, but it won't let me	13:53
	← jhaenchen left	13:53
	← fairuz left	13:53
	← marco-v left	13:55
	← MarioBranco left	13:56
	→ MarioBranco joined	13:56
	← muelleme left	13:56
	→ jhaenchen joined	13:57
canton7	nathdwek, that doesn't sound right. If you do a merge and later do a rebase you can get the same conflict popping up.... but that's not the case you're describing	13:57
	nathdwek, man git rerere anyway	13:58
gitinfo	nathdwek: the git-rerere manpage is available at https://gitirc.eu/git-rerere.html	13:58
nathdwek	waw canton7 never knew about this	13:58
canton7	nathdwek, if you set rerere.autoUpdate as well as rerere.enabled, it will do its thing automatically. See man git config	13:58
gitinfo	nathdwek: the git-config manpage is available at https://gitirc.eu/git-config.html	13:58
canton7	yeah, rerere is one of those hidden gems	13:58
	→ up_here joined	13:59
nathdwek	Since the feature is relatively new, I decided to nuke it and use a rebase only flow for it	13:59
	→ OMGOMG joined	13:59
canton7	z1haze, are you trying and failing to push to GitHub?	13:59
nathdwek	but I'll remember for next time	13:59
	(I am the only one working on it so should be no issue and a bit cleaner	13:59
	)	13:59
z1haze	just rejecting my force push	13:59
	→ tvl joined	13:59
up_here	Can I checkout a file under a different name?	13:59
	← applecrumble left	13:59
	tvl → tobiasvl	13:59
z1haze	im not seeing any settings anywhere in the repo that would allow turn on/off force pushing	13:59
canton7	z1haze, again, is it GitHub you're trying to force-push to?	14:00
	→ g00s joined	14:00
z1haze	yes	14:00
	i normally work in bitbucket so im not familiar	14:00
	→ tristanp joined	14:00
canton7	it's in the branch protection stuff	14:00
	Settings -> Branches -> Protected Branches	14:00
	← _nd_ left	14:00
canton7	Bitbucket has something very similar	14:00
	→ _nd_ joined	14:00
canton7	up_here, git show commit:path/to/file > path/to/new/file	14:01
up_here	ah, thanks.	14:01
	← MarioBranco left	14:01
	dhollin3 → dhollinger	14:01
	→ MarioBranco joined	14:02
	→ Rudy joined	14:03
	← MarioBranco left	14:03
	Rudy → Guest1113	14:03
	→ Masplus joined	14:04
	← jcarpenter2 left	14:04
	→ bongjovi joined	14:05
	→ wpcarro joined	14:05
	← Guest1113 left	14:05
	← jhaenchen left	14:06
	← MunchCrunch left	14:06
	← sauvin left	14:06
	→ quakenetORG joined	14:06
	→ MunchCrunch joined	14:06
	← quakenetORG left	14:08
	→ frem joined	14:08
	← MunchCrunch left	14:08
	← _nd_ left	14:09
	← wpcarro left	14:09
	→ __nd__ joined	14:09
	→ jhaenchen joined	14:10
	→ jcarpenter2 joined	14:10
	→ rominronin joined	14:11
	→ maximjaffe joined	14:11
	→ Branflakes joined	14:11
	← nowhere_man left	14:11
	gitinfo set mode: +v	14:11
	→ nowhere_man joined	14:11
Branflakes	Is it possible to duplicate a remote branch for the sole purposes of testing as a throwaway without it becoming part of the tree?	14:12
	→ aeonzh joined	14:12
z1haze	canton7, I dont have anything in the protected branches	14:12
	← nathdwek left	14:13
canton7	what's the message when you try to force-push?	14:13
z1haze	typical force push rejection message	14:13
Branflakes	I'm reworking like 300 files and want to prevent the conflict nightmare ahead of time by updating the branch against master on a throwaway branch.	14:13
canton7	z1haze, please pastebin it	14:14
z1haze	perhaps something in the ide	14:14
	→ olux joined	14:14
	→ tinanoo joined	14:14
	→ yohnnyjoe joined	14:15
	← aeonzh left	14:16
	← akushner left	14:17
	← brainproxy left	14:17
	→ cfoch joined	14:17
	→ rofl_ joined	14:18
	→ RudyM joined	14:18
	→ crose joined	14:18
	→ relipse joined	14:18
	← __nd__ left	14:18
	← crose left	14:18
	→ _nd_ joined	14:19
	→ sauvin joined	14:19
	← yohnnyjoe left	14:20
	← RudyM left	14:20
	→ RudyM joined	14:20
Branflakes	Is it possible to duplicate a remote branch for the sole purposes of testing as a throwaway without it becoming part of the tree? I'm reworking like 300 files and want to prevent the conflict nightmare ahead of time by updating the branch against master on a throwaway branch.	14:20
	← jcarpenter2 left	14:21
	← nuc left	14:21
	← rofl_ left	14:23
	← shinnya left	14:23
	→ Gustavo6046 joined	14:24
	→ nuc joined	14:24
	→ brainproxy joined	14:26
	→ reu joined	14:26
	→ matthiaskrgr joined	14:26
canton7	Branflakes, sure, just create a new branch?	14:26
	→ zenirc369 joined	14:27
canton7	what exactly do you mean by "without it becoming part of the tree"?	14:27
	matthiaskrgr → Guest2732	14:27
	→ jcarpenter2 joined	14:27
	← jhaenchen left	14:27
	← tsdh left	14:27
	← _nd_ left	14:28
	→ _nd_ joined	14:28
Branflakes	essentially, I want there to be no trace of the branch	14:29
	just need to test to see how many and the depth of the conflicts.	14:29
	I figured I should be able to checkout master and simply checkout the remote branch under a different name, but not seeing a whole lot of instructions on the web for how to pull it off.	14:30
	Everything I've been reading entails a more complex route to follow. I literally just need to duplicate the branch and test for conflicts.	14:31
	→ rofl_ joined	14:31
	← jcarpenter2 left	14:31
	→ weilbith joined	14:31
	→ thiago joined	14:32
	← Gustavo6046 left	14:32
	→ greggerz joined	14:33
	→ jcarpenter2 joined	14:34
canton7	Branflakes, when you delete a branch, then it's gone forever	14:34
	and if you never push it anywhere, then nobody else will ever know about it	14:34
	→ jhaenchen joined	14:34
canton7	maybe you're not finding anything because you're asking the wrong questions	14:35
Branflakes	correct, and you're probably right.	14:35
canton7	this might be a complex-ish question in something like SVN, but it's branching 101 in git	14:35
	→ crose joined	14:35
	→ MoziM joined	14:35
	→ jhaenche_ joined	14:36
Branflakes	yeah, I figured it's a low-hanging fruit. So, you suggest just checking out the branch -- how do I go about that given the naming? can I switch to master and checkout the branch & rename at the same time?	14:36
	← _nd_ left	14:37
	← rofl_ left	14:37
	→ foxoman joined	14:38
canton7	it sounds like you just want to create a new branch?	14:39
	← jhaenchen left	14:39
	→ Gustavo6046 joined	14:39
	→ _nd_ joined	14:39
Branflakes	Essentially, yes.	14:39
canton7	'git checkout -b newbranchname master'	14:40
	← chris349 left	14:40
	← jhaenche_ left	14:40
	← keepLearning512 left	14:41
Branflakes	Again, the situation at hand is that I'm carrying out a big reworking of about 300 files on a remote branch. Eventually I have to merge it to master. But for now, I'd like to get a feel for how many conflicts are going to be present by merging an updated master into the remote branch, and I want to do that by duplicating the remote branch and testing first as a throwaway.	14:41
	does that make sense?	14:42
	→ bachler joined	14:42
canton7	Branflakes, why don't you just try merging the branch into master? You can abort or undo the merge at any point	14:42
	→ jhaenchen joined	14:43
	← up_here left	14:43
Branflakes	trying to avoid it for now in case something goes wrong. figured there would be less chances for nuclear fallout if I did it on a duplicated branch :)	14:43
canton7	`git checkout -b temp master && git merge somebranch` then	14:44
	→ rofl_ joined	14:44
	← jcarpenter2 left	14:45
	← g00s left	14:45
Branflakes	ohhhh I see	14:45
	← rofl_ left	14:45
	→ jcarpenter2 joined	14:46
	→ pagios joined	14:46
Branflakes	so it just checks out a new local master branch and attempts to merge with the remote branch without impacting any other branches	14:46
	pretty simple if I understand it correctly -- thanks canton. indeed, simple stuff, just needed to talk it through.	14:47
canton7	that creates a new branch called 'temp' based on your local master, then merges 'somebranch' into it	14:47
	→ spacesuitdiver joined	14:47
Branflakes	nice man. thank you.	14:47
canton7	a new local* branch called 'temp'	14:47
Branflakes	right	14:47
canton7	no worries	14:48
	← Guest33293 left	14:48
	← chele left	14:48
	→ zzz joined	14:48
canton7	if it was me, I'd just checkout master and merge into it directly. You can abort with 'git merge --abort', or if it somehow succeeds, you can undo it with 'git reset --hard ORIG_HEAD' or 'git reset --hard HEAD@{1}', or probably 'git reset --hard origin/master'	14:48
	← _nd_ left	14:48
	→ _nd_ joined	14:48
	← plexigras left	14:48
	→ plexigras joined	14:50
	→ applecrumble joined	14:50
Branflakes	you're right. very sensible options.	14:50
	→ spaces joined	14:51
	→ keepLearning512 joined	14:51
	← keepLearning512 left	14:52
	→ keepLearning512 joined	14:52
	← _nd_ left	14:57
	→ _nd_ joined	14:58
	← Branflakes left	15:00
	→ modernn joined	15:02
	→ gyant joined	15:03
	← weilbith left	15:04
	← guideline left	15:05
	→ guideline joined	15:06
	← _nd_ left	15:07
	→ _nd_ joined	15:07
	← zefferno left	15:07
	← modernn left	15:08
	← jcarpenter2 left	15:08
	→ jcarpenter2 joined	15:09
	← plexigras left	15:09
	→ plexigras2 joined	15:10
	→ amirpro joined	15:10
	← amirpro left	15:14
	→ amirpro joined	15:14
	← _nd_ left	15:16
	→ _nd_ joined	15:16
	→ rofl_ joined	15:19
	← jcarpenter2 left	15:19
	→ Gustavo6056 joined	15:19
	← charolastra left	15:19
	→ jcarpenter2 joined	15:20
	← keepLearning512 left	15:21
	← rominronin left	15:21
	← Gustavo6046 left	15:21
	← spacesuitdiver left	15:22
	→ akushner joined	15:22
	← Wappi left	15:23
	← kerframil left	15:23
	→ keepLearning512 joined	15:23
	← pfleck left	15:23
	← Gustavo6056 left	15:24
	→ Gustavo6046 joined	15:24
	← rofl_ left	15:24
	← texinwien_ left	15:24
	→ rominronin joined	15:24
	← rominronin left	15:25
	← _nd_ left	15:25
	← RudyM left	15:25
	→ _nd_ joined	15:25
	→ texinwien_ joined	15:25
	→ spacesuitdiver joined	15:26
	← relipse left	15:26
	→ Guest73 joined	15:26
	→ git_n00b joined	15:27
	→ rominronin joined	15:27
	← rominronin left	15:27
	→ rominronin joined	15:28
	← rominronin left	15:28
	→ benjwadams joined	15:29
benjwadams	How can I copy a directory that doesn't exist in my current branch from another git branch?	15:30
	sorta like cherry-pick but not on the commit level, on the file/tree level	15:30
	→ rominronin joined	15:30
benjwadams	just `git checkout`, right?	15:31
_rgn	probably something like git checkout branch -- dir/	15:31
	← amirpro left	15:31
	← rominronin left	15:32
benjwadams	aye, there it is.	15:32
	← CheckDavid left	15:32
	→ dreiss joined	15:32
	→ marco-v joined	15:33
	→ kes joined	15:34
	← keepLearning512 left	15:34
	← _nd_ left	15:34
	→ __nd__ joined	15:34
	→ rominronin joined	15:36
	← madewokherd left	15:36
	← dreiss left	15:37
	→ cagomez joined	15:38
	← akushner left	15:38
	← rominronin left	15:39
	← soee_ left	15:41
	← thiago left	15:41
	← sveinse left	15:42
	← Anticom left	15:42
	→ Zexaron joined	15:43
	← __nd__ left	15:43
	→ BallChang-CN joined	15:44
	← rsrx left	15:44
	→ wpcarro joined	15:45
	→ _nd_ joined	15:45
	→ jfr__ joined	15:45
	← TomyWork left	15:46
	→ keepLearning512 joined	15:47
	→ rominronin joined	15:48
	← jfr left	15:48
	→ durham joined	15:49
	→ bsanford joined	15:49
	← Arcaelyx left	15:50
	← Tobbi_ left	15:50
	← keepLearning512 left	15:50
	→ Arcaelyx joined	15:51
	← carbon_monoxide left	15:51
	→ carbon_monoxide joined	15:52
	← Gustavo6046 left	15:53
	← _nd_ left	15:54
	→ _nd_ joined	15:54
	→ keepLearning512 joined	15:56
	← jhaenchen left	15:56
	→ jhaenchen joined	15:57
	→ Karyon joined	15:58
	→ ferdna joined	15:58
	→ Darren joined	16:00
	Darren → Guest37464	16:01
	← ableto left	16:01
	← jhaenchen left	16:02
	← keepLearning512 left	16:02
	→ beowuff joined	16:03
	← _nd_ left	16:03
	→ _nd_ joined	16:04
	→ muelleme joined	16:05
	→ keepLearning512 joined	16:05
	→ amirpro joined	16:07
	→ madewokherd joined	16:08
	→ orbyt_ joined	16:09
	← Guest73 left	16:12
	→ root2 joined	16:13
	← _nd_ left	16:13
	→ Guest73 joined	16:13
	← MoziM left	16:13
	→ _nd_ joined	16:15
	← Guest73 left	16:15
	← sysvalve left	16:15
	→ Guest73 joined	16:15
	→ yohnnyjoe joined	16:16
	← Arcaelyx left	16:17
	← moei left	16:18
	← orbyt_ left	16:20
	← yohnnyjoe left	16:20
	← jcarpenter2 left	16:20
	← IanLiu left	16:22
	← zenirc369 left	16:23
	→ peepsalot joined	16:23
	← marco-v left	16:23
	→ thiago joined	16:23
	← _nd_ left	16:23
	→ _nd_ joined	16:24
argoneus	hello, I'm a bit confused on workflow	16:24
	say there's a repository A. someone forks it into B, and I fork the fork into C, so A < B < C. I work on C, but I want to add some changes from A into my upstream(B)	16:25
	or rather pull request	16:25
	→ jhaenchen joined	16:25
argoneus	how does one generally do this?	16:25
	do I have two upstreams or do I just copypaste code	16:25
	← wpcarro left	16:27
	← nolfie left	16:27
	→ Tobbi joined	16:28
	← kurkale61 left	16:31
	← tchan left	16:31
	→ fluxAeon_ joined	16:33
	← _nd_ left	16:33
	← mikecmpbll left	16:33
	→ __nd__ joined	16:33
	← olux left	16:34
	→ tchan joined	16:35
dawik	that's actually a github-specific question, I don't know the behaviolur but would expect it to accomodate creating pull requests to repository A	16:38
	from the web interface	16:38
argoneus	ah, sorry, I'll ask differently then	16:38
	is it okay to have multiple upstreams?	16:38
_ikke_	sure	16:38
	→ orbyt_ joined	16:40
argoneus	thank you	16:41
	← __nd__ left	16:42
	← orbyt_ left	16:43
	→ _nd_ joined	16:44
	← Tobbi left	16:44
	← Guest73 left	16:46
	→ Guest73 joined	16:47
	← Masplus left	16:47
	→ jnavila joined	16:47
	→ ToBeFree joined	16:49
	← ToBeFree left	16:49
	→ ToBeFree joined	16:49
	gitinfo set mode: +v	16:49
	← tristanp left	16:50
	→ tristanp joined	16:51
	← _nd_ left	16:53
	← keepLearning512 left	16:53
	→ _nd_ joined	16:54
	→ keepLearning512 joined	16:54
	→ Darcidride joined	16:54
	→ GreenJello joined	16:55
	← nikio_ left	16:55
	← tristanp left	16:56
	← ToBeFree left	16:56
	→ tristanp joined	16:56
	→ kfoonamalik joined	16:57
	→ IADHDSD joined	16:58
	→ jcarpenter2 joined	16:58
	→ wootehfoot joined	17:01
	← _nd_ left	17:03
	→ _nd_ joined	17:03
	→ fwilson9 joined	17:03
	← fwilson9 left	17:03
	← lacrymology left	17:05
	→ obi_jan_kenobi_ joined	17:05
	→ nolfie joined	17:06
	→ the_2nd joined	17:06
the_2nd	how can I fetch data as seen here: ? https://github.com/bitcoin/bitcoin/graphs/contributors	17:07
	e.g. commits / day or added/deleted lines per person?	17:07
	via git itself	17:07
	← bsanford left	17:08
	← bongjovi left	17:08
	→ Hink2 joined	17:09
	← Hink2 left	17:09
	← root2 left	17:09
	← Darcidride left	17:10
	→ Hink21 joined	17:10
	← Hink21 left	17:10
	→ MoziM joined	17:10
	← _nd_ left	17:12
	← bsaboia left	17:12
	→ _nd_ joined	17:13
	← keepLearning512 left	17:14
	→ maryo joined	17:15
	← Zexaron left	17:16
	→ bsaboia joined	17:18
	← gxt left	17:19
	← wandering_vagran left	17:21
	← _nd_ left	17:22
	→ _nd_ joined	17:23
	← tchan left	17:23
	→ danmackay4 joined	17:24
	← danmackay4 left	17:24
	→ keepLearning512 joined	17:24
	→ cdown joined	17:25
	← venmx left	17:26
	← flaviodesousa left	17:27
	→ tchan joined	17:27
	← keepLearning512 left	17:28
	→ Ookma-Kyi joined	17:28
	→ keepLearning512 joined	17:28
Ookma-Kyi	um i accidently did git rm --cached *.ejs how do i undo it?	17:29
	→ wpcarro joined	17:29
Hello71	!undo	17:29
gitinfo	[!fixup] 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!	17:29
	← jnavila left	17:30
Ookma-Kyi	i haven't commited it yet	17:30
j416	Ookma-Kyi: git status will tell you how	17:31
	← _nd_ left	17:32
Ookma-Kyi	@j416 fatal: ambiguous argument 'head': unknown revision or path not in the working tree.	17:33
	→ _nd_ joined	17:33
	← keepLearning512 left	17:33
	→ keepLearning512 joined	17:34
	← wpcarro left	17:34
	→ wpcarro joined	17:35
Ookma-Kyi	j416: fatal: ambiguous argument 'head': unknown revision or path not in the working tree.	17:36
j416	Ookma-Kyi: what did you write?	17:36
	→ rosco_y joined	17:36
	→ olux joined	17:36
rafasc	Ookma-Kyi: you cannot undo that as there is no way yo tell what was in the staging area. The good part is that --cached only removes from the index, so you can just add them back with git add.	17:37
Ookma-Kyi	Nevermind it didn't like git reset head .	17:37
j416	rafasc: git reset	17:37
_ikke_	!head	17:37
gitinfo	[!HEAD] HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is not something that exists separately for every branch. It also is not necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)	17:37
j416	rafasc: ah, I get what you mean; nothing is to say that index == HEAD.	17:37
	indeed.	17:37
_ikke_	head is case sensitive	17:37
rafasc	git reset will not undo a rm --cached	17:37
rosco_y	can I past three lines of git output to the forum?	17:37
	(not long lines)	17:38
rafasc	j416: exactly.	17:38
j416	rafasc: it will, if that was all that was done to the file	17:38
	rosco_y: if by forum you mean this irc channel, pastebin is preferred if possible.	17:39
rafasc	j416: the result will be the same but technically it isn't doing that.	17:39
rosco_y	Thank j416 :)	17:39
	← MoziM left	17:41
rafasc	j416: especially if you use the staging area a lot.	17:41
j416	rafasc: you can't git rm --cached a file if it differs from both HEAD and work tree though, can you	17:42
	unless you add -f	17:42
	← _nd_ left	17:42
rafasc	j416: not sure to be honest.	17:42
	→ MoziM joined	17:42
	→ _nd_ joined	17:43
	← ashleyk left	17:43
j416	(I just tried)	17:43
rafasc	j416: TIL	17:44
j416	so, 'git reset HEAD -- file' would indeed be the way to undo it, unless rm --cached was used with -f	17:44
	→ ashleyk joined	17:44
j416	is my thinking right?	17:45
	→ sourcream joined	17:46
	→ besbin joined	17:46
j416	ah, no	17:47
	neither 'git add' nor 'git reset' is the definitive right one	17:47
	either can be right	17:47
	← sourcream left	17:47
j416	depending on where changes are, of course	17:47
	← rory left	17:48
rosco_y	my git pushes from my local repos to github have been working. Now I'm getting refbase errors. Do I need to rebase? https://pastebin.com/Xa1keJJB	17:48
	→ chris349 joined	17:48
_ikke_	rosco_y: it says to does not know a branch called csGenerator	17:49
	"error: src refspec csGenerator does not match any."	17:49
	→ Krenair2122 joined	17:49
	← Krenair2122 left	17:49
rosco_y	ikke_ Thanks--I do have the csGenerator repo in github, and I've made multiple pushes to it already.	17:50
j416	rosco_y: a repo is not the same thing as a branch.	17:50
_ikke_	rosco_y: git branch	17:50
j416	rosco_y: you mention branch "master" in the pastebin. Perhaps that is what you wanted.	17:50
	→ moei joined	17:50
rosco_y	I'm in the master branch both locally and in github?	17:51
j416	ok?	17:51
_ikke_	Then you have to push master probabl	17:51
	+y	17:51
	← keepLearning512 left	17:51
rosco_y	j416: thank you, I thought "master" was optional and a default.	17:51
j416	master is the name of a branch.	17:51
	there is nothing* special about it	17:51
	← _nd_ left	17:51
	→ gxt joined	17:52
	→ _nd_ joined	17:52
	← a3Dman left	17:52
Hello71	* except it's the default	17:52
rosco_y	so, should I add "master" before the csGenerator, or after it?	17:52
j416	other than that it's the default name you get when you create a repo, and some commit message generation uses it specially	17:52
Hello71	i win	17:52
j416	rosco_y: what's csGenerator?	17:52
	→ Arcatech joined	17:52
_ikke_	rosco_y: instead of it	17:52
	j416: name of the repo	17:52
	← T_UNIX left	17:52
j416	ah, the synta	17:52
	syntax	17:52
rosco_y	csGenerator is the name of my project.	17:53
	→ khmarbaise joined	17:53
j416	_ikke_: yes, trying to make a point :)	17:53
rosco_y	I'll try	17:53
kegster	Is there a way to deploy a git repo to FTP after first connecting to a remote desktop or something? (remote desktop is setup for connecting to FTP via whitelist on the remote IP)	17:53
	← foxoman left	17:53
j416	rosco_y: "csGenerator" means nothing in your context. "origin" is a reference to the remote repo, that'd be the equivalent of "csGenerator" in this case, if that makes any sense	17:54
	rosco_y: (git doesn't know what "csGenerator" is)	17:54
ashleyk	kegster, copy and paste works over remote desktop	17:54
rosco_y	j416: it didn't like "master" either.	17:54
	→ a3Dman joined	17:54
j416	rosco_y: what did you write?	17:54
	and what did you get?	17:54
rosco_y	I"ll paste it....brb	17:55
	→ keepLearning512 joined	17:55
kegster	ashleyk: i'm wanting to push to a specific branch that will (1) connect to a machine via remote desktop or something, (2) somehow command line to that box without GUI of any kind to then deploy via FTP lol	17:55
_ikke_	kegster: nothing in git supports that	17:55
kegster	as i typed it the first time, i already knew my answer	17:55
	but i was hoping someone would chime in bc idk where to even start.	17:55
j416	kegster: use an ssh tunnel or vpn	17:56
ashleyk	putting something on FTP doesnt really count as deploying...	17:56
j416	why not	17:56
kegster	ashleyk: so what's the term?	17:56
rosco_y	Here's what I got when I used "git push origin master" : https://pastebin.com/u1KWM6Ft	17:56
ashleyk	copy data ?	17:56
	→ m0viefreak joined	17:56
kegster	ashleyk: deploys the copied data to a destination?	17:56
ashleyk	kegster, i would try to keep it as simple as possible	17:57
	← xaa left	17:57
kegster	The dictionary definition for deployment is pretty straightforward. I'm curious as to why you're trying to debate the word "deploy"	17:57
ashleyk	kegster, because its complicating things	17:57
	when you use words incorrectly	17:57
kegster	ashleyk: i'm not the only one saying i didnt use incorrectly	17:58
	tell me then, why deploying to an FTP directory isnt deploying	17:58
rosco_y	I guess I can delete csGenerator on githup, and re-submit the project	17:58
ashleyk	deployments have gone through build processes	17:58
kegster	there's literally multiple repos for git ftp deployments	17:58
ashleyk	you are just copying data	17:58
kegster	ashleyk: really now?	17:59
	do you see my deployment script?	17:59
ashleyk	kegster, dont get mad at me	17:59
	you are the one asking for help for a reason	17:59
kegster	i'm not mad at you. just i think it's ridiculous you're arguing over the word deployment	17:59
	← aLeSD_ left	17:59
kegster	you are the one who assumed i'm not building anything	17:59
	i simply asked a method to move something to ftp via remote desktop	17:59
ashleyk	you dont know how to do it, that seems to be a problem on your end	17:59
	which means you dont know what you are doing	17:59
	→ wsm joined	18:00
	← wsm left	18:00
ashleyk	which is why you are complicating things for yourself by using terms incorrectly	18:00
kegster	ashleyk: so tell me then how YOU would "copy files" from a git repo to FTP once a branch is pushed up	18:00
	ashleyk: again, there's hundreds of GIT FTP DEPLOYMENT repos out there	18:00
	so i guess everyone but you is wrong	18:00
ashleyk	why not use one of the hundreds...everyone else can figure it out except you?	18:01
	← _nd_ left	18:01
kegster	ashleyk: please dont attempt to answer questions you clearly dont know the answer to. trying to make an argument over a word that i clearly used correctly is asinine	18:01
	← madewokherd left	18:01
kegster	ashleyk: because i'm needing to do more than just COPY	18:01
	ashleyk: go troll someone else	18:01
j416	rosco_y: did you read the error message and the hint?	18:01
	→ _nd_ joined	18:01
ashleyk	kegster, you started it with your asinine question	18:01
kegster	This is what happens when you don't read and you assume, ashleyk	18:01
	← rosco_y left	18:01
ashleyk	there are literally hundreds of GIT FTP DEPLOYMENT repos out there	18:01
kegster	oh yeah? ones that go thru a remote desktop?	18:01
	so, you're completely wrong for telling me i used t he word incorectly	18:02
	since FTP is just copying	18:02
j416	can we stop this please	18:02
kegster	j416: tell ashleyk to stop heckling	18:02
	this is fucking stupid	18:02
j416	I'm not your parent	18:02
kegster	lol	18:02
	you said "we"	18:02
j416	yes	18:02
kegster	so im just telling u how to get it to stop	18:02
	→ z0 joined	18:02
j416	...	18:02
kegster	im simply responding	18:02
	j416 afk	18:03
ashleyk	kegster, remote desktop makes it easier ;)	18:03
	→ polman joined	18:03
	ashleyk wipes hands and walks away	18:03
	→ graphene joined	18:04
kegster	ashleyk: this entire thing started bc YOU said deploying via ftp is not a thing as it's copying files	18:04
	then you agreed that there are FTP deployment repos out there	18:04
	and someone else even asked why you said i used the word wrong	18:04
ashleyk	i was just copying what you said	18:04
kegster	ashleyk: quit causing drama	18:04
	whatever help you do around here, you're fkn toxic	18:04
ashleyk	kegster, no one is going to help you "deploy" over remote desktop	18:04
	← deathwishdave left	18:04
ashleyk	kegster, dont cry just because you are insecure	18:04
kegster	dear god	18:04
	go fuck yourself	18:05
	youre an idiot	18:05
j416	_ikke_: can we do something about this	18:05
	please stop.	18:05
	← zzz left	18:05
j416	this is not the place for disrespecting fellow noobs.	18:05
	ChanServ set mode: +o	18:06
kegster	all i did was ask a question	18:06
	_ikke_ set mode: +q	18:06
j416	_ikke_++	18:06
_ikke_	Yes, but you can be respectful to others	18:06
	→ IanLiu_ joined	18:06
_ikke_	We're volunteers here, helping you for free	18:06
	so no need for foul language or ad-hominems	18:06
j416	ashleyk: sorry about that.	18:06
	← polman left	18:07
	→ polman joined	18:07
	← obi_jan_kenobi_ left	18:07
j416	or, who was it that asked	18:07
	I'm confused about all this now. kek	18:07
	¯\_(ツ)_/¯	18:07
	→ Dougie187 joined	18:07
	→ kegster_ joined	18:08
_ikke_	kegster asked	18:08
chris349	I do a commit and then try to push, but my local repo is out of date. How do I solve this without a merge?	18:09
j416	nod.	18:09
	chris349: rebase	18:09
chris349	j416, Does that require a reset --hard? I do not want to do that either	18:09
j416	chris349: it doesn't	18:09
	_ikke_ set mode: -q	18:09
j416	chris349: I typically prefer to work in a separate branch and rebase that regularly atop the upstream master or what have you	18:10
	← kegster_ left	18:10
kegster	_ikke_: ashleyk never helped. your volunteers start trash for no reason. someone else even agreed my use of the word was proper. her handling the situaiton the way she did was crazy. you want to blame me , fine. but there was no respect from ashleyk and this entire channel is embarassing for you banning me and not her.	18:10
j416	chris349: (for this very reason)	18:10
_ikke_	Can we now all be nice to eachother	18:10
kegster	so on that note, idc what yall say	18:10
chris349	So I just "git rebase" and nothing can go wrong?	18:10
	← _nd_ left	18:10
kegster	all i did was askk a question	18:10
	→ _nd_ joined	18:10
j416	chris349: just "git rebase" will accomplish nothing	18:10
	← polman left	18:10
chris349	Right, it gives an error Cannot rebase: You have unstaged changes.	18:10
ashleyk	kegster, i like that you stand up for yourself, but you should work on not getting triggered by so called 'drama' so easily. then you will be unstoppable	18:11
j416	chris349: above workflow is what I would recommend. If you really don't want to have a separate branch, you can 'git pull --rebase', which will work most of the time.	18:11
	← graphene left	18:11
j416	chris349: I see. Commit things you care about first. Don't rebase without having things committed.	18:11
chris349	j416, That is nice but right now how do I solve it?	18:11
j416	chris349: read above.	18:11
	→ graphene joined	18:11
chris349	I did my committ but then the push failed and so does the rebase	18:11
	Can I not just delete the commit?	18:12
j416	read above?	18:12
chris349	...Without a rebase --hard	18:12
	Change my workflow is nice for the future, but right now I need to get it back in sync	18:12
j416	rebase --hard is not a thing, and reset --hard will not be needed.	18:12
ashleyk	chris349, wouldnt the easy way be to clone the repo, put your change in there, and THEN commit....unless you want to learn the deep git solutions... git is complicated	18:12
j416	chris349: read what I said about git pull.	18:12
mmattice	you can stash your unstaged, rebase the branch, then apply the stash	18:13
	→ cdown_ joined	18:13
	→ polman joined	18:13
j416	mmattice: not always.	18:13
chris349	It would be easier just to dlete the last commit honestly	18:13
	→ Sasazuka joined	18:13
j416	applying a stash to something different can be tricky	18:13
	→ strengthen26 joined	18:13
	← strengthen26 left	18:13
j416	chris349: did you read what I wrote about git pull?	18:13
	chris349: and did you try that?	18:13
mmattice	j416: no, you can always do it. It may result in conflicts, which a rebase might as well.	18:13
	← gxt left	18:13
ashleyk	would checkout -f "delete the commit" ??	18:14
mmattice	also, stashing it saves it. If it doesn't apply cleanly, it doesn't delete the stash. You can also non-destructively apply it.	18:14
chris349	LOL git pull --rebase	18:14
	Cannot pull with rebase: You have unstaged changes.	18:14
j416	chris349: then read what I wrote right under that.	18:14
chris349	So its like a reset --hard in which any uncommited (but not conflicting) change will get wiped?	18:15
	So then how do I just DELETE the last commit I made so I can pull without made-up conflicts?	18:15
j416	chris349: it's not.	18:16
	← cdown left	18:16
	cdown_ → cdown	18:16
j416	chris349: do you care about your uncommitted changes?	18:16
ashleyk	does anyone ever use checkout -f to solve something like this...then just put the changes back and commit?	18:16
j416	mmattice: huh. I could have sworn stash pop didn't do that before.	18:16
	mmattice: I stand corrected.	18:16
	→ yohnnyjoe joined	18:16
j416	ashleyk: I rarely use checkout -f.	18:16
kegster	ashleyk: dont care. when a channel mod bans me and you get an apology for the way you handled someone asking a question. you started trash for no reason. the fact is, don't be a prick to people for no reason. blame me all you want.	18:16
	and dont wrory	18:17
	im out	18:17
	→ akushner joined	18:17
ashleyk	j416, ok	18:17
j416	kegster: sorry about that, to be honest I didn't read the full scrollback.	18:17
chris349	j416, Yes. But I might not want to commit them. Normally I can pull and that is not an issue. But with the rebase it becomes an issue	18:17
	→ sunri5e_ joined	18:18
j416	chris349: start with either stashing or committing those changes.	18:18
chris349	So then I guess merge is the best way? It looses the history but doesnt fuck up my local diretory	18:19
	← _nd_ left	18:19
	→ xinus joined	18:19
j416	I'd rebase.	18:19
	← sunri5e left	18:19
j416	merge doesn't lose history.	18:19
	→ _nd_ joined	18:20
chris349	Well I think it just added back deleted files	18:21
	Yay git!!!!	18:21
	← yohnnyjoe left	18:21
	← xinus_ left	18:22
kegster	j416: ashleyk _ikke_ i will say i apologize for poppin off, but im not gonna apologize for being treated poorly for asking a question, then having a mod mute me. that's worse than me cussing you out.	18:22
	← surfist2 left	18:22
kegster	at any rate, maybe i should have asked: i deploy to ftp all the time, but i'm required to ftp into this one server via remote desktop. is there a way around that? i know it's not a git question, but no idea where to start lol.	18:22
	regardless, i'll look elsewher heh :)	18:22
_ikke_	kegster: I muted you to deascalate and give me time to read up	18:23
	Just a couple of minutes	18:23
kegster	i do love yall tho	18:23
	:D	18:23
	→ surfist1 joined	18:23
_ikke_	I agree that ashleyks	18:23
kegster	no grudges here, even if ashley isnt very nice haha	18:23
j416	kegster; ashleyk: I read the scrollback now and my conclusion is that ashleyk behaved badly and then you responded in a bad way to that. I do agree that this is not how we would like to treat newcomers to the channel.	18:23
_ikke_	ashleyk's behaviour was not nice as well	18:24
rafasc	kegster: ashleyk: please just stop talking about it. You're making helping chris349 very hard by making so much noise. Just move on.	18:24
	← texinwien_ left	18:24
	_ikke_ set mode: -o	18:24
ashleyk	english is not my first language ¯\_(ツ)_/¯	18:24
j416	accept and move on; let's drop it.	18:24
	rafasc has a very good point.	18:24
_ikke_	ashleyk: it helps to respect the problems people have, and not trying to diminish it	18:25
	→ texinwien_ joined	18:25
ashleyk	i have a problem with english, sorry	18:25
	i do know what 'go fuck yourself' and 'youre an idiot' mean though, words dont hurt me though	18:26
j416	chris349: was your issue solved?	18:27
rafasc	ashleyk: drop it. Unless you want to be banned for real this time.	18:27
_ikke_	Ok, now that we all had our say, let's continue helping eachother instead of keep talking about it	18:27
	← sauvin left	18:27
rafasc	_ikke_++	18:27
	← surfist1 left	18:28
	→ rdococ1 joined	18:28
	← rdococ1 left	18:28
	← _nd_ left	18:28
	→ pfleck joined	18:29
	→ surfist1 joined	18:29
	← carbon_monoxide left	18:29
	→ keepLear_ joined	18:29
	← keepLearning512 left	18:30
	→ carbon_monoxide joined	18:31
	→ _nd_ joined	18:32
	← netlar left	18:33
	→ F1AATQEZ joined	18:34
	→ dpyro joined	18:35
	← pfleck left	18:35
	← wpcarro left	18:36
	→ wpcarro joined	18:37
	← rafasc left	18:38
	→ nemesit\|znc joined	18:39
	→ netlar joined	18:39
	← netj left	18:40
	← _nd_ left	18:41
	→ rafasc joined	18:41
	→ netj joined	18:42
	→ madewokherd joined	18:43
	→ _nd_ joined	18:44
	← maryo left	18:44
	→ jungsubk joined	18:45
	← graphene left	18:47
	← howdoi left	18:47
	→ fatalhalt joined	18:47
	→ graphene joined	18:47
	← _nd_ left	18:53
	→ _nd_ joined	18:53
parsnip	why wasn't git fetch suggested	18:54
	← keepLear_ left	18:54
	← graphene left	18:55
	← prepend left	18:55
parsnip	j416: when there's this many misfires, i'd start with git fetch	18:55
	→ graphene joined	18:55
	→ Fuzzy_Panda joined	18:55
parsnip	i start with git fetch always though, personally	18:55
j416	what's the context	18:56
	which question are you adding to	18:56
parsnip	j416: your suggestion to git pull	18:56
j416	git fetch and then what	18:56
	→ Puffball joined	18:56
j416	you mean 'git fetch' and then 'git rebase' separately?	18:57
parsnip	for example	18:57
j416	what's the difference	18:57
parsnip	i guess the stash was the important part here	18:57
	→ keepLearning512 joined	18:57
j416	most important was to do _something_	18:58
	← MoziM left	18:58
j416	dunno what actually happened.	18:58
	but the problem seems to have solved itself magically.	18:58
	:)	18:58
parsnip	j416: i feel using git fetch first leads to better understanding	18:58
	→ prepend joined	18:58
j416	there may be some truth in that.	18:58
	← keepLearning512 left	18:58
	→ limbo15 joined	18:58
	← limbo15 left	18:58
parsnip	i'll happily take that :)	18:59
j416	take that.	18:59
	→ MoziM joined	19:00
	← wpcarro left	19:00
	→ Ayo joined	19:00
parsnip	for example, after fetch, you can look at log and consider the strategy.	19:01
	← _nd_ left	19:02
parsnip	what if the history you fetched is horribly twisted? contacting your repo neighbors might be more important than adding your changes.	19:02
	→ kerframil joined	19:02
	→ _nd_ joined	19:02
parsnip	i guess i always review after fetching	19:02
	[Brain] → Brain	19:03
	Brain → [Brain]	19:04
	→ dystopia_17 joined	19:04
	← dystopia_17 left	19:04
	→ marianab joined	19:04
parsnip	anyways, if you git fetch first, it removes a step from the question	19:05
rafasc	parsnip: Theres truth in that. But even if you pull, you can always undo the merge locally.	19:05
parsnip	true	19:05
	so after pulling, check log	19:05
rafasc	What is more important is to know how to read the log.	19:05
	← graphene left	19:06
	← Orion3k left	19:06
parsnip	but doing in that order might encourage not looking at log	19:06
	→ graphene joined	19:06
	rafasc nods	19:06
rafasc	I do fetch first, and deal with merging rebasing in separate steps.	19:07
j416	or, just avoid the issue altogether by being brave enough to create a separate branch	19:08
	← Karyon left	19:09
	← _nd_ left	19:11
	→ __nd__ joined	19:11
rafasc	learning rebase in a deeper level also helps. :)	19:11
	→ venmx joined	19:12
	← IanLiu_ left	19:12
	→ \void joined	19:15
	→ Karyon joined	19:16
	← igemnace left	19:16
	→ sunri5e joined	19:16
j416	yes. sink before you can swim.	19:17
	or how was it.	19:17
	← sunri5e_ left	19:17
	→ rsrx joined	19:17
	→ shah4 joined	19:18
	← shah4 left	19:18
	← graphene left	19:20
	← __nd__ left	19:20
	→ _nd_ joined	19:20
	← enckse left	19:20
	→ graphene joined	19:21
	→ stutter_ joined	19:21
	→ Orion3k joined	19:22
	→ deathwishdave joined	19:22
	→ enckse joined	19:22
	← wootehfoot left	19:23
	→ g00s joined	19:29
	← _nd_ left	19:29
	← Fuzzy_Panda left	19:29
	→ _nd_ joined	19:30
	← mahem1 left	19:31
	← texinwien_ left	19:31
	→ gxt joined	19:34
	← Arcatech left	19:35
	→ keepLearning512 joined	19:35
	→ bcoca joined	19:36
	→ revan joined	19:36
	← bcoca left	19:36
	→ Arcatech joined	19:36
	← cfoch left	19:37
	→ Ishaq70 joined	19:38
	← Ishaq70 left	19:38
	← _nd_ left	19:39
	← revan left	19:39
	→ revan joined	19:39
	→ _nd_ joined	19:40
	← revan left	19:40
	→ revan joined	19:41
	← zmt01 left	19:41
	← olux left	19:42
	← Khisanth left	19:42
	← stutter_ left	19:42
	→ teward joined	19:43
	→ MEPB3 joined	19:43
	← MEPB3 left	19:43
	→ duoi228 joined	19:43
	← duoi228 left	19:43
	→ perseo_ joined	19:44
	← perseo_ left	19:45
	← mattcen left	19:45
	→ kalib joined	19:46
	← planetcall\|work left	19:46
kalib	hi guys, weird issue. I cloned a repo, made some changes and pushed to a new branch in my origin: git push origin newbranch. After that, I noticed that I pushed things that shouldn't be there. So I did: git rm --cached -r . And after that I did another git add . / git commit -m "message" / git push origin newbranch. But, still, in my origin repo I can still see this directory that should be ignored. And	19:48
	yes, it is in my .gitignore. I could see in the push logs all the D flags for all those files.. But they're still there. (Bitbucket, by the way). Any tip?	19:48
	← _nd_ left	19:49
thiago	.gitignore is irrelevant	19:49
	→ _nd_ joined	19:49
thiago	what's the point of a git rm followed by git add of the same thing?	19:49
kalib	what you mean? Shouldn't it ignore everything I include there?	19:49
thiago	it's irrelevant for the discussion	19:50
kalib	when I do a `git add .`, it should add everything, except the content listed in .gitignore, right?!	19:50
thiago	correct	19:50
kalib	So, I assume it should also delete that content from my origin.	19:50
thiago	so, before that git commit, is the content you don't want still listed in git status?	19:50
	→ xaa joined	19:50
thiago	suggestion: git rm the file syou don't want	19:51
kalib	let me check..	19:51
	gitinfo set mode: +v	19:51
kalib	fatal: pathspec 'modules/' did not match any files.	19:52
thiago	so it's deleted	19:52
kalib	So, with that, I believe that the directory is not staged, right?!	19:52
	So, why not deleted as well from my origin?	19:52
	that's my main issue.	19:52
thiago	first of all, make sure you've committed	19:52
kalib	I would assume that it would be deleted from there after my last push.. but didn't happen.	19:52
thiago	second, make sure you've pushed and it wasn't rejected	19:52
kalib	I did it.. twice.. see..	19:52
thiago	third, make sure you're loking at the correct repository at the correct commit when looking at github	19:53
	→ mattcen joined	19:53
	← kes left	19:53
kalib	git status says: On branch newbranch.. nothing to commit, working tree clean	19:53
	git remote -v	19:53
	gives me the correct one.	19:53
	when trying to git commit -m " whatever" ..	19:54
	I receive the same.. nothing to commit..	19:54
	and with git push origin newbranch..	19:54
	Everything up-to-date	19:54
	As I said.. I did push it and saw all the "D" flags for all the files inside this directory in the commit log in bitbucket.. by when clicking in source.. it is still there.	19:54
	That's the tricky part.	19:55
	→ Khisanth joined	19:55
thiago	I don't know anything about bitbucket	19:55
	so let's take the web interface out of the way: clone that repository agai	19:55
	then check out newbranch. Is the content there?	19:55
kalib	It seems that it is a bitbucket issue.. was also checking on google..	19:56
	https://community.atlassian.com/t5/Bitbucket-questions/How-to-delete-a-file-folder-from-Bitbucket-repository/qaq-p/102056	19:56
thiago	what do you mean by "D flags" ?	19:56
the_2nd	is it possible to only get the --numstat data via git log?	19:56
kalib	It seems you can't delete a remote file from a local command.	19:56
	← revan left	19:56
the_2nd	e.g. similar to --pretty=format:	19:56
kalib	but it seems that it only works for files.. I'll have to delete the branch and push it all again.. :/	19:58
	← _nd_ left	19:58
	→ _nd_ joined	19:58
	→ darth_revan joined	19:59
darth_revan	Hi guys, got a question about stashing with git	19:59
kalib	thanks thiago .. at least I'm not crazy here.. it is a bitbucket issue.	19:59
	← muelleme left	19:59
darth_revan	I'm trying to stash untracked files, and I've tried git stash --all and git stash --include-untracked	19:59
	→ zmt00 joined	19:59
darth_revan	but I get back errors about unrecognized commands	19:59
	How else can I stash untracked files?	20:00
	→ stutter_ joined	20:00
_ikke_	darth_revan: what exact command are you running	20:00
darth_revan	git stash --all	20:01
_ikke_	You have to specify a specific command when using those options	20:01
	git stash push --all or git stash push --include-untracked	20:01
darth_revan	I got this from: https://stackoverflow.com/questions/835501/how-do-you-stash-an-untracked-file#835561	20:01
	← Ookma-Kyi left	20:02
_ikke_	what verion of git do you have?	20:03
	← m00sehead left	20:03
darth_revan	I didn't see push in the options for man git-stash. Version: https://stackoverflow.com/questions/835501/how-do-you-stash-an-untracked-file#835561	20:03
gitinfo	the git-stash manpage is available at https://gitirc.eu/git-stash.html	20:03
	← prepend left	20:03
darth_revan	shit	20:03
	Version: it version 1.7.1	20:03
_ikke_	probably a tad too old	20:04
	git stash --all works for me	20:04
	1.7 is ancient	20:04
	8 years old	20:04
darth_revan	lol I got this box from a colleague	20:04
	I'm a humble intern. my first foray with VCS	20:05
	→ czart joined	20:05
	← kalib left	20:05
	← deathwishdave left	20:05
_ikke_	are you on something like centos / rhel?	20:05
	← marianab left	20:06
	← GreenJello left	20:07
	← _nd_ left	20:07
	→ _nd_ joined	20:08
	→ dreiss joined	20:08
darth_revan	Yes. Tried yum update git, and it says nothing is marked to update.	20:08
	"No packages marked for Update" ugh	20:09
_ikke_	right, they don't tend to ship recent software	20:09
	→ muelleme joined	20:09
_ikke_	they want to be 'stable'	20:09
	Though there probably is some repository somewhere where you can find newer versions	20:09
	→ maestrojed joined	20:09
	← the_2nd left	20:10
darth_revan	Yea, gonna hunt it down. I so love getting blocked by this stuff :/	20:10
_ikke_	gotta love rolling release distro's :)	20:11
darth_revan	haha	20:11
	among our own repos, I've got epel showing under yum repolist.	20:11
	I guess they don't have a newer git, which is stupid.	20:11
_ikke_	epel is the rhel commercial stable repository	20:12
	oh no, ignore that :P	20:12
darth_revan	It's the extra packages one	20:12
_ikke_	yea	20:12
	← zmt00 left	20:13
	→ kaokao joined	20:13
kaokao	When I enter git-upload-pack or git-fetch-pack I get 'git-fetch-pack' is not recognized as an internal or external command,	20:13
darth_revan	_ikke_: You have any suggestions for repos I can add to get myself a modern git?	20:13
kaokao	why does this happen?	20:14
_ikke_	darth_revan: sorry, not too familiar with the rhel ecosystem	20:14
darth_revan	:(	20:14
_ikke_	kaokao: Hard to tell if you don't provide more details	20:14
darth_revan	I'll just do a cp -r and call it a day	20:14
kaokao	_ikke_: How can I provide more details? What is needed?	20:15
_ikke_	kaokao: what distro for example?	20:15
kaokao	I'm in Windows 10	20:15
_ikke_	kaokao: do you also have a concrete issue?	20:15
	← muelleme left	20:16
kaokao	_ikke_: I'm trying to use something called gh-pages to push my site to my github-pages branch on github.com... but it tells me	20:17
	"git-upload-pack '.': git-upload-pack: command not found fatal: Could not read from remote repository."	20:17
	← _nd_ left	20:17
	→ Tobbi joined	20:17
	→ _nd_ joined	20:17
	→ dgr joined	20:17
_ikke_	How are you executing those commands?	20:17
	→ yohnnyjoe joined	20:17
_ikke_	in what shell/terminal?	20:17
	← darth_revan left	20:18
kaokao	It was working earlier today, then I added and removed some stuff (docs, html files) from the site directory, and now its giving me that for some reason	20:18
	I'm using cmder	20:18
	the windows shell	20:18
_ikke_	Did some environment variable get overwritten perhaps	20:18
kaokao	_ikke_: I did something like rm -rf index.html js docs.html	20:19
_ikke_	that should not cause this issue	20:19
kaokao	I don't understand how that could've overwritten environment variables	20:19
_ikke_	Did you install some other software?	20:20
	what does git --exec-path return?	20:20
	→ fr33domlover joined	20:20
kaokao	this is in my PATH variable btw: "\npm;;C:\Program Files\Git\usr\bin;C:\P"	20:20
	λ git --exec-path C:\Program Files\Git\mingw64/libexec/git-core	20:21
_ikke_	does C:\Program Files\Git\usr\bin container git-upload-pack?	20:21
	→ zmt00 joined	20:21
	← yohnnyjoe left	20:22
kaokao	_ikke_: checking	20:23
	→ GreenJello joined	20:23
	→ marianab joined	20:23
kaokao	_ikke_: nope. Looks like it's in alphabetical order and I get "17 getopt.exe 37 git-flow 61 git-flow-bugfix 86 git-flow-config 16 git-flow-feature 07 git-flow-hotfix 55 git-flow-init 64 git-flow-log 06 git-flow-release 13 git-flow-support 35 git-flow-version 49 gitflow-common 69 gitflow-shFlags 32 gkill.exe"	20:23
	If that's everything starting with "git" then "git-upload-pack" isn't in there	20:24
_ikke_	what about C:\Program Files\Git\mingw64/libexec/git-core	20:24
kaokao	GreenJello has joined, who originally suggested I use gh-pages	20:25
	few months ago	20:25
	← marianab left	20:25
	→ darth_revan joined	20:25
kegster	GreenJello is good people XD	20:26
	← dgr left	20:26
	← _nd_ left	20:26
	→ _nd_ joined	20:26
kaokao	_ikke_: yep, git-upload-pack.exe is in there	20:26
_ikke_	kaokao: Do you have git-bash?	20:27
kaokao	yep	20:27
	"C:\Program Files\Git\mingw64/libexec/git-core" is actually improperly formatted, everything should be backslashes	20:28
	I don't know if that affects anything	20:28
	that's just not a valid directory in the windows shell	20:28
	← mooasaurus left	20:28
	→ mooasaurus joined	20:28
kaokao	or it is... "dir" just doesn't accept it	20:28
	I have git bash	20:29
	→ durham_ joined	20:29
	→ jnavila joined	20:31
kaokao	_ikke_?	20:32
_ikke_	can you try to run it in git bash?	20:32
	git --exec-path is just an internal git path, git knows how to resolve it properly	20:32
	← fmcgeough left	20:32
kaokao	yes it works in git path	20:32
	bash*	20:32
_ikke_	did you try reinstalling git?	20:33
kaokao	I didn't	20:33
	but why	20:33
	← durham left	20:33
	← bsaboia left	20:34
	→ Forlorn_ joined	20:34
kaokao	I guess I'll try it if you think it'll work	20:34
_ikke_	It might restore whatever is messed up, though I'm not entirely sure how things are supposed to work on windows	20:34
kaokao	How do I uninstall git?	20:34
_ikke_	Not sure if you explicitly need to uninstall it	20:34
	← durham_ left	20:34
	→ MACscr\|lappy joined	20:34
kaokao	hmm I have an idea	20:35
	it's not letting me uninstall git	20:35
	← Arcatech left	20:35
kaokao	ssh-agent (PID 41400, closing is required)	20:35
	← _nd_ left	20:35
kaokao	how do I close that ssh-agent?	20:35
	→ durham joined	20:35
_ikke_	just kill the process I guess	20:36
	← maestrojed left	20:36
	hurricanehrndz → HurricaneHrndz_	20:36
kaokao	alright uninstalled	20:37
	← durham left	20:38
	← graphene left	20:39
kaokao	reinstalling	20:39
	→ graphene joined	20:40
kaokao	reinstalled	20:40
	→ _nd_ joined	20:40
chris349	j416, No. I could not delete my commit and the forced merge upon pull undid some changes. But I think it was only re-adding a previously removed file	20:40
	← martinus__ left	20:40
kaokao	_ikke_: trying again now	20:41
	← GreenJello left	20:41
kaokao	_ikke_: same error	20:41
	← graphene left	20:41
	→ Regon joined	20:41
	→ Arcatech joined	20:41
chris349	So in the future if I am working on my local machine, and make a commit, and when I try to push discover my repo is out of date, what is the best way to overcome that fake conflict (i.e. when there arent two commits against the same file)	20:42
	→ graphene joined	20:42
kaokao	_ikke_: whatdo	20:43
	→ lestaty27 joined	20:44
	← lestaty27 left	20:44
	← graphene left	20:45
	← Forlorn_ left	20:45
	→ graphene joined	20:45
kaokao	:(	20:46
	→ GreenJello joined	20:47
	→ _ADN_ joined	20:48
	← _nd_ left	20:49
kaokao	GreenJello: Can you help please	20:50
GreenJello	in a meeting	20:50
kaokao	alright	20:50
	you be around later?	20:50
	← cdown left	20:50
	→ _nd_ joined	20:51
	← j7k6 left	20:51
	← GreenJello left	20:51
	→ j7k6 joined	20:51
	→ durham joined	20:53
rafasc	kaokao: hmm. Is that an issue with only that repo? Or are you unable to push at all?	20:53
	→ badon22 joined	20:53
	← badon22 left	20:53
	← durham left	20:53
rafasc	chris349: what do you mean by fake conflict?	20:55
	→ wpcarro joined	20:55
kaokao	rafasc: I can push, I just can't use the gh-pages tool, which what i always use to setup my github site is set up (the little website github lets you host to describe your repo)	20:55
	the /site directory is ignored, I don't manually push it	20:56
	I use gh-pages	20:56
	which stopped working for some reason after I deleted some html files and dirs in site/	20:56
	earlier today	20:56
rafasc	gh-pages tool might be changing your environment variables or something like that.	20:56
	have you tried to reinstall that tool instead of git?	20:57
kaokao	rafasc: How do you mean changing them? I don't think it affects my envrionment variables	20:57
	I haven't but Ill try that now	20:57
	→ MACscr\|l_ joined	20:57
	→ deathwishdave joined	20:58
kaokao	rafasc: But even outside of gh-pages, when I enter 'git-upload-pack' into the shell I get " 'git-upload-pack' is not recognized as an internal or external command, operable program or batch file.""	20:58
	← darth_revan left	20:59
	← MACscr\|lappy left	20:59
kaokao	Never used that command outside of this situation though	20:59
rafasc	it's not meant to be used directly.	21:00
	← _nd_ left	21:00
rafasc	kaokao: can you close the shell and reopen?	21:00
kaokao	what does it do even?	21:00
	sure	21:00
	← stutter_ left	21:00
	→ _nd_ joined	21:00
rafasc	kaokao: that's the thing that manages what is sent to the server when you use git push.	21:00
	→ durham joined	21:01
kaokao	ah ook	21:01
	weirdly	21:01
	I ran "npm uninstall gh-pages"	21:01
	but when I run the script again	21:01
	I get the same exact error	21:01
	Does that mean I didn't actually uninstall gh-pages	21:02
	or that the error has nothing to do with gh-pages?	21:02
	← durham left	21:03
rafasc	I think it means something is wrong with gh-pages.	21:03
kaokao	It looks like gh-pages _is_ uninstalled	21:03
	so maybe not	21:04
rafasc	how can you even run it after uninstalling?	21:04
kaokao	no idea	21:04
	this is some npm thing	21:04
	HurricaneHrndz_ → hurricanehrndz	21:04
	→ bergice_ joined	21:05
kaokao	rafasc: I have a bunch of scripts set up that manage my project, and one of them is called "publish-pages" which runs "gh-pages -d site"	21:05
	so I do: npm run publish-pages	21:05
	and then I get	21:05
	git-upload-pack '.': git-upload-pack: command not found fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists.	21:05
rafasc	can you run gh-pages manually?	21:07
	→ troulouliou_dev joined	21:07
	← troulouliou_dev left	21:08
kaokao	rafasc I'm not sure how	21:08
	← _nd_ left	21:09
kaokao	rafasc actually I just got an "gh-pages" not found error after uninstalling	21:10
	so it looks like the problem really has to do with gh-pages	21:10
	now the git-upload-pack problem is back	21:11
	→ _nd_ joined	21:11
kaokao	after reinstalling gh-pages	21:11
	a problem which was not there this morning	21:11
	← wpcarro left	21:12
	← Karyon left	21:13
kaokao	_ikke_, rafasc are you there	21:14
	← MACscr\|l_ left	21:14
	← ferdna left	21:14
kaokao	I just fixed it with a bandaid	21:14
rafasc	I am.	21:14
	← hurricanehrndz left	21:15
kaokao	I added the output of git --exec-path	21:15
	to my shell session's PATH	21:15
	and it worked	21:15
rafasc	another hack would be configuring remote.<name>.uploadpack	21:15
j416	chris349: it's not a fake conflict, it's a normal conflict. The best way in my opinion is what I wrote to you earlier.	21:15
	← deathwishdave left	21:15
kaokao	rafasc: What does that do?	21:15
	→ borkr joined	21:16
rafasc	it tells git to use a specific upload-pack script for a specific remote.	21:17
	I would go with what you did. But I wonder what is that program doing that makes it not find the correct path.	21:18
	→ Nazca20 joined	21:18
	← Nazca20 left	21:18
kaokao	rafasc: Should I add it onto the permanent PATH value?	21:18
chris349	rafalcpp, Fake conflict = I make a commit to file1.txt, commit, and then try to push. Commit fails saying my copy is behind. Pull fails saying I have new commit. But new commit from server changes file2, or file 3. So I want to pull the change but leave everything else alone which shoud be possible because there is no real conflict for any change	21:18
kaokao	here is docs for gh-pages: https://www.npmjs.com/package/gh-pages	21:19
	→ Sasazuka__ joined	21:19
	→ wpcarro joined	21:19
	← _nd_ left	21:20
	→ isBEKaml joined	21:21
kaokao	rafasc: What the hell happened that made it stop working	21:22
	in the middle of the day	21:22
	today	21:22
	← Sasazuka left	21:22
	← khmarbaise left	21:23
	→ _nd_ joined	21:23
	← borkr left	21:26
	→ manuelschneid3r joined	21:28
	→ sunri5e_ joined	21:28
	← sunri5e left	21:28
j416	chris349: then there will be no conflicting state.	21:28
	chris349: you'll get a regular merge if you simply run 'git pull'.	21:28
	→ revolt00000 joined	21:29
	← venmx left	21:29
	→ lupine joined	21:29
	← xPucTu4 left	21:29
kaokao	rafsca you gone	21:30
	rafasc*	21:30
	→ yaymukund joined	21:31
	← _nd_ left	21:32
	→ _nd_ joined	21:32
	← xcm left	21:33
	→ xcm joined	21:33
yaymukund	hello, (how) can I get a list of branches that add lines containing a string? for context, I'm removing a method oldDeprecatedMethod and I want to figure out who's currently writing code that uses it.	21:33
	← revolt00000 left	21:33
	← keepLearning512 left	21:34
	← mattcen left	21:34
chris349	j416, I did that and a file that was deleted in a commit on the server got re-added during the merge	21:34
	← jnavila left	21:35
j416	chris349: then you added that in your branch	21:35
	chris349: (or it was re-added in a subsequent commit on the upstream branch, on your server)	21:36
	yaymukund: the -S option to git log may be useful.	21:37
	yaymukund: you'd have to script something around it.	21:37
yaymukund	j416: okay cool. I can do that. no magic plumbing command, then (kicks can)	21:37
	← jp left	21:37
j416	not out of the box	21:38
	→ scroll joined	21:38
yaymukund	I suppose it is quite specific :) thanks!	21:38
	← scroll left	21:39
	→ scroll joined	21:39
j416	I'd probably loop the branches, print their names, run git log -S for some range (from whatever commit to that branch head)) and see if I could make sense out of that	21:39
	→ jp joined	21:39
	→ revolt0000 joined	21:39
	← revolt0000 left	21:40
	← _nd_ left	21:41
	→ _nd_ joined	21:42
	→ khmarbaise joined	21:42
	← ilmostro left	21:42
	→ revolt00000 joined	21:42
	→ millerti joined	21:42
	← revolt00000 left	21:42
	→ revolt00000 joined	21:43
	← amirpro left	21:43
	← revolt00000 left	21:43
	→ revolt00000 joined	21:44
	← revolt00000 left	21:44
	→ mattcen joined	21:44
	→ ilmostro joined	21:44
	→ revolt00000 joined	21:44
	→ yohnnyjoe joined	21:45
	→ b1p joined	21:47
	→ durham joined	21:49
	← yohnnyjoe left	21:49
	← revolt00000 left	21:50
	← durham left	21:50
	← _nd_ left	21:51
	← khmarbaise left	21:51
	→ _nd_ joined	21:51
	← manuelschneid3r left	21:52
	→ basiclaser joined	21:53
	zsocw → zsoc	21:54
	← zsoc left	21:54
	→ zsoc joined	21:54
	← Dougie187 left	21:56
	← Guest73 left	21:57
	← AndresInSpace left	21:59
	→ Guest73 joined	21:59
	← aenesidemus left	21:59
	← _nd_ left	22:00
	→ _nd_ joined	22:01
	← LionsMane left	22:02
	← dpower left	22:03
	← Mrdoor left	22:04
	→ durham joined	22:05
	→ LiftLeft2 joined	22:05
	← crose left	22:05
	→ dpower joined	22:05
	← spacesuitdiver left	22:06
	→ amirpro joined	22:06
	← LiftLeft left	22:07
	→ Mrdoor joined	22:07
	← carbon_monoxide left	22:09
	← _nd_ left	22:10
	→ _nd_ joined	22:10
	→ vorpalblade77 joined	22:12
	→ carbon_monoxide joined	22:15
rafasc	kaokao: was dinner time. Idk, the only thing I can imagine happened was that maybe you installed something that messed with your path. Not sure how git can find upload-pack. Nodejs is probably being called with a different environment.	22:15
kaokao	rafasc maybe :/	22:16
	thank you for the help	22:16
	at least it ende dup working	22:16
	:p	22:16
rafasc	heh, btw gh-pages are easy to do with git alone.	22:17
	← jungsubk left	22:17
kaokao	rafasc: I was having some sort of trouble and GreenJello (frequenter of ##javascript) told me I ought to use gh-pages which sets everything up on its own pseudo-branch or something	22:18
	← _nd_ left	22:19
	← nevodka left	22:20
	→ _nd_ joined	22:21
	← Orion3k left	22:21
	← Shayan-To left	22:21
rafasc	yaymukund: j416: git grep search_string $(git for-each-ref refs/heads --format='%(objectname)')	22:22
	would this work?	22:22
	→ Shayan-To joined	22:22
	← graphene left	22:24
rafasc	or: git grep search_string $(git for-each-ref refs/heads --format='%(objectname)') \| name-rev --stdin	22:24
	at least it's a starting point.	22:24
	→ graphene joined	22:24
	← mattcen left	22:24
j416	if looking at the tips of each branch is sufficient, why not	22:25
rafasc	kaokao: yea, but recently I think you can even set up github to use a directory that lives inside your repo as th gh-pages.	22:26
	← nolfie left	22:26
kaokao	rafasc that's standard ain't it	22:26
rafasc	kaokao: that's new. When gh-pages got introduced, an orphan branch was used. But I guess it was difficult to setup for people not comfortable with git.	22:27
	kaokao: git checkout --orphan gh-pages; git read-tree --empty; git add docfiles.txt; git push;	22:30
	← _nd_ left	22:30
	→ mattcen joined	22:30
rafasc	kaokao: but yea, it may be a tad confusing as those two branches have different files at the root dir.	22:30
	→ richimatteo joined	22:30
rafasc	but after initializing, it's easy. Works as any other branch.	22:32
	→ _nd_ joined	22:32
	→ RougeR joined	22:33
	← RougeR left	22:33
	→ RougeR joined	22:33
	→ Orion3k joined	22:33
	← greggerz left	22:34
	← Guest37464 left	22:35
	← applecrumble left	22:35
	← richimatteo left	22:35
kaokao	rafasc: Right	22:37
	whatever gh-pages does, it's not a separate branch	22:37
	→ richimatteo joined	22:37
kaokao	as it doesn't get listed in git bracnh	22:37
	branch*	22:37
rafasc	when you switch to it for editing, what's the output of $git describe --all	22:39
	?	22:39
	Sasazuka__ → Sasazuka	22:40
	← _nd_ left	22:41
	← Soni left	22:42
	→ _nd_ joined	22:43
yaymukund	If anyone was curious, here's my lil' script that finds all branches that introduce (or remove) a function: https://gist.github.com/yaymukund/a87671a649487383081f15f7e8cdbba3	22:43
	← durham left	22:44
yaymukund	rafasc: oh! didn't see your one-liner. that looks promising	22:44
kaokao	rafasc: Switch to the directory you mean?	22:45
	→ durham joined	22:45
	← akushner left	22:46
	← Puffball left	22:46
	→ Arcaelyx joined	22:46
	← richimatteo left	22:47
	← czart left	22:47
rafasc	kaokao: wait... this clones the gh-pages separatly?	22:47
	← Guest73 left	22:48
rafasc	kaokao: so it's something like an alias for $git clone --single-branch gh-pages github.com/user/repo	22:48
	← durham left	22:48
kaokao	rafasc: I don't know, it somehow takes my .gitignored site/ directory and commits & pushes it to the github pages branch on github.com	22:48
	→ durham joined	22:49
	← yaymukund left	22:49
	→ deathwishdave joined	22:50
	→ Soni joined	22:50
	← benjwadams left	22:52
	← z1haze left	22:54
	← thiago left	22:56
	→ m00sehead joined	22:57
	← Tobbi left	22:57
	← oojacoboo left	22:58
	← schleppel left	23:00
	→ spacesuitdiver joined	23:00
	← ilmostro left	23:00
	→ crose joined	23:01
rafasc	kaokao: heh https://github.com/tschaub/gh-pages/blob/master/lib/git.js#L138	23:01
	→ oojacoboo joined	23:01
	← wpcarro left	23:02
	→ Guest73 joined	23:02
	← oojacoboo left	23:02
rafasc	looks that maybe create the gh-pages branch behind your back.	23:02
	← crose left	23:02
	→ wpcarro joined	23:02
	← plexigras2 left	23:03
	← finalbeta left	23:04
rafasc	kaokao: https://github.com/tschaub/gh-pages/blob/d7638fe12f57558f0947fb4dde4d5ca6836b5983/test/helper.js#L42	23:06
	yea, looks like they clone the repo somewhere and use it to push the files.	23:06
	← wpcarro left	23:07
	← spacesuitdiver left	23:07
rafasc	not sure where, but not going to install it to find out. :D	23:07
	→ icehouse9924 joined	23:08
	→ z1haze joined	23:08
	← markmarkmark left	23:08
	← linux_hacks left	23:11
	← grandfso left	23:13
	← Arcatech left	23:14
	← rsrx left	23:16
	→ oojacoboo joined	23:16
	← oojacoboo left	23:17
	→ TheRuckus joined	23:19
	→ wpcarro joined	23:20
	← icehouse9924 left	23:22
	→ Arcatech joined	23:22
	← erratic left	23:23
	← deathwishdave left	23:24
	← wpcarro left	23:24
	→ xPucTu4 joined	23:24
	→ wpcarro joined	23:25
	→ maestrojed joined	23:28
	← ColdKeyboard left	23:30
	→ ColdKeyboard joined	23:30
	← m00sehead left	23:31
kaokao	rafasc: sorry, stepped away and played badminton :p	23:32
	← peepsalot left	23:32
	← xaa left	23:32
rafasc	no worries, didn't say anything interesting	23:33
kaokao	of course you said interesting stuff!	23:33
	:p	23:33
	do you see them getting the path for git-upload-pack somewhere?	23:34
	→ Achylles joined	23:35
	→ markmarkmark joined	23:35
	← markmarkmark left	23:35
	→ shinnya joined	23:37
	← RougeR left	23:37
rafasc	not really.	23:37
	→ markmarkmark joined	23:38
	→ diamondjed joined	23:38
	← njbair left	23:40
	← maestrojed left	23:40
	→ njbair joined	23:41
rafasc	not even sure if it's their fault. Could be just something wrong with your PATH.	23:42
	but didn't dig enough to find out.	23:42
	→ yohnnyjoe joined	23:45
	← wpcarro left	23:46
	→ Kaisyu joined	23:47
	→ Karyon joined	23:47
	→ poprocks joined	23:47
	← poprocks left	23:48
	→ ilmostro joined	23:48
	→ Gustavo6046 joined	23:49
	← yohnnyjoe left	23:50
	← ilmostro left	23:50
	→ ilmostro joined	23:55
	→ wpcarro joined	23:57
	← aananev left	23:58

Logs Search ←Prev date Next date→

Channels Documentation