IRCloggy #git 2020-05-28

Provider of IRC logs since 2005.

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

	2020-05-28
	← ghost43 left	00:00
	→ ghost43 joined	00:01
	→ dedowsdi joined	00:02
	← misuto left	00:07
	→ braj joined	00:08
	← Brainium left	00:08
	← st-gourichon-fid left	00:11
	→ justanotheruser joined	00:13
	→ st-gourichon-fid joined	00:14
	→ ferdna joined	00:19
	← tiin57 left	00:20
	→ tiin57 joined	00:23
	← royal_screwup21 left	00:24
	→ royal_screwup21 joined	00:24
	← vicfred left	00:25
	← shabius_ left	00:26
	→ shabius_ joined	00:26
	→ denisse_ joined	00:28
	← denisse left	00:28
	← jayaura left	00:28
	← cpackham left	00:28
	← karlding left	00:28
	← hsiktas[m] left	00:28
	← Celmor[m] left	00:28
	← morguldir left	00:28
	→ Olipro_ joined	00:29
	← Olipro left	00:29
	← Benzi-Junior left	00:29
	Olipro_ → Olipro	00:29
	denisse_ → denisse	00:29
	← donofrio_ left	00:30
	→ Benzi-Junior joined	00:30
	← braj left	00:30
	→ donofrio_ joined	00:30
	→ Celmor[m] joined	00:31
	→ cpackham joined	00:31
	→ morguldir joined	00:32
	← crose left	00:33
	→ hsiktas[m] joined	00:33
	← orbyt_v7 left	00:34
	→ misuto joined	00:35
	→ eqw joined	00:36
	← troulouliou_div2 left	00:36
	→ jayaura joined	00:36
	→ braj joined	00:41
	← kchz left	00:45
	→ SpeakerToMeat joined	00:47
	← rsrx left	00:48
	→ troulouliou_div2 joined	00:48
	← tiin57 left	00:49
	→ tiin57 joined	00:53
	← royal_screwup21 left	01:01
	→ royal_screwup21 joined	01:01
	← Heirlung left	01:02
	← lucasb left	01:03
	→ Heirlung joined	01:03
	← nuala left	01:05
	← royal_screwup21 left	01:06
	← davispuh left	01:09
	← flex14 left	01:18
	→ flex14 joined	01:18
	→ shush joined	01:19
	← tiin57 left	01:19
	→ tiin57 joined	01:23
	→ fission6 joined	01:28
	← lukd left	01:30
	→ lukd joined	01:31
	← ShapeShifter499 left	01:31
	→ ShapeShifter499 joined	01:31
	→ Abbott joined	01:34
	← jwest left	01:37
	← shush left	01:41
	→ shush joined	01:41
	← flex14 left	01:42
	→ flex14 joined	01:42
	→ Sasazuka joined	01:43
	← Sasazuka left	01:43
	← flex14 left	01:43
	← lambda left	01:46
	← tiin57 left	01:50
	← g4570n left	01:53
	→ tiin57 joined	01:53
	→ orbyt_ joined	01:54
	← fission6 left	01:56
	← ShapeShifter499 left	01:56
	→ lambda joined	02:04
	← bitnoize left	02:06
	← shush left	02:09
	→ shush joined	02:10
	← shush left	02:15
	→ shush joined	02:16
	← rewrited left	02:17
	→ nuala joined	02:17
	← tiin57 left	02:20
	→ Sleepy63 joined	02:21
	← lambda left	02:21
	→ j9 joined	02:22
	lagothrix → Guest70993	02:22
	← Guest70993 left	02:22
	→ lagothrix joined	02:22
	← clime left	02:23
	← perrier-jouet left	02:23
	→ tiin57 joined	02:23
	← Cabanossi left	02:23
j9	Need help please: I am using Visual Studio Code on a Mac and when I push I get remote: permission to (repo name) denied to (name)... error 403	02:24
	How can I resolve this	02:24
	I can push pull from GitHub Desk without issues	02:24
	I think there is a config issue within VSC	02:24
	any help is appreciated...	02:25
rewt	check what credentials vscode is using	02:27
j9	Okay	02:27
	is that a simple find? New to VSC	02:27
rewt	no idea; that's more of a vscode question	02:28
j9	LOL okay thank you	02:28
rewt	maybe somewhere in settings	02:28
j9	Thank you	02:28
rewt	np	02:28
	← chachasmooth left	02:29
	→ Cabanossi joined	02:30
	→ chachasmooth joined	02:33
	→ karab44 joined	02:36
	← ferdna left	02:39
	← shush left	02:40
	← j9 left	02:42
	→ shush joined	02:42
	→ jetchisel joined	02:43
	→ Newami joined	02:44
	← shush left	02:47
	← saml left	02:48
	← tiin57 left	02:49
	→ tiin57 joined	02:53
	→ Rav3n joined	02:58
	→ Sonderblade joined	02:58
	← SpeakerToMeat left	03:02
	→ royal_screwup21 joined	03:02
	← denisse left	03:02
	→ denisse joined	03:03
	→ ShapeShifter499 joined	03:03
	→ lambda joined	03:04
	→ SpeakerToMeat joined	03:05
	← royal_screwup21 left	03:06
	← troulouliou_div2 left	03:08
	→ jwest joined	03:10
	← karab44 left	03:15
	→ shush joined	03:16
	← SpeakerToMeat left	03:19
	→ SpeakerToMeat joined	03:19
	← tiin57 left	03:20
	← shush left	03:20
	→ tiin57 joined	03:23
	→ omar_trisquel joined	03:26
	← cbreak left	03:31
	→ cbreak joined	03:31
	→ Goplat joined	03:39
	← omar_trisquel left	03:40
	← kupi left	03:43
	→ aw1_ joined	03:45
	← aw1 left	03:47
	→ Muimi joined	03:49
	← tiin57 left	03:49
	← jetchisel left	03:51
	→ jetchisel joined	03:51
	→ tiin57 joined	03:53
	→ bxu joined	03:55
	← Betal left	03:59
	← sostenuto left	04:03
	→ MG joined	04:03
	→ sostenuto joined	04:07
	→ donofrio__ joined	04:07
	← Trieste left	04:07
	→ Trieste joined	04:09
	← donofrio_ left	04:10
	← justanotheruser left	04:13
	→ fstd_ joined	04:14
	→ troulouliou_div2 joined	04:14
	← dmc left	04:16
	← fstd left	04:17
	fstd_ → fstd	04:17
	← MG left	04:19
	← tiin57 left	04:19
	→ dmc joined	04:20
	← braj left	04:21
	← jetchisel left	04:21
	→ tiin57 joined	04:23
	→ justanotheruser joined	04:23
	→ vicfred joined	04:28
	→ Guest20 joined	04:33
	→ shush joined	04:33
	← dmc left	04:34
	← shush left	04:38
	← troulouliou_div2 left	04:41
	← causasui left	04:42
	← tiin57 left	04:50
	← dedowsdi left	04:52
	→ tiin57 joined	04:53
	← Cabanossi left	04:56
	→ Cabanossi joined	04:58
	→ Blkt joined	04:58
	← Blkt left	05:00
	← ghost43 left	05:00
	→ ghost43 joined	05:00
	→ shush joined	05:04
	← shush left	05:09
	→ Blkt joined	05:10
	← Muimi left	05:12
	→ billyxu joined	05:17
	← billyxu left	05:18
	→ calcul0n joined	05:18
	→ billyxu joined	05:18
	← billyxu left	05:19
	→ billyxu joined	05:19
	← tiin57 left	05:19
	← bxu left	05:20
	← cgi left	05:20
	→ tiin57 joined	05:23
	→ dmc joined	05:24
	→ Junior joined	05:28
	← orbyt_ left	05:33
	← Trieste left	05:34
	← thiago left	05:35
	→ Trieste joined	05:37
	→ orbyt_ joined	05:42
	← Guest20 left	05:44
	← Trel left	05:49
	→ dedowsdi joined	05:50
	← tiin57 left	05:50
	→ raven-au_ joined	05:50
	→ Guest20 joined	05:50
	← raven-au left	05:51
	raven-au_ → raven-au	05:51
	→ bettencb joined	05:52
	→ tiin57 joined	05:53
	← Intelo left	05:54
	← hexnewbie left	05:59
	← andreas303 left	06:01
	→ Trel joined	06:02
	→ hexnewbie joined	06:04
	← orbyt_ left	06:05
	→ vals_ joined	06:13
	← tango_ left	06:15
	→ gp5st_ joined	06:18
	→ fitzgerald1337 joined	06:18
	← tiin57 left	06:19
	→ Harwood joined	06:19
	← Harwood left	06:19
	← gp5st left	06:19
	→ chele joined	06:23
	→ NeoCron joined	06:23
	→ tiin57 joined	06:23
	→ andreas303 joined	06:33
	← inkbottle left	06:36
	→ rfuentess joined	06:38
	← tonyj left	06:42
	← hexnewbie left	06:42
	← Goplat left	06:45
	→ Phylock joined	06:45
	→ mightyjens joined	06:47
	← tiin57 left	06:49
	→ clime joined	06:52
	← Heirlung left	06:52
	→ tiin57 joined	06:52
	← bettencb left	06:57
	→ fabs joined	06:59
	→ mobidrop joined	07:00
	← xerox_ left	07:03
	→ Heirlung joined	07:04
	→ shush joined	07:05
	← shush left	07:10
	→ xerox_ joined	07:11
	→ tonythomas joined	07:11
	→ wootehfoot joined	07:13
	← wootehfoot left	07:15
	← Technodrome left	07:16
	→ shomon joined	07:18
	← tiin57 left	07:19
shomon	hi, I've gotten myself into a git mess... my remote branch has some config files missing from gitignore, but I can't commit back until I fix it. Should I add them to gitignore in the remote as a new commit and then pull again to the local? thanks for any ideas or help!	07:21
	→ KnoP joined	07:22
	→ tiin57 joined	07:23
	← oprypin left	07:24
	← Sonderblade left	07:27
	→ quetz joined	07:29
	← CCR5-D32 left	07:30
	→ oprypin joined	07:32
	← dedowsdi left	07:35
	← Rav3n left	07:37
	→ zulutango joined	07:40
	← billyxu left	07:42
	← tiin57 left	07:49
	→ tiin57 joined	07:54
	← mat001 left	07:57
	→ chuffer joined	07:57
	→ algun joined	07:58
	→ dedowsdi joined	07:58
	← xcm left	07:58
	→ famubu joined	07:59
algun	What's the difference between `git reset (--soft)`, `git reset --heard`, and `git checkout .` and `git clean -f`?	07:59
ikke	git clean -f removes untracked files	08:00
	(only)	08:00
famubu	Hi. I did a commit and realized it was not good and went back to previous commit with `git reset --hard HEAD~1`. Does that mean the bad commit still exists? How can I delete it?	08:00
	← roboirc left	08:01
	← pikapika left	08:01
	← nikivi left	08:01
	← acetakwas left	08:01
	← POQDavid left	08:01
ikke	famubu: it still exists, yes, but usually you don't have to care about removing it. git will remove it eventually and as long as it's not part of any branch anymore, it will never be shared	08:01
	→ wootehfoot joined	08:02
famubu	ikke: Okay. Thanks.	08:03
ikke	algun: git reset --soft only changes where you current branch points to	08:04
	without any arguments it does basically nothing	08:05
	→ maryo joined	08:05
ikke	git reset will do the same thing as soft, but updates the index (staged files) as well	08:05
	← famubu left	08:05
algun	ikke, doesn't it unstage changes? Or is git reset different from git reset --soft?	08:05
ikke	algun: yes	08:05
	git reset is the same as git reset --mixed	08:05
	→ onmeac joined	08:05
ikke	(though, without specifying --mixed you can specify paths as well	08:06
	)	08:06
	← gordonfish left	08:06
ikke	git checkout . and git reset --hard are the same in only that specific case	08:06
	→ xcm joined	08:06
	← Abbott left	08:13
	→ Abbott joined	08:16
	← justanotheruser left	08:19
	← tiin57 left	08:19
	← chachasmooth left	08:22
	→ tiin57 joined	08:23
	← shomon left	08:27
	→ geowiesnot joined	08:28
	→ justanotheruser joined	08:28
	→ Muimi__ joined	08:32
	→ chachasmooth joined	08:32
	← lem-fr left	08:33
	→ d00f joined	08:33
	→ lem-fr joined	08:35
	← d00f left	08:39
	→ mr_shaman joined	08:42
algun	ikke, git reset --soft also moves things from the "reverted commits" to the index, right?	08:44
ikke	git reset --soft does not touch the index	08:45
	so the content will remain staged	08:46
	← tiin57 left	08:50
	→ phcerdan joined	08:51
	→ tiin57 joined	08:52
	→ tens0r joined	08:54
phcerdan	Is there a way replace a file in history with a modern version? I have a repo with uncompressed `png`, and I would like to rewrite history, but the references to old pngs to use the compressed version.	08:54
	→ KrachbummNT joined	08:56
ikke	man git replace	08:57
gitinfo	the git-replace manpage is available at https://gitirc.eu/git-replace.html	08:57
ikke	combined that with man git filter-branch or !filter-repo	08:58
gitinfo	A new git add-on that greatly improves on git-filter-branch: https://github.com/newren/git-filter-repo	08:58
	the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html	08:58
	← tens0r left	09:04
	→ shush joined	09:06
	→ c0c0 joined	09:08
	→ acetakwas joined	09:08
	→ pikapika joined	09:10
	→ POQDavid joined	09:10
	← chuffer left	09:11
	← shush left	09:11
	→ nikivi joined	09:12
	← zulutango left	09:13
	← Newami left	09:14
	→ zulutango joined	09:14
	→ Metalsutton joined	09:18
	← tiin57 left	09:19
	→ bitnoize joined	09:21
	→ locrian9 joined	09:21
	→ tiin57 joined	09:23
	← sunrunner20 left	09:27
	→ jwest_ joined	09:31
	← jwest left	09:34
	→ clara97 joined	09:39
	← g00s left	09:39
	→ aliss joined	09:40
	← acetakwas left	09:41
	→ acetakwas joined	09:42
	← Guest20 left	09:44
locrian9	Trying to create a single 'git format-patch' file that has 3 X commits together (http://ix.io/2nzb) and wanted the patch to be one long instruction to patch over the original file. Found that I could issue the 'git format-patch 2655e96^..b11fb1e' command, but it puts all 3 X commits together (single file) in a long segmented patch (http://ix.io/2nzg).	09:44
	→ cxl joined	09:45
cxl	Hi all, I am using git with bash, and I have aliased gi to git because I always miss the `t` when calling the command. How could I get autocompletion working with `gi` too, not only `git`?	09:45
ikke	cxl: https://stackoverflow.com/a/15009611/20261	09:47
	← Muimi__ left	09:48
	→ Muimi__ joined	09:49
	← tiin57 left	09:49
	← Trieste left	09:50
	→ Trieste joined	09:52
	→ shush joined	09:52
	→ tiin57 joined	09:53
	← c0c0 left	09:56
	← shush left	09:57
	→ roboirc joined	09:59
phcerdan	Thanks ikke for the git replace reference	09:59
	→ Guest20 joined	10:04
	← Guest20 left	10:09
	→ perrier-jouet joined	10:10
	← Muimi__ left	10:13
	← justanotheruser left	10:15
	← algun left	10:17
	← _xor left	10:18
	← tiin57 left	10:20
	→ tiin57 joined	10:23
	→ justanotheruser joined	10:23
	→ sysh joined	10:26
	← locrian9 left	10:26
	→ _xor joined	10:32
	→ quizzmaster joined	10:36
	quizzmaster → quizzi	10:37
	→ locrian9 joined	10:41
	→ Aattas joined	10:49
	← tiin57 left	10:49
	→ wnbeser joined	10:50
	← mobidrop left	10:51
	← locrian9 left	10:52
	→ mobidrop joined	10:52
	→ locrian9 joined	10:52
	→ alguien joined	10:52
	→ tiin57 joined	10:53
	← locrian9 left	10:53
	→ locrian9 joined	10:54
locrian9	test	10:54
	set	10:54
	→ crose joined	10:55
	← Metalsutton left	10:55
	← wnbeser left	10:56
	← perrier-jouet left	11:00
	← locrian9 left	11:03
	→ locrian9 joined	11:03
alguien	ikke, so what you're saying is that a commit is a reference into the index? So, a commit creates a reference that encompasses previously-unreferenced indexes?	11:04
ikke	a commit is created from the contents of the index	11:04
alguien	what does git reset --soft HEAD^ do exactly?	11:05
	see, I'm not sure about git's abstractions if I need to ask questions like these	11:06
	(but that's Linus' fault)	11:06
ikke	It sets the current branch one commit back	11:06
	but nothing else	11:06
alguien	yes, but what does that mean	11:08
	I don't know.	11:08
	ikke, it's ok to ignore me if you're not in a mood to guess what I need to learn	11:09
	← locrian9 left	11:09
	→ davve joined	11:11
ikke	It's as if you wen't back in time just before you did the commit command	11:11
	you changed files, you staged them (git add), but not commit yet	11:11
davve	can a commit message be too long? (I Think i write way too short ones when I see others write them)	11:11
	or too short	11:12
	I feel I should be writing longer ones	11:12
alguien	davve, usual rules of communication apply I guess	11:12
davve	but not on the first line	11:12
ikke	for what git matters: no	11:12
	← tiin57 left	11:19
	→ tiin57 joined	11:23
	← Trieste left	11:30
	→ Trieste joined	11:32
	← sudoforge left	11:32
	→ Brainium joined	11:33
rfuentess	davve: there is a "golden" rule for commit messages: 53/72 (or something like that) basically says first line cannot be longer than 53 chars, the rest of body is for 72	11:34
	and for the length of the message it "should be useful to understand what was done" (Whatever that means for you)	11:35
ikke	!clean_commit	11:35
gitinfo	[!clean_message] It helps to write clean commit messages. http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html explains how.	11:35
rfuentess	oh, 50/72 it's seems that my main projects used their ad-hoc rule :P	11:36
moldy	i find 50 too short	11:37
ikke	I use 50 as a soft limit	11:37
moldy	i just use the same limit for the subject as for the body	11:38
ikke	I do try to keep subjects shorter	11:38
moldy	(78 in my case)	11:38
	← maxwilliamson left	11:39
	→ rewrited joined	11:39
	← rewrited left	11:39
	→ rewrited joined	11:39
	→ maxwilliamson joined	11:41
	← phcerdan left	11:43
	akem_ → akem	11:44
	→ locrian9 joined	11:45
	→ aw1__ joined	11:45
	→ AtumT joined	11:46
	← aw1_ left	11:47
	← AtumT left	11:47
	→ duderonomy joined	11:48
	← clara97 left	11:48
	← tiin57 left	11:49
	→ CodeSlingerPaul joined	11:50
	→ AtumT joined	11:51
	→ royal_screwup21 joined	11:52
	← ghormoon left	11:53
	→ tiin57 joined	11:53
	→ Betal joined	11:53
	→ ghormoon joined	11:53
locrian9	test	12:04
bremner	!hi	12:05
gitinfo	[!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see https://gitirc.eu/ - Take backups (type !backup to learn how) before taking advice.	12:05
	← locrian9 left	12:06
	→ locrian9 joined	12:06
	← locrian9 left	12:08
	→ locrian9 joined	12:09
	← locrian9 left	12:10
	→ locrian9 joined	12:10
	→ mark4 joined	12:12
mark4	so im trying to do some stuff on github for work and a co-worker has given me some screenshots of where I need to go but im not seeing the same views he is	12:12
	i clicked on the 'code' tab and in his screenshot this has a bunch of sub tabs where one is 'overview'	12:13
	i dont have that	12:13
	is this setting somewhere?	12:13
	← locrian9 left	12:14
	→ bakadesusenpai joined	12:14
mark4	his sub tabs under code are overview, yours, active, stale, all branches. how do i get those sub tabs?	12:14
	→ calcul0n_ joined	12:15
	← xcm left	12:16
	← ghost43 left	12:16
	→ xcm joined	12:16
	→ phcerdan joined	12:16
	→ ghost43 joined	12:17
	→ locrian9_ joined	12:17
rfuentess	mark4: Sadly your questions are about gitHub (a platform) instead of git. I think you could receive better answer in other channels focused over github	12:17
	← locrian9_ left	12:18
	← calcul0n left	12:18
	← tiin57 left	12:19
	→ rafasc joined	12:22
	→ tiin57 joined	12:22
mark4	is there a github channel?	12:23
	lol i guess there is :)	12:23
	tyty	12:23
	← mark4 left	12:23
	→ locrian9 joined	12:27
	← mns left	12:29
	← Kaivo left	12:30
	→ dqx_ joined	12:31
	→ Kaivo joined	12:32
	→ PyDon joined	12:33
	← ghost43 left	12:33
	→ ghost43 joined	12:34
PyDon	hi, can anyone help me? I am trying to make sense of git-http-backend. I use Flask and made it work in my app, but for bigger pushes I receive "fatal: the remote end hung up unexpectedly"	12:34
	As far as I understood, I accept the incoming connection and call git-http-backend with the corresponding environment and commands and connect the streams - "that's it"	12:35
	Do I need to handle anything else?	12:36
	→ fission6 joined	12:40
locrian9	How can I create a single 'git format-patch' that doesn't separate my 3 X commits (http://ix.io/2nzb) into a combined 3 piece patch, but rather just creates a single unified patch going from my original file (2655e96) to the final version (b11fb1e). When I tried doing this command 'git format-patch 2655e96^..b11fb1e --stdout > foo.patch', the foo.patch patch has all 3 X commits goes into a combined 3 patch	12:41
	file (http://ix.io/2nzD). Is there any way to just create a patch that has the single instruction patch set, and not divided into 3 X procedures in the patch?	12:41
	← phcerdan left	12:43
ikke	I think only by squash those 3 commits into one	12:45
	git format-patch operates on commits, so if you want just one single patch, you need to create on single commit	12:45
rafasc	Or alternatively, use git diff HEAD~3 output.	12:45
ikke	Depends on whether you want to get an actual commit out of it, or just apply the changes somewhere	12:47
	→ Maxattax joined	12:48
	← tiin57 left	12:49
	← mr_shaman left	12:51
	→ tiin57 joined	12:53
	→ phcerdan joined	12:57
	→ CCR5-D32 joined	12:58
	← royal_screwup21 left	12:58
	→ cr4y1 joined	12:59
	→ royal_screwup21 joined	12:59
	← tonythomas left	13:00
	→ ryszard joined	13:01
ryszard	hey	13:01
	when I create a brach is there any way to add any comment/desriprion to this newly created branch in addition to just branch name?	13:02
	← geowiesnot left	13:02
	→ maryo_s joined	13:03
	← maryo left	13:07
	→ siers joined	13:07
siers	can I move to more than the last branch with something other than "g checkout -"? can I see last N checkouted branches?	13:07
	→ Guest20 joined	13:08
	→ geowiesnot joined	13:08
ikke	git log -g --oneline \| grep "checkout: moving	13:10
	→ mat001 joined	13:11
ikke	there is also HEAD@{-N} as shortcut	13:11
	so git checkout - is the same as git checkout HEAD@{-1}	13:11
siers	ah, but HEAD isn't tied to branches, so that's why it works	13:11
Marmotte	you can use git log --walk-reflogs --grep-reflog=checkout	13:12
nedbat	ryszard: there are branch descriptions, but i've never used them, and not sure if they are useful: https://ericjmritz.wordpress.com/2015/11/13/using-branch-descriptions-in-git/	13:12
Marmotte	(with --oneline if you prefer)	13:12
	← NeoCron left	13:12
rafasc	ryszard: you can use git branch --edit-description	13:13
	← ghost43 left	13:13
ikke	Marmotte: ah, didn't know about --grep-reflog	13:13
	→ ghost43 joined	13:13
ikke	Marmotte: I tried --grep but that didn't work	13:13
	nice	13:13
	much bet	13:13
	ter	13:13
rafasc	but only a few select things will use the description, and most of them require you enable it explicitly.	13:14
Marmotte	ikke: I learnt only one thing : git can do anything in a single command, the hardest is to find how :D	13:15
rafasc	also, the description is stored on gitconfig, so you cannot share the descriptions, which kinda limits its potential.	13:16
ikke	Marmotte: :D	13:16
PyDon	does anyone know why I would need git-receive-pack/git-upload-pack if there is git-http-backend?	13:17
ikke	Because git http-backend still relies on those two commands to do the actual work?	13:17
rafasc	PyDon: because the http-backend is mostly a wrapper for receive/upload-pack	13:18
	← tiin57 left	13:19
	→ tiin57 joined	13:23
ryszard	thanks	13:24
PyDon	oh, is that?	13:25
	thank you!	13:26
	→ kadz joined	13:27
	→ bettencb joined	13:30
	← rishi left	13:36
PyDon	I am experimenting with writing a little git server to understand git better. Would you rather implement git-http-backend or directly receive/upload-pack commands?	13:37
	I have the feeling git-http-backend is just there to support older Git clients and I should directly focus working on the underlying commands	13:37
	→ rishi joined	13:37
rafasc	Why would you break backwards compatibility on purpose?	13:38
	← syr left	13:38
	→ syr joined	13:38
	→ mns joined	13:38
	← opal left	13:38
rafasc	There's two pieces in this puzzle. One is how git negotiates what is to be transferred between the remote and the client.	13:39
	→ opal joined	13:40
	→ ar1el joined	13:40
rafasc	That is what upload/receive pack does.	13:40
PyDon	I don't want to break anything, supporting both would be nice	13:40
rafasc	The other is how is this communication done, (git-http-backend, ssh, w/e).	13:40
PyDon	I just don't understand exactly what the relation between all these commands is. For instance..	13:41
rafasc	They're not the same thing.	13:41
PyDon	That makes sense, but git-http-backend uses the other two commands under the hood, correct?	13:41
	← jaziz left	13:44
	→ Narrat joined	13:44
PyDon	Just one last question, i try to find what SmartHTTP actually means for my CGI calls. Does SmartHTTP mean full duplex connections?	13:47
	← opal left	13:47
rafasc	PyDon: you can check the source: https://github.com/git/git/blob/master/http-backend.c#L491	13:47
	smart http just means you have a way to call upload-pack and be smart about what is transferred.	13:49
	dump http just tries to get the files directly. Asks for master, then looks at the commit, figures it also needs all of its parents, ask for them, rinse repeast.	13:49
	← tiin57 left	13:49
rafasc	But that logic lives in the 'http remote helper'.	13:51
	man git-http-fetch	13:51
gitinfo	the git-http-fetch manpage is available at https://gitirc.eu/git-http-fetch.html	13:51
	→ oxymoron93 joined	13:51
	← ShapeShifter499 left	13:53
	→ tiin57 joined	13:53
	→ ShapeShifter499 joined	13:53
PyDon	@rafasc thank you!	13:54
	→ shush joined	13:54
	← geowiesnot left	13:55
	← kadz left	13:55
	→ opal joined	13:55
	→ mr_shaman joined	13:56
	→ wondiws joined	13:56
rafasc	PyDon: if you are messing with this, see man git remote-ext as well.	13:56
gitinfo	PyDon: the git-remote-ext manpage is available at https://gitirc.eu/git-remote-ext.html	13:56
wondiws	how can I remove my incorrectly entered password from the cache (in Windows)?	13:56
	→ sunrunner20 joined	13:57
ikke	search for credential manager in start	13:57
	remove the entry from there	13:57
	← shush left	13:59
wondiws	ikke, thanks	13:59
	← aliss left	14:03
	← oojacoboo left	14:03
	→ algun joined	14:03
	← alguien left	14:05
	→ sudoforge joined	14:06
	→ strk joined	14:07
	→ oojacoboo joined	14:07
strk	git log --pretty=full # omits the commit date, why ?	14:07
	and, how to show _FULL_ info about a commit ?	14:07
	"fuller" (found)	14:07
	→ geowiesnot joined	14:08
	→ gordonfish joined	14:10
rafasc	strk: or 'raw'	14:13
	← syr left	14:16
	→ syr joined	14:16
	← ShapeShifter499 left	14:17
	← royal_screwup21 left	14:19
	→ royal_screwup21 joined	14:19
	← tiin57 left	14:19
	← wondiws left	14:21
	→ g4570n joined	14:21
	← maryo_s left	14:21
	→ tiin57 joined	14:23
	→ thiago joined	14:24
strk	it looks like 'fuller' has more info ?	14:25
	namely: AuthorDate, CommitDate	14:25
	ah, it's embedded, I see	14:25
	as a timestamp	14:25
	← oxymoron93 left	14:26
ikke	yeah, fuller decodes the information, raw just shows you what's stored in the commit	14:29
algun	ikke, thanks for trying to explain git reset to me	14:30
	i think i'll have to read the git book section on it though (think it's called "demistifying reverts" or something)	14:30
	*reset	14:31
	← ghost43 left	14:31
	← lem-fr left	14:31
	→ ayaka joined	14:31
ayaka	how to recovery some deleted local commit	14:32
	I have create branch A, it is wrongly merged into branch B	14:32
	later I delete branch B	14:32
	→ ghost43 joined	14:32
ayaka	but there are some commits in branch A, and from the console history	14:32
	I can still see those some commits which was from branch A(git show)	14:33
	→ lem-fr joined	14:35
rafasc	strk: raw includes the tree hash, which is helpful sometimes. And depending on your log.date format, having the exact timestap is nice.	14:35
	ayaka: check git reflog	14:36
ayaka	I hope it can save me life	14:38
	rafasc, HEAD@{45} maybe the latest commit I need	14:40
	so I should git checkout -b foo HEAD@{45} ?	14:41
rafasc	yeah.	14:41
	← algun left	14:41
ayaka	Thank you so much, it saves my life	14:42
	but if I have ever run gc, those record would gone?	14:43
ikke	it would keep it for 90 days	14:44
rafasc	I highly recommend not running gc ever.	14:44
	Unless you are trying to evict sensitive data from your disk.	14:44
	← Trieste left	14:46
	→ hexnewbie joined	14:46
	→ planetcall\|work joined	14:47
ayaka	of course I won't	14:47
	I just want to know whether I can try my luckily or I just give up	14:47
	→ troulouliou_div2 joined	14:47
ikke	git runs gc automatically	14:49
	← tiin57 left	14:49
	→ Trieste joined	14:49
rafasc	From my experience, the dangerous ones are "git reset --hard", git checkout -f, and git checkout REF -- FILENAME.	14:50
	Because they discard things that are not tracked by git yet.	14:50
mgedmin	an accidental rm -r .git is also dangerous	14:51
ikke	git checkout .	14:51
	git clean -f	14:51
	← strk left	14:53
	→ tiin57 joined	14:53
	← Ignacy left	14:55
rafasc	forgot about being bit by git clean -fdx recently.	14:56
	gxt__ → gxt	14:56
rafasc	mgedmin: That and the 'delete and reclone' "solution".	14:56
	→ guideX joined	14:57
rafasc	Damn you xkcd 1597	14:57
guideX	is there a easy care free way to use git? I feel like I must google through so many errors, and git is this huge time suck for me	14:58
	I keep running back to svn because, I don't want to spend so much time researching git errors	14:58
	for instance just trying to push up some code, I have to google my way through 6 different problems	14:59
mackerman	If you like svn, feel free to use it. I don't care what you use.	14:59
	Feel free to ask about specific git problems here.	14:59
gxt	If I'm committing a bunch of changes from my workdir as a series of commits, and after having committed some already I notice that some hunk I committed e.g. 3 commits ago should actually only be committed now, what's the quickest way to achieve that?	15:00
guideX	why do I see this all the time, https://www.datree.io/resources/git-error-fatal-not-a-git-repository	15:00
	← jwest_ left	15:00
guideX	I have to like, delete all the git studff, and recreate it, and it's really annoying	15:00
rafasc	guideX: most of the time, people complaining about git being a 'time suck' fall into the trap of trying to using it without taking the time to learn it. If you don't learn the tool you are using, you'll always be fighting it.	15:00
guideX	idk I'm frustrated with it, I've been "learning" it since 2012	15:01
	← jas4711 left	15:01
guideX	I basically always am learning it, and never using it	15:01
gxt	I usually fix it by making a --fixup commit for the old commit after using checkout -p to restore the old state, but it feels ugly.	15:01
rafasc	guideX: the delete and reclone is an antipattern. And that's what is causing you to not learn how to use it.	15:01
	← lem-fr left	15:01
	← PyDon left	15:02
	→ irrgit joined	15:02
rafasc	because you quick bail, you never understand what caused the issue and how to avoid it.	15:02
	That would be like: just download the hello world example and try again. You'll never learn how to progress with the language.	15:03
	→ lem-fr joined	15:04
rafasc	guideX: that just means the directory you are at is not a git repository.	15:04
guideX	rafasc, typically it is, and then I delete the .git, and go create a new one and move it into place and it works for a while again	15:05
	sometimes I have to do this multiple times in a row until it works	15:05
rafasc	never delete .git	15:05
guideX	it's really obnoxious	15:05
rafasc	a directory without .git, is not a git repostory.	15:05
	→ stdedos joined	15:06
guideX	so there's that, also I keep seeing this "Can't update: no tracked branch No tracked branch configured for branch master. To make your branch track a remote branch call, for example, git branch --set-upstream master origin/master"	15:06
	sometimes also "don't know what to push because unknown branch origin/master"	15:07
rafasc	git told you about the problem, and told you how to fix it. If you don't at least try to understand what it is trying to say, well...	15:07
	← justanotheruser left	15:08
	← mobidrop left	15:08
guideX	I can go into the cli, but I'm using tortoise git, I have no idea what it's on about the branches, there are no branches	15:08
	→ Ignacy joined	15:08
guideX	it keeps complaining about branches, but I'm not at all using any	15:08
ikke	guideX: imho, tortoisegit is not the best way to interact with git if you don't already understand how git works	15:09
guideX	I kinda just want it to shut up and take my code, and it'll appear in the root/trunk etc	15:09
ikke	git is not svn, trying to treat it as svn is only going to be counter productive	15:09
	like you experience	15:10
	→ benyoo joined	15:10
	→ jwest joined	15:10
rafasc	guideX: Then I suggest you keep svn... If you just want to "upload my changes", the advantages of git won't probably apply to you.	15:10
benyoo	Hello, can I delete the complete history below the HEAD?	15:11
mackerman	Strange that tortisegit would make the commit to only one branch use case difficult.	15:11
rafasc	Also, it is almost mandatory to learn git via cli. Guis make so many abstractions, and hide so many aspects of the workflow, that it makes it really hard to actually learn the tool.	15:12
guideX	I'm also constantly getting stuck with obscure errors getting to github, it'll get to that halfway point to my local machine, then code changes get stuck there, and I have very obscure errors to work with, like "Git did not exit cleanly error #" and there's nothing more to work with	15:12
	thyat's just really super frustrating, and I'm never sure what to do next	15:12
	typically happens when I've been working on a project for a while, and somewhere in the middle of development, gets stuck on my local machine forever	15:13
	usually I delete the whole github repo, and create a new one, and recommit the newest code, or something drastic like that, but what do I do next time it happens?	15:14
rafasc	when you have some spare time, go to the !book, with a laptop on the side.	15:14
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	15:14
rafasc	guideX: you will never now how to fix the next time it happens, if you don't understand what is happening and resort to delete and reclone.	15:15
	delete and reclone is never the answer.	15:15
guideX	when this happens, I basically have the "git did not exit cleanly" with generic error number, which is not helpful diagnosing the problem	15:16
	and my code changes won't go all the way to github, only to that first step on your local pc	15:17
rafasc	guideX: use the cli instead. It's not clear that those are git errors, they could be turtoise ones.. Now you are fighting two tools instead of one.	15:18
	Once you understand git, by all means, feel free to use a gui that makes some part of the process easier.	15:18
	← tiin57 left	15:19
	→ mowcat joined	15:20
rafasc	benyoo: you could use: git checkout --orphan=new_master HEAD; git commit; then if you really want to proceed, git checkout -B master new_master;	15:22
	← Guest20 left	15:22
	← tolland left	15:22
	→ tiin57 joined	15:22
	← robink left	15:23
	→ tolland joined	15:23
guideX	well anyways, thanks for the tips, guess I'll just keep bumbling around with it	15:24
	→ robink joined	15:24
	← troulouliou_div2 left	15:25
	← mightyjens left	15:25
rafasc	guideX: Don't bumble with it. Dedicate a small ammount of time trying to learn it. Make a dummy repo and experiment around. Resit the temptation to rm and reclone. !book !learn_git_branching and https://gitexercises.fracz.com/ are good resources to learn.	15:26
gitinfo	guideX: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	15:26
	guideX: A nice tutorial visualizing git branching: http://pcottle.github.io/learnGitBranching/	15:26
rafasc	benyoo: The easiest way would be to init a new repo and copy the files there. But I won't suggest that because it makes the point I was trying to make to guideX weaker. :^)	15:27
guideX	well I have repositories for my home project so I can learn git, but I'm not able to use git in the workplace or with other developers etc	15:27
	I have a few books, but I'll try those out	15:28
rafasc	guideX: forget about using it in a useful project. Try with a dummy repo first.	15:28
	it will be harder to solve a conflict in file with actual code, than fixing it in a file with a list of "fruits" one per line.	15:29
	or whatever you use as a dummy example.	15:29
	→ Sasazuka joined	15:29
	← dedowsdi left	15:30
	→ justanotheruser joined	15:37
	→ zebrag joined	15:37
	→ troulouliou_div2 joined	15:38
	← xcm left	15:39
	→ xcm joined	15:40
	→ Muimi joined	15:41
	← chele left	15:46
	← tiin57 left	15:49
	← geowiesnot left	15:49
	← ghost43 left	15:53
	→ tiin57 joined	15:53
	→ ghost43 joined	15:53
	→ shush joined	15:55
	← shush left	15:59
	→ shush joined	16:00
	→ f4bi joined	16:01
	→ geowiesnot joined	16:03
	→ hbautista joined	16:05
	← justanotheruser left	16:08
	→ CoolerX joined	16:15
CoolerX	how do you change remote?	16:15
	I want to change the remote to a different github repo	16:15
	→ Enphuego joined	16:15
	← dqx_ left	16:17
rewt	man git remote	16:18
gitinfo	the git-remote manpage is available at https://gitirc.eu/git-remote.html	16:18
rewt	git remote set-url	16:19
	you can also add another remote, so you have 2 upstreams	16:19
	← tiin57 left	16:19
	→ tiin57 joined	16:22
benyoo	I drive crazy! I added .idea to my .gitignore file, but why I always see some files in my stage from that directory?? :*(	16:23
ikke	!ignore_tracked	16:24
gitinfo	Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	16:24
CoolerX	hint: Updates were rejected because the remote contains work that you do	16:24
	hint: not have locally. This is usually caused by another repository push	16:24
	hmm	16:24
	can I just force push?	16:24
	how do I force push?	16:24
ikke	git push --force	16:24
	→ justanotheruser joined	16:24
CoolerX	ok	16:25
ikke	Use at your own risc	16:25
CoolerX	how do I add stuff that shows up red to my .gitignore?	16:25
benyoo	ok thank you !	16:25
CoolerX	when I do git status some things show up red	16:25
rewt	edit .gitignore	16:26
CoolerX	I mean automatically	16:26
	git ignore	16:26
ikke	You have to be a bit more specific	16:26
	there are different things that show up red	16:26
CoolerX	there are some untracked files that show up red	16:26
	ikke, right I just want the untracked files to be added to .gitignore	16:26
ikke	CoolerX: does git ls-files -o return those files?	16:27
	git ls-files -o --exclude-standard	16:27
	← shush left	16:27
	→ shush joined	16:28
CoolerX	ikke, yes	16:28
	git ls-files -o --exclude-standard >> .gitignore	16:28
	?	16:28
ikke	yes	16:29
	← jrnieder left	16:30
CoolerX	thanks	16:30
	← CoolerX left	16:30
	← nikivi left	16:30
	→ nikivi joined	16:31
	← shush left	16:31
	yashi → JabraalElite	16:32
	→ theoceaniscool joined	16:33
	→ shush joined	16:33
	← f4bi left	16:40
	→ NeoCron joined	16:41
	→ maryo joined	16:41
	→ Seveas joined	16:42
	← dpflick left	16:47
	← tiin57 left	16:49
	← ghost43 left	16:51
	→ ghost43 joined	16:51
	→ tiin57 joined	16:53
	← theoceaniscool left	16:53
	← albel727 left	16:57
	→ orbyt_v7 joined	16:59
	→ mobidrop joined	17:00
	← jwest left	17:00
	→ orbyt_ joined	17:01
	splud → dementia	17:04
	← mobidrop left	17:04
	dementia → splud	17:06
	JabraalElite → yashi	17:07
	→ jwest joined	17:11
	← NeoCron left	17:13
	← Muimi left	17:13
	→ Newami joined	17:14
	← Newami left	17:18
	→ Guest20 joined	17:19
	← tiin57 left	17:19
	→ tiin57 joined	17:22
	← rfuentess left	17:33
	→ navidr joined	17:35
	← dob1 left	17:45
	← fitzgerald1337 left	17:45
	→ DolphinDream joined	17:45
	← tiin57 left	17:49
	→ f4bi joined	17:53
	→ tiin57 joined	17:53
	← crose left	17:55
	→ theoceaniscool joined	17:55
	← orbyt_ left	17:56
	← orbyt_v7 left	17:56
	← gp5st_ left	17:58
	→ captain42 joined	17:59
	← mr_shaman left	18:05
	→ jimi_ joined	18:06
	← Junior left	18:07
	← ohmyfromage left	18:10
	← phcerdan left	18:11
	→ ohmyfromage joined	18:12
	→ gp5st_ joined	18:13
	→ goldmund joined	18:14
	← tiin57 left	18:19
	← xerox_ left	18:22
	→ xerox_ joined	18:22
	→ tiin57 joined	18:22
	← sauvin left	18:23
	← mns left	18:25
	→ mns joined	18:25
	→ g00s joined	18:27
	← stdedos left	18:32
	← planetcall\|work left	18:36
	→ orbyt_ joined	18:36
	→ BPL joined	18:38
	→ aspiers joined	18:38
	→ vladoski joined	18:39
vladoski	Hi guys, I have a project where I need to "export" git to another project. I mean i need to have the history of the first project into the second one	18:40
ikke	you can add one as a remote to the other and fetch	18:41
vladoski	ah okay let me try then	18:42
	thanks	18:42
	→ orbyt_v7 joined	18:42
ikke	You still have to decide what you want to happen next	18:43
	they are still unrelated	18:43
	→ iffraff joined	18:44
	← tiin57 left	18:49
	← goldmund left	18:50
	→ lucasb joined	18:51
	→ tiin57 joined	18:52
	← aspiers left	18:57
	← theoceaniscool left	19:00
	← cd left	19:01
	← wootehfoot left	19:01
	← jwest left	19:02
vladoski	ikke, okay it worked, thanks!	19:02
imMute	vladoski: like have one project become a subdirectory of the other (along with all the history of both) ?	19:07
vladoski	imMute, no i have a svelte project that I have to put into phonegap	19:07
	so I used a boilerplate found on github and put all the svelte files in that boilerplate	19:07
	the majority of the files went to a subdirectory, but not everything	19:08
	← jimi_ left	19:11
	→ wootehfoot joined	19:12
	→ mekhami joined	19:13
mekhami	is there a way to commit without affecting the blame for the changed files/lines? i want to run a massive code reformat, and running filter-branch to rewrite the history takes many many many hours	19:14
imMute	mekhami: I don't think so since the blame is made by looking at the commit history for each line	19:16
ikke	You can add configuration to specify the path to a file that contains a list of hashes of commits to ignore for blame	19:17
	blame.ignoreRevsFile	19:17
mekhami	I just discovered that on an article, looking at that option now	19:17
	← tiin57 left	19:19
	→ tiin57 joined	19:23
vladoski	okay i've done something bad, now i have 2 duplicate commits and a merge that I cannot understand from where's coming	19:24
ikke	!situation	19:26
gitinfo	Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" \| curl -F text=@- https://upaste.de/` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	19:26
vladoski	ikke, https://upaste.de/LTJ	19:27
ikke	did you do a rebase and then a git pull?	19:27
	← Xiti left	19:27
ikke	most likely you did	19:28
	or git commit --amend	19:28
vladoski	i've done just a git pull from the "local" remote repo and then i've dove a git reset HEAD~ git commit -C because i've edited something, and yes then i've did a git pull	19:31
	I've tried to revert to the first phonegap commit but doesn't work. I've used this: git revert --no-commit <hash> HEAD	19:32
surial	okay, so you have the state of your repo as it was (after the commit 'created Profile route'. Then on that code base, you've done roughly the exact same thing, twice, with no or small differences, due to that rebase. Presumably, exactly one of those two commits is 'correct' and the other is 'incorrect'. reset your master to the correct one, push (with -f if you have to, though note that if you pushed this already and others have	19:32
	been writing code off of the 'wrong' one, this needs coordination between everybody with a copy of this repo) - and you're good to go.	19:32
	← sysh left	19:32
surial	vladoski: revert, IIRC, creates a new commit that undoes another commit. you don't want that, you want reset.	19:32
	→ m0viefreak joined	19:33
surial	but first presumably git show b1135e3 and git show 2cddc2b, or possibly git diff b1135e3..2cddc2b to see which of the two similar commits is the 'right' one and which is the 'wrong' one (or if they both are partly right partly wrong, that's possible, perhaps).	19:33
	→ jimi_ joined	19:38
	→ dob1 joined	19:39
	← Guest20 left	19:43
	→ cdown_ joined	19:43
	← cdown left	19:44
	cdown_ → cdown	19:44
vladoski	surial, okay now everything works, thanks for the reset	19:44
	→ aw1_ joined	19:46
	← aw1__ left	19:48
surial	vladoski: \O/ - let's hope you didn't delete any history :/ (if you're missing stuff, it'll be there for a while, but eventually git will remove it. "git reflog" prints all commits, 'dead end' or not still available, it'll be one of those, and you can update your dir to it with 'git checkout abcdef' where abcdef is the git commit name listed in reflog. So, if within the next week you find you're missing something, that's your out.	19:48
	After that, it'll just be gone.	19:48
	← tiin57 left	19:49
	→ cgi joined	19:49
	← aw1_ left	19:49
	→ aw1_ joined	19:50
	→ tiin57 joined	19:52
	→ crose joined	19:52
	← xcm left	19:54
	→ xcm joined	19:55
	← f4bi left	19:59
	← Maxattax left	20:04
	← nabil left	20:06
	← Abbott left	20:10
	← oatmealraisin left	20:10
	← vladoski left	20:11
	→ Xiti joined	20:11
	← tiin57 left	20:19
	→ tiin57 joined	20:23
	← Hello71 left	20:24
	← benyoo left	20:25
	→ Abbott joined	20:30
	← Abbott left	20:33
	← Aattas left	20:36
	→ Hello71 joined	20:36
	← aw1_ left	20:41
	→ aw1_ joined	20:42
	← robink left	20:42
	→ robink joined	20:44
	← cr4y1 left	20:45
	← Brainium left	20:45
	← tiin57 left	20:49
	← clime left	20:50
	← aw1_ left	20:51
	→ tiin57 joined	20:52
	← BPL left	21:06
	← Trieste left	21:12
	→ snoyes joined	21:13
	→ Trieste joined	21:14
snoyes	I've cloned a repo from github. Now I've decided I want to fork the original repo. Is there a good way to tell my clone to point to my fork instead, or should I just clone my fork?	21:14
ikke	you can add your fork as a new remote, or update your current remote	21:15
	man git remtoe	21:15
gitinfo	the git manpage is available at https://gitirc.eu/git.html	21:15
ikke	either git remote add or git remote set-url	21:15
snoyes	thanks	21:16
	→ mowotter joined	21:19
	← cliluw left	21:19
	← tiin57 left	21:19
	→ mat001_ joined	21:20
	← mowcat left	21:22
	→ jwest joined	21:22
	→ tiin57 joined	21:23
	← mat001 left	21:24
	← royal_screwup21 left	21:26
	← gp5st_ left	21:26
	→ royal_screwup21 joined	21:26
	← g4570n left	21:28
	→ g4570n joined	21:29
	→ clime joined	21:39
	← quetz left	21:42
	→ oatmealraisin joined	21:43
	← m0viefreak left	21:47
	← troulouliou_div2 left	21:49
	← tiin57 left	21:49
	← snoyes left	21:51
	← onizu left	21:52
	→ tiin57 joined	21:53
	→ ethernether joined	21:53
	← navidr left	21:54
	← Trieste left	21:55
	→ cliluw joined	21:55
	← iffraff left	21:57
	← orbyt_ left	21:58
	→ Trieste joined	21:58
	← rewrited left	21:59
	→ GreateSMB1 joined	21:59
	← bettencb left	22:00
	→ wnbeser joined	22:02
GreateSMB1	hi everyone	22:03
	I need some help about topic - which console tool is the best as 'git mergetool'?	22:03
gitinfo	GreateSMB1: 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.	22:03
	→ bettencb joined	22:04
	← bettencb left	22:04
	→ bettencb joined	22:05
	← shush left	22:05
	← orbyt_v7 left	22:05
	→ orbyt_ joined	22:08
rafasc	!best	22:11
gitinfo	[!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)	22:11
	→ strobelight joined	22:12
	← fission6 left	22:12
	← bettencb left	22:14
	← CodeSlingerPaul left	22:18
	→ sheddy_ joined	22:19
	→ jstein joined	22:19
	← tiin57 left	22:19
	→ orbyt_v7 joined	22:20
	→ tiin57 joined	22:23
	← strobelight left	22:24
	→ shush joined	22:25
	← orbyt_ left	22:25
	← Sasazuka left	22:27
	→ Sasazuka joined	22:27
	→ troulouliou_dev joined	22:28
	← SpeakerToMeat left	22:30
	→ SpeakerToMeat joined	22:31
	← xerox_ left	22:32
	→ phcerdan joined	22:39
	← phcerdan left	22:39
	← Phylock left	22:39
	← zebrag left	22:40
	→ zebrag joined	22:43
	← troulouliou_dev left	22:44
	← calcul0n_ left	22:48
	← tiin57 left	22:49
	→ inkbottle joined	22:50
	← zebrag left	22:50
	→ tiin57 joined	22:52
	← xelxebar_ left	22:55
	→ xelxebar joined	22:57
	← DolphinDream left	23:01
	→ DolphinDream joined	23:01
	← DolphinDream left	23:01
	→ omar_trisquel joined	23:03
	← wnbeser left	23:04
	→ fairuz joined	23:06
	→ xerox_ joined	23:08
	← gavlee left	23:08
	→ gavlee_ joined	23:08
	← ghost43 left	23:08
	→ ghost43 joined	23:09
	← fabs left	23:12
	sheddy_ → sheddy	23:15
	→ Intelo joined	23:15
Intelo	I had a changed file, I pulled from origin, the changes were got. How can I recover?	23:15
	← xerox_ left	23:18
	← tiin57 left	23:19
	→ sudomake joined	23:20
nedbat	Intelo: changes were got? what does that mean?	23:22
Intelo	uncommited	23:22
	file change	23:22
	actually i deleted old origin, added new, pulled	23:22
	I wonder why I didn't got any message saying (your changes will be overwritten)	23:22
	→ tiin57 joined	23:23
	← justanotheruser left	23:27
	← ethernether left	23:27
	gavlee_ → gavlee	23:29
	→ orbyt_ joined	23:31
nedbat	Intelo: i don;;t think it should overwrite your changes. we'd have to see exactly what you did	23:31
Intelo	nedbat, exactly what I did https://paste.ubuntu.com/p/R3nNpwzgRd/	23:33
	← wgrant left	23:34
	← Enphuego left	23:35
	→ dedowsdi joined	23:35
	→ wgrant joined	23:35
	← sudomake left	23:40
	→ sudomake joined	23:40
	→ justanotheruser joined	23:40
	← lucasb left	23:40
	← mowotter left	23:41
	→ Abbott joined	23:42
	→ fission6 joined	23:45
	← onmeac left	23:47
	← geowiesnot left	23:49
	← tiin57 left	23:49
	→ DogManJr joined	23:50
	← DogManJr left	23:51
	← Narrat left	23:52
	→ Rav3n joined	23:52
	→ tiin57 joined	23:53
	← AtumT left	23:56

Logs Search ←Prev date Next date→

Channels Documentation