IRCloggy #git 2019-06-11

Provider of IRC logs since 2005.

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

	2019-06-11
	← tgunr left	00:00
	→ tgunr joined	00:00
	← nerosnm left	00:02
	← tgunr left	00:08
	← sozuba left	00:11
	← plantroon left	00:14
	← impermanence left	00:16
	← greatgatsby left	00:18
	← m0viefreak left	00:18
	→ plantroon joined	00:19
	← xcm left	00:20
	→ xcm joined	00:21
	← mooasaurus left	00:23
	← oatmealraisin left	00:23
	→ mooasaurus joined	00:23
	← smitop left	00:26
	→ ZRocket joined	00:27
	→ impermanence joined	00:33
	← misuto left	00:34
	→ misuto joined	00:37
	← devster31 left	00:38
	→ mud joined	00:38
	→ cliluw joined	00:44
	← clime left	00:44
	← misuto left	00:47
	→ devster31 joined	00:48
	→ javango joined	00:49
	← Copenhagen_Bram left	00:50
	→ cdown joined	00:50
	→ nerosnm joined	00:50
javango	Hello. Do git branches have some kind of comment? I want to attach some info to a branch	00:51
	Not to commit	00:51
	→ Copenhagen_Bram joined	00:51
	→ fphilipe_ joined	00:52
	→ eb0t joined	00:52
	← moldybits left	00:53
	← Abbott left	00:54
	← nerosnm left	00:55
	→ thiago joined	00:55
	→ igemnace joined	00:56
	→ nerosnm joined	00:57
	← bradleyprice left	00:58
	→ bradleyprice joined	00:59
	← Sasazuka left	01:02
	← bradleyprice left	01:03
	→ misuto joined	01:04
	→ Bobdude joined	01:04
	→ Noldorin joined	01:05
	← Noldorin left	01:07
jrnieder	javango: check out "git branch --edit-description"	01:07
	→ howdoi joined	01:08
	→ moldybits joined	01:08
	← jubal left	01:08
	→ anv8l3 joined	01:12
anv8l3	hey all, might be slightly offtopic but... tortoisegit. How in the world are you supposed to see what is actually stashed?	01:12
jrnieder	have you tried GitCheetah? :)	01:13
anv8l3	no, if i give up on tortoise i'll just do it all on the command line	01:14
jrnieder	oh hm, cheetah doesn't appear to have been updated for years	01:14
anv8l3	this specific window is the worst i've seen in tortoise	01:14
jrnieder	short answer is that tortoise is very svn-centric	01:14
anv8l3	when I click the obvious things, it doesn't show me anything close to what i stashed	01:14
	← boombatower left	01:14
anv8l3	it lists tons of other changed files, presumably looking at other branches or all changes since the stash...	01:15
	← nerosnm left	01:15
jrnieder	there's also https://gitextensions.github.io	01:16
anv8l3	i'm starting to wonder if this is a situation where nobody has this problem because everyone abandoned the software before they hit this point	01:17
jrnieder	well, to be clear, lots of people do use tortoisegit	01:17
	I just don't understand them ;-)	01:17
	others may have more helpful answers	01:17
anv8l3	i found something i'd consider a workaround... whether it's considered a feature is TBD...	01:18
jrnieder	sounds like a reasonable improvement to make to tortoisegit, btw	01:19
	← cdown left	01:19
anv8l3	you can copy "full data" to the clipboard... so now I can view this in a text editor instead of the UI	01:20
	but it is the actual list, so problem solved i guess. thanks for the suggestions.	01:20
jrnieder	sure thing, sorry I don't have better advice	01:21
	← anv8l3 left	01:21
	→ libertyprime joined	01:22
	← F0rTex left	01:23
	→ F0rTex joined	01:24
	← fphilipe_ left	01:26
	→ bradleyprice joined	01:30
	← tufteddeer left	01:31
	→ tufteddeer joined	01:32
	→ cdown joined	01:32
	← Cheaplogic left	01:38
	← ygivenx left	01:39
	→ leb joined	01:40
	← cdown left	01:43
	← freeman42y left	01:44
	→ nerosnm joined	01:44
	← Cabanossi left	01:44
	→ Cabanossi joined	01:47
	→ duderonomy joined	01:50
	→ fphilipe_ joined	01:55
	→ lempamo joined	01:56
	→ yonder joined	01:57
	← jstimm left	02:00
	← bradleyprice left	02:05
	→ bradleyprice joined	02:06
	← agowa338 left	02:09
	← bradleyprice left	02:10
	← nerosnm left	02:10
	← queip left	02:17
	→ rustyshackleford joined	02:20
	→ queip joined	02:23
	→ elsheepo joined	02:28
	→ esrse joined	02:29
	← fphilipe_ left	02:30
	← davidfetter_work left	02:34
	← lagothrix left	02:36
	→ lagothrix joined	02:36
	← elsheepo left	02:37
	← dviola left	02:38
NightStrike	how do I update my branch from master using the method that replays all my work on top of master instead of creating a separate merge commit?	02:38
	I was going to try "git rebase master", but I was afraid that would lose my tracking to upstream origin/branch	02:39
	← pr0ton left	02:42
NightStrike	nevermind, I figured it out	02:43
	→ bradleyprice joined	02:44
	← ferdna left	02:53
	→ UniFreak joined	02:53
	← mud left	02:54
	← CryptoDavid left	02:57
	← bradleyprice left	02:58
supernovah	how do you show which submodule a commit has referenced	02:59
	I just get, exists on disk but not in <commit>	02:59
	but if I git diff I get the hash	02:59
	→ sz0 joined	03:02
	← mns left	03:02
	→ mns joined	03:03
	rjsalts_ → rjsalts	03:05
	→ bradleyprice joined	03:06
	← MACscr left	03:10
	← zaricythe left	03:10
javango	jrnieder, thanks you! Although it's pity that this description cannot be pushed :(	03:12
	← bradleyprice left	03:12
	→ bradleyprice joined	03:18
	← nic-hartley left	03:21
	← Newami left	03:22
	→ fphilipe_ joined	03:26
	← fflam left	03:31
	← bradleyprice left	03:32
	→ fflam joined	03:32
	← leb left	03:34
	→ oatmealraisin joined	03:35
	← lempamo left	03:36
	← ghoti left	03:39
	→ jcbitter joined	03:43
	← Anthaas left	03:43
	→ Anthaas joined	03:44
	→ bradleyprice joined	03:44
	← mns left	03:46
	→ davidfetter_work joined	03:46
	→ mns joined	03:47
	← orbyt_ left	03:50
	← bradleyprice left	03:50
	← oatmealraisin left	03:51
	← impermanence left	03:53
	← jcbitter left	03:55
	→ Goplat joined	03:55
	→ jcbitter joined	03:56
	← fphilipe_ left	03:59
	→ bradleyprice joined	03:59
	→ nurdie joined	04:00
	← jcbitter left	04:01
	→ jcbitter joined	04:02
	← bradleyprice left	04:03
	← leah2 left	04:05
	→ hussam joined	04:07
	→ cdown joined	04:07
	← z\|bandito left	04:12
	← ZRocket left	04:14
	← cdown left	04:14
	→ fphilipe_ joined	04:15
	→ wgrant joined	04:18
	← xcm left	04:19
	→ xcm joined	04:20
	→ leah2 joined	04:20
	→ cdown joined	04:21
	→ SkarmoutsosV joined	04:24
	→ bradleyprice joined	04:35
rustyshackleford	where I work requires me to set $http_proxy for git to work correctly	04:42
	is there anything more secure? Ideally I'm not leaving passwords in plain text (proxy requires authentication)	04:43
	but setting that variable in bash_profile seems to be the best I can do	04:43
	← bradleyprice left	04:45
	→ jubal joined	04:47
	→ matsaman joined	04:48
	← matheusmoreira left	04:48
	← matsaman left	04:48
	→ matheusmoreira joined	04:49
	← comptroller left	04:53
	← davidfetter_work left	04:55
	→ pks_ joined	05:00
	← pks left	05:02
	pks_ → pks	05:02
	→ pr0ton joined	05:05
	→ comptroller joined	05:05
	→ bradleyprice joined	05:11
	← bradleyprice left	05:16
	← libertyprime left	05:17
	← fphilipe_ left	05:19
	→ zlogan2003 joined	05:21
	→ bradleyprice joined	05:22
	← kjartan left	05:22
	← Inline left	05:22
	← zlogan left	05:24
	→ kjartan joined	05:27
	← bradleyprice left	05:27
	→ hojang joined	05:27
	← wgrant left	05:28
	← tufteddeer left	05:30
	→ tufteddeer joined	05:31
	← SkarmoutsosV left	05:35
	→ gloomy joined	05:35
	→ SkarmoutsosV joined	05:36
	← hojang left	05:37
	→ mat001 joined	05:38
	→ wgrant joined	05:38
	→ libertyprime joined	05:39
	→ bradleyprice joined	05:43
	→ fjellfras joined	05:45
	→ crackin joined	05:46
	← bradleyprice left	05:47
	← Copenhagen_Bram left	05:47
	→ hojang joined	05:51
	→ bradleyprice joined	05:56
	→ BeerLover joined	05:56
	← crackin left	05:57
	← tufteddeer left	05:58
osse	rustyshackleford: man gitcredentials	05:59
gitinfo	rustyshackleford: the gitcredentials manpage is available at https://gitirc.eu/gitcredentials.html	05:59
osse	maybe some of that can help	05:59
	→ tufteddeer joined	05:59
	← bradleyprice left	06:00
	← hojang left	06:01
	→ nast joined	06:05
	← Kaisyu7 left	06:12
	← nast left	06:12
	← Goplat left	06:13
	→ fphilipe_ joined	06:13
	→ sQVe joined	06:13
	→ hojang joined	06:15
	→ bradleyprice joined	06:17
	→ Kaisyu7 joined	06:17
	→ Mattiaslndstrm joined	06:17
	→ sozuba joined	06:18
	→ andrzejv joined	06:20
	← bradleyprice left	06:21
	← xcm left	06:23
	→ xcm joined	06:24
	→ Noti joined	06:25
	→ thefatma joined	06:26
	→ salad joined	06:26
	← hojang left	06:28
	← gde33 left	06:28
	→ gde33 joined	06:29
	← cdown left	06:33
	→ cdown joined	06:33
	← fphilipe_ left	06:35
	→ v01d4lph4 joined	06:36
	→ bradleyprice joined	06:37
	→ hojang joined	06:38
	← bradleyprice left	06:42
	← jcbitter left	06:44
	→ Newami joined	06:44
	→ n3wborn joined	06:45
	→ kevr joined	06:45
	→ jcbitter joined	06:45
	← hojang left	06:47
	→ ghoti joined	06:48
	→ maxb_ joined	06:49
	← maxb_ left	06:49
	→ chele joined	06:55
	→ MACscr joined	06:55
	→ g00s joined	06:55
	← javango left	06:55
	→ hojang joined	06:57
	→ bradleyprice joined	06:59
	← stdedos left	06:59
	→ stdedos joined	06:59
	← lankanmon left	06:59
	→ moei joined	07:00
	→ lankanmon joined	07:01
	← bradleyprice left	07:03
	→ fphilipe_ joined	07:06
	← cdown left	07:06
	→ staafl_ joined	07:06
	→ mayurvpatil joined	07:09
	← staafl_ left	07:11
	← Eryn_1983_FL left	07:12
	→ staafl_ joined	07:13
	← nurdie left	07:16
	→ ryez joined	07:16
	← queip left	07:17
	← hofmann3900 left	07:17
	→ is_null joined	07:18
	← pr0ton left	07:18
	← igemnace left	07:18
	→ bradleyprice joined	07:19
	← thefatma left	07:21
	← Bobdude left	07:22
	→ Jackneill joined	07:22
	← bradleyprice left	07:24
	→ queip joined	07:24
	← mayurvpatil left	07:24
	→ hio joined	07:25
	← BeerLover left	07:26
	→ Eryn_1983_FL joined	07:26
	← yonder left	07:27
	← Jackneill left	07:29
	← duderonomy left	07:29
	→ Jackneill joined	07:30
	← thiago left	07:30
	→ igemnace joined	07:31
	← mat001 left	07:32
	→ duderonomy joined	07:32
	← howdoi left	07:32
	← Jackneill left	07:35
	→ Jackneill joined	07:36
	→ sgnls joined	07:37
	→ T_UNIX joined	07:38
	← ryez left	07:39
	← rustyshackleford left	07:39
	→ cdown joined	07:40
	→ bradleyprice joined	07:40
	→ BeerLover joined	07:42
	← jwynn6 left	07:43
	← hojang left	07:43
	→ mayurvpatil joined	07:44
	← g00s left	07:44
	→ g00s joined	07:44
	← bradleyprice left	07:45
	← sQVe left	07:45
	← duderonomy left	07:46
	← Jackneill left	07:47
	← SkarmoutsosV left	07:48
	→ jwynn6 joined	07:48
	→ Jackneill joined	07:48
	→ SkarmoutsosV joined	07:48
	← Jackneill left	07:49
	→ Jackneill joined	07:50
	→ is_null_ joined	07:51
	→ thefatma joined	07:52
	→ DisruptiveNL joined	07:52
	← tufteddeer left	07:54
	← is_null left	07:55
	→ tufteddeer joined	07:55
	← g00s left	07:56
	→ sbeyer joined	07:57
	← SkarmoutsosV left	07:58
	→ inovas joined	07:58
	→ seebyr joined	08:01
	→ bradleyprice joined	08:01
	← Newami left	08:02
	→ flughafen joined	08:03
flughafen	i accidently did a git checkout origin/foobranch	08:03
	then i did git co -, and git co foobranch but now it says error:pathspec 'foobranch' did not match any files known to git	08:04
	← sbeyer left	08:04
osse	where were you before you made that mistake?	08:04
	→ Newami joined	08:05
flughafen	osse: master	08:05
osse	I assume git co - took you there?	08:05
flughafen	yeah	08:05
	← bradleyprice left	08:06
flughafen	OOOOOOOOHGb	08:06
	i know what it is	08:06
	i'm pretty sure	08:06
	i haver a folder called foobranch	08:06
osse	try git checkout foobranch --	08:06
flughafen	but it's not tracked yet	08:06
osse	with the --	08:06
flughafen	ok.	08:06
	that worked.	08:06
	thanks	08:06
	→ DisruptiveNL_ joined	08:07
	← DisruptiveNL left	08:07
	→ hojang joined	08:10
	→ Rubin joined	08:11
	→ mikecmpbll joined	08:11
	→ floppydh joined	08:12
	→ Mike11 joined	08:15
	← nikivi left	08:30
	→ ghost43_ joined	08:36
	← ghost43 left	08:37
	← hojang left	08:39
	← knullare left	08:39
	← mayurvpatil left	08:41
	← victorqueiroz left	08:42
	← cdown left	08:42
	→ agowa338 joined	08:44
	→ dege joined	08:45
osse	I have a file with mixed line endings. I converted them all to CRLF and committed the file. The file was actually committed as CRLF and not converted to LF. Why did this happen when core.autocrlf is true?	08:46
	git add --renormalize works, but I don't see why that's necessary in this case	08:47
	→ pyfgcr joined	08:47
	← ghoti left	08:49
osse	Ahh... If I git rm the file and then git add it again in a separate commit everything works as expected	08:50
	← realies left	08:50
	→ hojang joined	08:51
	→ realies joined	08:51
	→ flaviodesousa joined	08:53
	← flaviodesousa left	08:54
	→ flaviodesousa joined	08:54
osse	So I guess the fact that it was already present and screwed up in git's object store made git think "fuck it"	08:54
	← flaviodesousa left	08:54
	→ flaviodesousa joined	08:55
	→ clime joined	08:55
	← flaviodesousa left	08:55
	→ flaviodesousa joined	08:56
	← flaviodesousa left	08:56
	→ cdown joined	08:56
	→ flaviodesousa joined	08:57
	← flaviodesousa left	08:57
	→ flaviodesousa joined	08:58
	← flaviodesousa left	08:58
	← n3wborn left	09:04
	→ sQVe joined	09:05
	→ nikivi joined	09:05
agowa338	osse: just add a .gitattributes files and this wont happen again.	09:07
	← YuGiOhJCJ left	09:07
osse	Yes I know. Very tempted to do that. Big old repo with lots of crap	09:09
	I'm just shy	09:09
	← BoneTone left	09:12
	→ cd joined	09:12
	← queip left	09:13
agowa338	Just do it, nothing exiting will break, only new files and you always have the option of just putting it into your local repo and never submit it upstream ;-)	09:13
	→ BoneTone joined	09:14
osse	Putting it in my local repo doesn't achieve much. I alreay have autocrlf true	09:14
agowa338	Just rebase the commit containing it always on top of your working tree and strip it from feature branches before merge.	09:14
osse	easier to use .git/info/attributes then :P	09:14
agowa338	yea, that also works. I thought of some origin/upstream split, where origin is your fork and upstream is the main project, but if you only have local and remote that works too.	09:15
	→ crackin joined	09:17
	← catsup left	09:18
	→ catsup joined	09:18
	→ queip joined	09:19
	← catsup left	09:19
	→ catsup joined	09:20
	← is_null_ left	09:21
	← crackin left	09:22
	→ SkarmoutsosV joined	09:23
	← queip left	09:26
	→ is_null joined	09:28
	← hojang left	09:34
	← thefatma left	09:37
	← libertyprime left	09:39
	← fphilipe_ left	09:41
	seebyr → sbeyer	09:41
	→ Xatenev joined	09:42
Xatenev	helo	09:42
	so on friday i had a local branch that was similar to the respective origin/ branch	09:43
	→ OtakuSenpai joined	09:43
Xatenev	today i do `git fetch` and `git rebase` on that origin branch and i get a conflict	09:43
	the only possibility how that happens is if someone has reset the branch, no?	09:43
	I don't see how I would get a conflict otherwise	09:43
	git status saying the branches have diverged	09:43
	by 16 and 236 commits	09:44
	→ BeerBuddy joined	09:47
selckin	if you didn't have local commits, then that sounds likely, else those could conflict	09:48
	!reflog	09:48
gitinfo	The git reflog (`git log -g`) temporarily (90 days by default) snapshots your branch states at each operation that changes the branch, making it easy to undo e.g. merges and rebases. The usual warnings about !rewriting/undoing history apply. See http://sethrobertson.github.com/GitFixUm/ for full details.	09:48
	← BeerLover left	09:48
Xatenev	selckin, yeap i dont have any local commits	09:48
	it was clean when i left on friday .p	09:48
	← is_null left	09:48
_ikke_	Or someone rewrote history	09:49
Xatenev	_ikke_, yea that happens with reset right	09:49
_ikke_	yes	09:49
Xatenev	suire they could rewrite it otherwise too.. hmm	09:49
	← tribly left	09:50
	← jcbitter left	09:50
	→ tribly joined	09:50
	→ thefatma joined	09:52
Xatenev	_ikke_, selckin do you know if i can find out what happened?	09:52
	with reflog or somethign	09:52
selckin	fetch output probably told you	09:52
_ikke_	yes	09:52
	and that	09:52
Xatenev	fetch said "refresh forced"	09:52
	.. or something like that.. my git is in my native language :X	09:53
_ikke_	that sounds like history rewriting	09:53
	← tufteddeer left	09:53
Xatenev	localBranch -> originBranch (refresh forced)	09:53
_ikke_	forced update is what I believe git would say in english	09:53
Xatenev	yeah sounds correct :P	09:54
	→ jcbitter joined	09:55
	→ lacrymology joined	09:55
	← tribly left	09:55
	→ mayurvpatil joined	09:55
	→ tribly joined	09:56
	← v01d4lph4 left	09:56
	← agowa338 left	09:56
	→ mowcat joined	09:57
	→ Ayo joined	09:59
	← OtakuSenpai left	10:00
	← lankanmon left	10:00
	← jcbitter left	10:00
	→ jcbitter joined	10:01
	← averell left	10:02
	← zamba left	10:03
	← steven left	10:03
	→ steven joined	10:06
	→ fphilipe_ joined	10:07
	→ hojang joined	10:08
	← thefatma left	10:11
	→ zamba joined	10:11
	→ thefatma joined	10:11
	→ is_null joined	10:13
	→ bsanford joined	10:17
	← tribly left	10:19
	→ tribly joined	10:20
	← bsanford left	10:20
dcpc007	Hi, is it possible to easely find the commit from where a current branch diverge ?	10:21
	(to make a reset --hard on all current branch work only	10:21
	(it's for a #git-fr user asking)	10:22
	← alyptik left	10:22
_ikke_	dcpc007: if you know the branch where you merged from: git merge-base <base> <branch>	10:22
dcpc007	ha thx, never seen merge-base	10:22
	→ DisruptiveNL joined	10:23
	← SpeakerToMeat left	10:24
dcpc007	i sent him.	10:25
	← DisruptiveNL_ left	10:25
	← Xatenev left	10:26
	← arecaceae left	10:26
	→ arecaceae joined	10:27
	← cdown left	10:27
	→ bradleyprice joined	10:27
	→ crackin joined	10:29
	→ libertyprime joined	10:29
	← hojang left	10:29
	← DisruptiveNL left	10:29
	→ DisruptiveNL joined	10:30
	← jab416171 left	10:31
	→ SpeakerToMeat joined	10:32
	← bradleyprice left	10:32
	← thefatma left	10:32
	← crackin left	10:33
	→ OtakuSenpai joined	10:36
	← SkarmoutsosV left	10:39
	← zamba left	10:41
	→ zamba joined	10:43
	→ BPL joined	10:44
	→ queip joined	10:44
BPL	Hi guys, I'd like to reset a bunch of repos and I've tried either `git checkout -- .` or `git reset --hard` but neither of these commands won't remove unstaged folders, how can i reset a repo completely?	10:45
osse	BPL: combine with git clean	10:45
BPL	osse: `git reset --hard && git clean -f` ? this won't do... :/	10:46
	→ hojang joined	10:48
	→ bradleyprice joined	10:48
	← is_null left	10:49
osse	why not?	10:49
	You probably want -fdx	10:51
BPL	mmm, hold on, maybe my question wasn't correct... I meant those command won't remove "untracked folders", not "unstaged folders".	10:51
_ikke_	-x would also remove ignored files	10:51
BPL	it seems `git reset --hard && git clean -fdx` works!	10:52
	← bradleyprice left	10:53
	→ rsrx joined	10:54
GyrosGeier	hm	10:54
	← sQVe left	10:54
	→ sQVe joined	10:55
GyrosGeier	can I invert "git bisect run"?	10:56
_ikke_	you can rename the terms you use	10:56
	← queip left	10:57
GyrosGeier	I want to find the commit where it was fixed	10:57
	I can just rewrite the script	10:57
	but if I can say "invert good/bad result from script", then I can reuse the existing one	10:58
	(which has different places with exit codes)	10:58
_ikke_	git bisect start --term-new fixed --term-old broken	10:58
osse	GyrosGeier: I would just use it as normal and invert the meanings of good and bad in my head	10:58
	but that also works	10:58
GyrosGeier	my point is: the script returns 0 for good and 1 for bad as exit code	11:00
osse	oh	11:00
GyrosGeier	and 125 for skip	11:00
	I have a script attached to the bug report that I used to find the first bad commit	11:00
	now I'd like to use the exact same script to find the first good commit	11:01
	→ lankanmon joined	11:02
GyrosGeier	in the long run I'd like to automate that for all bug reports	11:02
osse	git bisect run sh -c 'the_script; ret=$?; if [ $ret -eq 125 ]; exit 125; fi; [ $ret -eq 1 ]'	11:02
GyrosGeier	mmh	11:03
	that should work	11:03
	← hojang left	11:03
osse	I would prefer git bisect run the_script --flip-exit-codes	11:04
	GyrosGeier makes a mental note to add a flag	11:04
GyrosGeier	exactly	11:04
	→ emsjessec joined	11:04
GyrosGeier	and/or a "--find-bad-range" mode	11:04
	where you have atwo good and one bad commits at start, and it does two bisects back-to-back	11:05
	→ alyptik joined	11:06
	← perrier-jouet left	11:07
	→ hojang joined	11:07
	→ paws_ joined	11:09
	→ bradleyprice joined	11:09
	→ queip joined	11:11
	← fphilipe_ left	11:11
	→ thefatma joined	11:12
	← hojang left	11:13
	→ hojang joined	11:13
	← bradleyprice left	11:14
	→ BeerLover joined	11:16
	→ abelvesa joined	11:16
	← BeerBuddy left	11:17
	→ oxymoron93 joined	11:19
	← Newami left	11:23
	← Ayo left	11:28
	← hojang left	11:28
	→ hojang joined	11:29
	← fjellfras left	11:29
	→ tchan joined	11:30
	→ bradleyprice joined	11:30
	→ tsdh joined	11:34
	← OtakuSenpai left	11:35
	← bradleyprice left	11:35
	← esrse left	11:36
tsdh	Hi. My work repositories are all managed by a GitLab instance that knows my public ssh key and I use repo urls like git@our-server:group/project.git. That works fine when I'm in the company network but not when I connect to the company network via VPN. Then I get: Connection closed by <IP> port 22.	11:38
	However, telnet our-server 22 shows the same OpenSSH prompt in both situations.	11:39
	← mowcat left	11:39
tsdh	How can I find the problem?	11:39
	→ OtakuSenpai joined	11:39
	→ is_null joined	11:41
_ikke_	tcpdump, firewall logs	11:43
	→ fphilipe_ joined	11:45
	→ interrobangd joined	11:46
tsdh	_ikke_: I think I'll ask an admin. :-)	11:47
	→ __Myst__ joined	11:57
__Myst__	In a pre-commit hook, is there a way to see only the staged changes?	11:57
osse	git diff --staged	11:57
	← rsrx left	11:57
__Myst__	osse: sorry, i wasn't clear	11:58
	e.g. say i want to run `tsc --noEmit` on the staged changes	11:58
	can I run that command on just the staged changes, ignoring the unstaged ones?	11:58
osse	I don't know what that command does	11:58
__Myst__	any command can be subsituted	11:58
	just saying, can i get the filesystem in a state that's just staged changes?	11:59
osse	I would suggest you make temporary files in that case	11:59
	← hojang left	11:59
	→ Cheaplogic joined	12:00
	← is_null left	12:01
	ghost43_ → ghost43	12:02
	→ Ayo joined	12:02
	→ rosco_y joined	12:03
rosco_y	what does "git rev-parse origin/master" do?	12:04
	does it compute a hash every time it's run?	12:05
osse	__Myst__: i think this will do what you want (or at least do what I want you to want):	12:05
	← Ayo left	12:05
	→ bradleyprice joined	12:06
osse	__Myst__: i think this will do what you want (or at least do what I want you to want): git diff --staged --name-only -z \| git checkout-index --temp --stdin -z	12:06
	__Myst__: this is better (it won't make bogus names):	12:09
	git diff --staged --name-only -z \| git checkout-index --prefix=tmpdir/ --stdin -z	12:09
rosco_y	If I change my README in github, it doesn't change the hash returned by rev-parse, so I'm confused.	12:09
__Myst__	rosco_y: probably need to git fetch first	12:09
	osse: that's awesome, thank you :D	12:09
osse	rosco_y: it doesn't compute anything. it just reads the hash of what origin/master points to	12:10
	__Myst__: I suppose you can do it in-place but that would mean temporarily reverting changes to files and restoring them within the hook. That sounds iffu	12:10
	iffy	12:10
	← bradleyprice left	12:11
rosco_y	__Myst__, thanks. Please correct me if I'm wrong: I thought git rev-parse origin/master was supposed to return the hash at github, which might not be effected by fetching it to my local repo.	12:11
osse	!remote_tr > rosco_y	12:12
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'	12:12
osse	rosco_y: very few git commands actually "go online" to get into. fetch and pull do, obviously, and ls-remote. that's the ones I can think of	12:12
rosco_y	osse, thank! That explains some of my confusion!	12:13
_ikke_	(and pull just uses feth)	12:13
	(fetch)	12:13
osse	the factoid above is very central to understanding git	12:13
_ikke_	git remote as well	12:13
rosco_y	Thanks __Myst__ , osse et. al.	12:13
osse	in particular the "read-only mirrors" part :P	12:13
rosco_y	right. I didn't know anything about those :)	12:14
	→ rnsanchez joined	12:14
rosco_y	sheds new light on 'git fetch' for sure!	12:14
	→ subopt joined	12:17
	← BPL left	12:19
osse	rosco_y: rev-parse is actually very stupid, it turns out	12:21
	rosco_y: echo 6d96270004515a0486bb7f76196a72b40c55a47f > .git/refs/heads/master	12:21
	now rev-parse will print that even if it's completely bogus	12:21
	→ Amadiro joined	12:22
	→ is_null joined	12:22
	→ SkarmoutsosV joined	12:26
	→ bradleyprice joined	12:27
	← bradleyprice left	12:32
	← kjartan left	12:33
	→ kjartan joined	12:37
	→ rsrx joined	12:37
	→ bradleyprice joined	12:48
__Myst__	!detached	12:49
gitinfo	A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	12:49
__Myst__	!lost	12:49
gitinfo	As long as you have `git commit`ed your changes (or even `git add`ed them), your changes will not be lost for over two weeks unless you work really hard at it. There are two places where "lost" changes can be hiding. They might be in the reflog (`git log -g`) or they might be in lost&found (`git fsck --unreachable`). Type "!dangling" and "!reflog" into IRC for more info.	12:49
__Myst__	!dangling	12:49
gitinfo	Dangling objects represent things added to git which are no longer needed based on the git commands you typed in. This can be normal workflow (rebase, reset, add, etc) or errors you made. Typing "!dangling_commit" "!dangling_blob" and "!dangling_tree" into a query to me will get you more information about each type.	12:49
__Myst__	this is a rabbit hole	12:49
	→ barteks2x joined	12:52
	← bradleyprice left	12:53
_ikke_	haha :D	12:57
	→ hojang joined	12:59
	→ daggs1 joined	13:00
daggs1	Greetings, what is the proper way to get the Author of a commit when executing a pre push hook?	13:02
_ikke_	git show -s --format="%an" <commit>	13:03
	→ CodeSlingerPaul joined	13:04
	→ howell joined	13:04
daggs1	_ikke_: thanks, will try it	13:05
	→ bradleyprice joined	13:06
	← exitcode1 left	13:09
	→ ghoti joined	13:09
	← bradleyprice left	13:11
dcpc007	_iike_ thx, user question solved (and more simple in its case : git br -d dev && git br dev :) )	13:13
	← jcbitter left	13:14
	→ UrsoBranco joined	13:14
_ikke_	dcpc007: git branch -f dev	13:14
dcpc007	lol	13:15
	→ jcbitter joined	13:15
	← thefatma left	13:19
	→ deathwishdave joined	13:22
	← ghoti left	13:22
	← jcbitter left	13:23
	→ jcbitter joined	13:25
	→ thefatma joined	13:25
	→ bradleyprice joined	13:28
	→ mat001 joined	13:29
	← jcbitter left	13:30
	→ figuinhas joined	13:30
	→ jcbitter joined	13:31
	← bradleyprice left	13:32
	← sz0 left	13:33
	← hojang left	13:33
	→ dviola joined	13:36
	← deltam left	13:36
	← jcbitter left	13:36
	→ jcbitter joined	13:37
	→ leb joined	13:37
	→ hojang joined	13:38
	← leb left	13:40
	→ deltam joined	13:41
	← fflam left	13:42
	← SkarmoutsosV left	13:42
	→ fflam joined	13:43
	← tsdh left	13:45
	← is_null left	13:47
	→ bradleyprice joined	13:49
	← bradleyprice left	13:53
	← BeerLover left	13:57
	→ cdown joined	13:57
	← daggs1 left	13:59
	→ bradleyprice joined	14:01
	→ Inline joined	14:01
	→ bbear joined	14:04
bbear	hello	14:04
	It seems I lost some work/commits and I want tot retrive them	14:04
	How can I do a full text search on most recent commits ?	14:04
moritz	bbear: it sounds like you really want 'git log -g' or 'git reflog' in the repo where those commits once existed	14:05
selckin	git log -p -S text	14:05
moritz	selckin: that won't help if the commits are actually lost :-)	14:05
	← Inline left	14:05
moritz	might want to add --all	14:06
bbear	the could not be lost	14:06
	→ Inline joined	14:07
bbear	it's really not possible	14:07
	→ m1sosoup joined	14:10
bbear	I don't manage to do what I need	14:10
	your commands are grepping commit messages	14:11
	I want to do a full scan search in the code	14:11
	or in the diff if you prefer	14:11
	and preferably have all the refs in my repo in descending order of date.	14:11
	i'm really frightened	14:11
	They must be somewhere	14:11
	← andrzejv left	14:13
	← comptroller left	14:13
	← bradleyprice left	14:13
	→ greggerz joined	14:14
bbear	that 's not possible	14:16
	→ learningc joined	14:17
	→ BeerLover joined	14:17
	← cdown left	14:19
	→ flaviodesousa joined	14:19
	← BeerLover left	14:20
	← justanotheruser left	14:20
bbear	okay	14:22
	so how do I do a full text search in all my commits ?	14:22
	→ is_null joined	14:23
	→ comptroller joined	14:23
	→ Live joined	14:27
	← moldybits left	14:28
_ikke_	bbear: commit messages or contents?	14:29
	→ SkarmoutsosV joined	14:33
	← is_null left	14:36
	→ duderonomy joined	14:38
	← sQVe left	14:40
bbear	_ikke_: content	14:42
	→ is_null joined	14:43
	→ nurdie joined	14:43
	→ karmenjello joined	14:44
	← mayurvpatil left	14:44
karmenjello	hello	14:44
gitinfo	karmenjello: 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.	14:44
	→ tombusby joined	14:45
	→ mayurvpatil joined	14:45
	← rosco_y left	14:46
	← mayurvpatil left	14:46
karmenjello	if someone creates a pull request, and if merging that pull request would create a merge conflict with another already existing pull request, who's responsible for the merge conflict? In other words, should the second person look at current pull requests to make sure their pull request won't cause merge conflicts before merging their pull request?	14:47
Hello71	bbear: man git-log	14:47
gitinfo	bbear: the git-log manpage is available at https://gitirc.eu/git-log.html	14:47
Hello71	karmenjello: depends on the project and the politics	14:47
	in general the answer is work together	14:47
_ikke_	Sometimes it's hard to know there will be a conflict	14:48
	→ mase-tech joined	14:48
	→ ygivenx joined	14:48
_ikke_	like Hello71 said, good communication is key	14:49
karmenjello	Hello71: thanks for the reply. The project is a shared terraform module. My pull request was already there awaiting 1 more reviewer, and someone else created a different pull request and merged it (they fasttracked it basically by adding reviewers who are known to just click approved without checking it). The actual conflict is tiny, its a matter of principle at this point	14:50
	→ mayurvpatil joined	14:50
karmenjello	mine was the only other pull request	14:51
	→ crackin joined	14:52
	→ pingo joined	14:53
	← R2robot left	14:53
	→ bradleyprice joined	14:53
	← oxymoron93 left	14:54
pingo	Hi. How do I apply all these feature branches to master branch? https://i.imgur.com/LPdTHZd.png	14:54
	← mayurvpatil left	14:56
	→ ryez joined	14:56
	← crackin left	14:57
bbear	I found it	14:57
	12ea3db83b9d60cd29531a4756fd49c1a0ef6e5a	14:57
	but now, I would like to list all the branches where this commit is	14:58
	how can I do that ?	14:58
	← ryez left	14:58
	← duderonomy left	15:00
	← cybrNaut left	15:02
mns	I am seeing this when I do a 'git pull': Your configuration specifies to merge with the ref 'refs/heads/branch-of-prod', from the remote, but no such ref was fetched	15:02
	→ mayurvpatil joined	15:03
mns	how do I take care of this ? its not something I've run into before	15:03
	← Noti left	15:04
	← chele left	15:05
	← interrobangd left	15:06
	← bket left	15:06
	← Hello71 left	15:06
	→ bluezone joined	15:08
	→ thiago joined	15:08
	← neunon left	15:08
	→ neunon joined	15:08
	→ Lucas_Gray joined	15:09
	→ Hello71 joined	15:12
	← queip left	15:13
	← lacrymology left	15:14
	→ bket joined	15:14
_ikke_	bbear: git branch --contains 12ea3db	15:14
	← fflam left	15:16
	← Hello71 left	15:16
	→ fflam joined	15:16
	→ cdown joined	15:18
	→ AbleBacon joined	15:20
	← is_null left	15:21
	→ tang^ joined	15:21
	→ Hello71 joined	15:22
	→ GreyXor joined	15:24
GreyXor	Hello, do you know a good best practice git structure ? like a README.md, an /src directory, a LICENSE etc. ? thanks	15:25
	← fphilipe_ left	15:25
	← Hello71 left	15:26
	← hojang left	15:26
	→ hojang joined	15:27
tang^	GreyXor: that's a decent practice for projects, regardless of which SCM you use	15:28
	→ queip joined	15:28
	← mayurvpatil left	15:29
	← hojang left	15:32
	→ Hello71 joined	15:32
	← Hello71 left	15:32
GyrosGeier	in the good old days, our README files were text files	15:33
	they were not read either	15:33
	→ hojang joined	15:33
	← newdimension left	15:34
	→ victorqueiroz joined	15:34
tang^	they're still text and usually still not read	15:35
	→ newdimension joined	15:36
	→ orbyt_ joined	15:38
	→ is_null joined	15:38
	← cdown left	15:38
	← floppydh left	15:38
	→ Hello71 joined	15:38
	→ moldybits joined	15:39
	← ygivenx left	15:39
	← Hello71 left	15:39
	→ tufteddeer joined	15:41
	← thefatma left	15:44
	→ Hello71 joined	15:45
	→ oatmealraisin joined	15:46
	→ pr0ton joined	15:46
	← Hello71 left	15:48
	← orbyt_ left	15:50
	← oatmealraisin left	15:50
	→ oatmealraisin joined	15:51
	← is_null left	15:55
	→ mayurvpatil joined	15:55
	→ is_null joined	15:55
	← dviola left	15:56
	→ Hello71 joined	15:56
	→ czart joined	15:57
	→ fphilipe_ joined	15:57
	← Hello71 left	15:58
	← mayurvpatil left	15:59
	← hojang left	16:02
	← thiago left	16:02
	← OtakuSenpai left	16:02
	← DisruptiveNL left	16:03
	→ Hello71 joined	16:04
	← Hello71 left	16:04
	→ davidfetter_work joined	16:07
	→ jayjo joined	16:08
	← igemnace left	16:10
	→ Hello71 joined	16:10
	→ ygivenx joined	16:12
	→ AtumT joined	16:14
	← AtumT left	16:14
	← GreyXor left	16:14
	→ AtumT joined	16:15
	← fakhraee left	16:18
	→ hofmann3900 joined	16:19
	← Hello71 left	16:20
	→ GreyXor joined	16:25
	→ Hello71 joined	16:26
	← Hello71 left	16:27
	← is_null left	16:27
	→ lacrymology joined	16:30
	← m1sosoup left	16:32
	→ Hello71 joined	16:32
	← Hello71 left	16:33
	→ mowcat joined	16:35
	← pr0ton left	16:36
	→ Hello71 joined	16:39
	→ bn_work joined	16:39
	← Lucas_Gray left	16:39
	← Hello71 left	16:40
	← lacrymology left	16:41
	→ Enphuego joined	16:42
	→ lacrymology joined	16:43
	← kjartan left	16:44
	→ thiago joined	16:45
	→ Lucas_Gray joined	16:45
	→ Hello71 joined	16:45
	← Hello71 left	16:46
	← Shentino left	16:47
	← oatmealraisin left	16:47
	← mikecmpbll left	16:49
	→ kjartan joined	16:49
	→ oatmealraisin joined	16:49
	→ Shentino joined	16:50
	← Mike11 left	16:51
	→ Hello71 joined	16:51
	← tufteddeer left	16:52
	← Hello71 left	16:52
	→ impermanence joined	16:52
	→ tufteddeer joined	16:53
	← impermanence left	16:55
	→ is_null joined	16:56
	→ impermanence joined	16:57
	← tufteddeer left	16:58
	→ Hello71 joined	16:58
	→ tufteddeer joined	17:00
	← flaviodesousa left	17:01
	← Hello71 left	17:01
	→ Newami joined	17:01
	→ duderonomy joined	17:01
	→ Hello71 joined	17:07
	← barteks2x left	17:07
	→ barteks2x joined	17:08
	← Hello71 left	17:08
	→ acercle joined	17:13
	→ Hello71 joined	17:14
	→ jab416171 joined	17:15
	→ fstd_ joined	17:16
	← Hello71 left	17:17
	→ Jitta joined	17:17
	← rsrx left	17:19
	← fstd left	17:21
	fstd_ → fstd	17:21
	→ plexigras joined	17:22
	→ rsrx joined	17:23
	→ Hello71 joined	17:23
	← figuinhas left	17:26
	← queip left	17:27
	→ nowhere_man joined	17:31
	← Hello71 left	17:33
	← Lucas_Gray left	17:33
	← mowcat left	17:35
	← tufteddeer left	17:35
	→ figuinhas joined	17:36
	→ tufteddeer joined	17:37
	← figuinhas left	17:37
	→ queip joined	17:37
	← T_UNIX left	17:38
	→ Hello71 joined	17:39
	← Hello71 left	17:40
	→ Lucas_Gray joined	17:40
	→ maarhart_ joined	17:40
	← maarhart_ left	17:40
	→ maarhart_ joined	17:41
	← maarhart_ left	17:41
	→ maarhart_ joined	17:41
	← maarhart_ left	17:41
	→ maarhart_ joined	17:41
	← GreyXor left	17:42
	→ freeman42x joined	17:43
	← maarhart_ left	17:44
	→ Hello71 joined	17:45
	→ JoaTMoN joined	17:46
	← Hello71 left	17:46
	← queip left	17:47
	← Lucas_Gray left	17:48
	← deathwishdave left	17:49
	← JoaTMoN left	17:50
	→ orbyt_ joined	17:53
	→ queip joined	17:53
	→ Hello71 joined	17:54
	← Hello71 left	17:55
	→ Narrat joined	17:56
	→ Hello71 joined	18:01
	← plexigras left	18:01
	← Hello71 left	18:02
	← karmenjello left	18:04
	← pingo left	18:07
	← infernix left	18:07
	→ Hello71 joined	18:08
	→ plexigras joined	18:09
	← alyptik left	18:09
	→ czart_ joined	18:09
	← czart left	18:10
	→ leeN joined	18:13
	← Hello71 left	18:18
	← bbear left	18:19
	← learningc left	18:22
	→ wootehfoot joined	18:23
	→ Hello71 joined	18:24
	← Hello71 left	18:25
	← is_null left	18:28
	→ is_null joined	18:28
	← sauvin left	18:29
	→ Hello71 joined	18:31
	← subopt left	18:32
	← lacrymology left	18:33
	← clime left	18:34
	← Hello71 left	18:41
	→ clime joined	18:42
	← is_null left	18:44
	→ Hello71 joined	18:46
	→ infernix joined	18:47
	← Hello71 left	18:47
slacker_nl	perhaps we should name them IGNOREME	18:48
	← pyfgcr left	18:49
	→ R2robot joined	18:51
	→ smitop joined	18:51
	← lss8 left	18:52
	→ Hello71 joined	18:53
	← Hello71 left	18:55
	← jesopo left	18:55
moritz	SECRETS_DONT_READ	18:57
	ChanServ set mode: +o	18:59
	ChanServ set mode: -o	19:00
	→ Hello71 joined	19:00
	← Hello71 left	19:02
	→ is_null joined	19:06
	← impermanence left	19:07
	→ Hello71 joined	19:07
	← is_null left	19:07
	← infernix left	19:09
	→ jenia joined	19:11
jenia	hello	19:11
	I need to revert all the change from HEAD all the way to commit xyz	19:11
	when I do git revert xyz nothing happens at all	19:11
vishal	!revert	19:11
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	19:11
vishal	also, potentially, !rewrite applies	19:12
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	19:12
	← Mattiaslndstrm left	19:12
jenia	vishal: is it a new program called git-revert or there's a submodule in git called `git revert...`	19:12
	?	19:12
	← oatmealraisin left	19:13
	← inkbottle left	19:13
vishal	git revert is part of git, but it sounds you might want reset rather than revert (with the rewriting caveat)	19:13
jenia	vishal: no. I want to make a new commit that does that opposite of the commits from xyz to HEAD	19:14
	→ inkbottle joined	19:14
vishal	ah, ok, then you want to specify a range to revert, not just 'xyz'	19:15
	perhaps git revert xyz..HEAD	19:15
	!dots	19:15
gitinfo	A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.	19:15
jenia	vishal: well yes. so git revert head..xyz. But I need HEAD to be undone to	19:16
	← Hello71 left	19:17
	→ jesopo joined	19:19
	← bradleyprice left	19:19
jenia	f*** I'm getting empty commit set passed. I did `git revert abc..xyz` where abc is HEAD	19:20
vishal	you want xyz..HEAD not the other way round	19:20
	→ infernix joined	19:23
	→ Hello71 joined	19:23
	→ hojang joined	19:23
	← Hello71 left	19:27
	← plexigras left	19:28
	→ bradleyprice joined	19:29
	→ alyptik joined	19:30
	← jcbitter left	19:31
	→ jcbitter joined	19:32
	← Cheaplogic left	19:35
	← xelxebar left	19:35
	→ xelxebar joined	19:35
	→ Cheaplogic joined	19:36
	← emsjessec left	19:36
	← jcbitter left	19:38
	→ jcbitter joined	19:39
	→ deathwishdave joined	19:40
	→ Sasazuka joined	19:40
	→ Hello71 joined	19:42
	← deathwishdave left	19:43
	← xorander left	19:44
	→ n3wborn joined	19:45
	← czart_ left	19:47
	← jwynn6 left	19:47
	← fphilipe_ left	19:47
	→ jwynn6 joined	19:48
	→ xorander joined	19:50
	← gloomy left	19:50
	→ wreed joined	19:51
	→ im0nde- joined	19:51
	← VectorX left	19:54
	→ im0nde\| joined	19:54
	← im0nde_ left	19:54
	← im0nde left	19:55
	← ricekrispie left	19:58
	← Nickeeh left	19:58
	→ MACscr_ joined	20:02
	→ VectorX joined	20:02
	← paws_ left	20:03
	← MACscr left	20:04
	im0nde- → im0nde	20:04
	← cd left	20:06
	→ APic joined	20:06
	→ sgen joined	20:06
	→ ricekrispie joined	20:16
	← bradleyprice left	20:17
	→ bradleyprice joined	20:17
	← jayjo left	20:18
	→ learningc joined	20:22
	← bradleyprice left	20:22
	→ bradleyprice joined	20:24
	→ crackin joined	20:25
	→ plexigras joined	20:26
	→ mojisun joined	20:27
	← inovas left	20:29
	→ inovas joined	20:30
	→ jayjo joined	20:30
	← crackin left	20:30
	← jayjo left	20:33
	→ theoceaniscool joined	20:43
	→ greatgatsby joined	20:43
	← mojisun left	20:46
	← wreed left	20:47
	→ averell joined	20:48
	← salad left	20:51
	→ mowcat joined	20:53
	→ Lucas_Gray joined	20:59
	→ paraxial joined	21:00
	← R2robot left	21:08
	← queip left	21:09
	← rsrx left	21:11
	← mase-tech left	21:16
	→ R2robot joined	21:17
	→ Unplesantry joined	21:17
Unplesantry	any way to clone a repo in bitbucket like create a new one from another	21:18
_ikke_	Unplesantry: you can do it locally	21:19
	→ oatmealraisin joined	21:19
_ikke_	create a new project in bitbucket, then add the project as a remote to your local repo and push to tit	21:20
	to it*	21:20
	← Jitta left	21:20
Unplesantry	ya i know that	21:20
	← nowhere_man left	21:20
Unplesantry	i wish they make a button for that already	21:20
	create from existing	21:21
	→ nurdie_ joined	21:21
	→ justanotheruser joined	21:23
vishal	Like a fork button? (I don't use bitbucket)	21:23
Unplesantry	ya i guess that is a fork	21:23
	duh	21:23
_ikke_	a fork is not independent though	21:24
	→ queip joined	21:24
	← nurdie left	21:24
	→ Nickeeh joined	21:25
	← nurdie_ left	21:25
Unplesantry	oh	21:27
	← Narrat left	21:28
	← wootehfoot left	21:32
	→ jayjo joined	21:34
	← bradleyprice left	21:39
	→ bradleyprice joined	21:39
	← mns left	21:40
	→ mns joined	21:41
	→ Anticom joined	21:43
	← foul_owl left	21:44
	← bradleyprice left	21:44
	← AbleBacon left	21:44
	← Anticom left	21:44
	→ crackin joined	21:45
	← howell left	21:46
	← hojang left	21:47
	→ rustyshackleford joined	21:49
	← crackin left	21:50
	← queip left	21:50
	← paraxial left	21:52
	← Rhonda left	21:54
	← mns left	21:54
	← sgnls left	21:54
	→ paraxial joined	21:55
	← plexigras left	21:55
	← tufteddeer left	21:55
	→ Rhonda joined	21:55
	→ mns joined	21:57
	← greggerz left	21:59
	→ foul_owl joined	22:00
	→ queip joined	22:00
	← AtumT left	22:05
	← matheusmoreira left	22:05
	← sgen left	22:06
	← strudla left	22:07
	→ strudla joined	22:07
	→ AtumT joined	22:08
	→ sgen joined	22:11
	→ matheusmoreira joined	22:11
	→ nowhere_man joined	22:13
	← AtumT left	22:16
	← clime left	22:17
	→ crackin joined	22:17
	→ jklaus joined	22:17
jklaus	hey guys, I need some help with gitversion gitflow if at all possible	22:18
	→ bradleyprice joined	22:20
	← moei left	22:20
	← crackin left	22:22
jklaus	can anyone tell me why this daygone thing doesn't work	22:23
	← CodeSlingerPaul left	22:23
	← bradleyprice left	22:24
	→ lungaro joined	22:24
lungaro	is there a way to specify what ssh keys should be presented for a given git repo?	22:25
	Its about time I try to fix this. I used to just load the key into my agent that I needed and unload the others. I have multiple ssh identities on github.com and its getting them wrong	22:25
jklaus	@lungaro - are you familiar with gitflow?	22:26
lungaro	Nope	22:26
	← bashfulshell left	22:28
vishal	lungaro: you can do it by manipulating your remote config for the repo and your .ssh/config to specify keys for those remote-aliases	22:30
lungaro	ok	22:31
vishal	e.g. remote url would be ssh://identity1/org/repo.git and ssh config would have a Host identity1 section specifying the hostname and key	22:32
lungaro	cheers	22:33
	← nasamuffin left	22:34
	← leeN left	22:36
	← thiago left	22:36
	← learningc left	22:38
	← zlogan2003 left	22:38
jklaus	anyone know how I can migrate the version from my source branch to become a tag on my target branch during a merge (specifically a pull request in ADO)	22:38
	← queip left	22:39
	→ nasamuffin joined	22:39
	→ galaxie joined	22:40
	← galaxie left	22:42
vishal	jklaus: I don't fully understand - If you want a tag, you have to create and push a tag. Also what's an ADO?	22:44
jklaus	vishal - I'd prefer to stay away from tagging	22:45
	I'd rather use branch naming of say a hotfix or feature branch	22:45
	→ queip joined	22:45
jklaus	but I want it to carry from said feature up to develop	22:45
	the version that is.. I think I may have figured out how	22:46
	← SkarmoutsosV left	22:46
jklaus	In the gitversion.yml I think I may be able to specify the major, minor, patch via the mergeVersion	22:47
	→ SkarmoutsosV joined	22:47
jklaus	I'm essentially looking at using branching as the way of controlling pre-release vs release	22:47
	for nuget packaging	22:47
	← SkarmoutsosV left	22:48
	→ SkarmoutsosV joined	22:49
	← bn_work left	22:51
	← theoceaniscool left	22:52
	← davidfetter_work left	22:53
	→ nic-hartley joined	22:59
	← tang^ left	23:00
	→ dre_ joined	23:01
	← kjartan left	23:02
	← oatmealraisin left	23:02
	← acercle left	23:05
	→ kjartan joined	23:06
	← n3wborn left	23:08
	← Lucas_Gray left	23:08
	← smitop left	23:11
	→ raedah joined	23:12
	← foul_owl left	23:14
	← LionsMane left	23:15
	← sgen left	23:18
	→ wreed joined	23:20
	→ seebyr joined	23:22
	→ yonder joined	23:24
	← dre_ left	23:24
	← seebyr left	23:25
	← sbeyer left	23:26
	→ foul_owl joined	23:27
	← moldybits left	23:28
	→ bradleyprice joined	23:34
	← dege left	23:36
	← bradleyprice left	23:38
	← duderonomy left	23:38
	← sozuba left	23:41
	→ sgen joined	23:42
	← Cabanossi left	23:45
	← infernix left	23:45
	← khisanth_ left	23:46
	← lungaro left	23:46
	← bluezone left	23:47
	← hio left	23:50
	→ Cabanossi joined	23:51
	← wreed left	23:53
	← queip left	23:53
R2robot	jklaus: https://nvie.com/posts/a-successful-git-branching-model/ is what I use	23:54
jklaus	R2robot - I'm not seeing a way I can carry a version stamp from say a release branch into a develop	23:58
	→ bradleyprice joined	23:58
	← bradleyprice left	23:58
jklaus	ie, I want to set the version by creating a release branch called releases/2.0.0	23:58
	when that PRs into develop I want develop to get tagged 2.0.0	23:58
R2robot	merge then tag?	23:59
	are you working solo?	23:59
	but why do you want to tag develop?	23:59

Logs Search ←Prev date Next date→

Channels Documentation