IRCloggy #git 2021-09-10

Provider of IRC logs since 2005.

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

	2021-09-10
	→ christall joined	00:02
	→ Misotauros joined	00:05
	→ bambanxx joined	00:11
	← christall left	00:11
	← shokohsc8 left	00:13
	→ shokohsc8 joined	00:14
	→ ferdna joined	00:15
	← Guest77 left	00:15
	→ austin987 joined	00:26
	← bambanxx left	00:32
	← austin987 left	00:32
	→ xiongxin8802 joined	00:33
	→ elf_fortrez joined	00:39
	→ christall joined	00:44
	→ bambanxx joined	00:45
	← elf_fortrez left	00:45
	← jwillikers left	00:46
	← christall left	00:48
	← bambanxx left	00:49
Soni	hmm "no slash-separated component can begin with a dot or end with the sequence .lock"...	00:51
	so basically "tree.lock" can never be a part of a git ref, good to know	00:52
	but index.html can...?	00:52
	→ jazzy2 joined	00:54
	→ bambanxx joined	00:54
Soni	oh, you can't have subrefs, only siderefs	00:55
	if you have `refs/heads/foo` you can't have `refs/heads/foo/bar`	00:55
	← odoood left	00:56
	→ hbautista_ joined	00:57
	← Xaldafax left	01:07
	← ___nick___ left	01:12
	→ MrC joined	01:13
	← nivag left	01:15
	→ nivag joined	01:18
	→ sargon joined	01:19
	← xiongxin8802 left	01:29
	← xa_ left	01:32
	→ mgedmin joined	01:33
	← nyah left	01:37
	← keypusher left	01:37
	← Murr left	01:41
	→ Murr joined	01:41
	→ xiongxin8802 joined	01:45
	← vysn left	01:47
	← dsrt^ left	01:51
	← jetchisel left	01:59
eschwartz	tang^, phryk: I'd recommend deleting the entire file and saving that. Closing without saving could result in the original message getting saved, in case the editor got opened with pre-filled contents such as via --amend... or -e since I assume the use of -e is because -m without -e will not let you edit the prefilled message	02:00
phryk	eschwartz: oh, it was -e without -m, but yeh commit message had to be empty.	02:01
eschwartz	well, -e without -m is probably a no-op and you needn't bother using -e	02:01
	> -e, --edit: The message taken from file with -F, command line with -m, and from commit object with -C are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources.	02:02
	← FinnElija left	02:05
	← ackyshake left	02:05
	→ gnoo joined	02:06
	→ FinnElija joined	02:07
	← gast0n left	02:23
	→ jetchisel joined	02:24
	→ gast0n joined	02:26
	← FFY00 left	02:28
	→ FH_thecat joined	02:29
	← XV8 left	02:33
	→ FFY00 joined	02:36
	→ christall joined	02:45
	→ vs^ joined	02:51
	← christall left	02:55
	← Dotz0cat left	03:02
	← FinnElija left	03:03
	→ FinnElija joined	03:04
	← gast0n left	03:09
	→ Dotz0cat joined	03:13
	← vs^ left	03:20
	← bambanxx left	03:20
	→ chenxuezhao joined	03:21
	→ pyeveryt_ joined	03:22
	→ bitmega joined	03:23
	← ttree left	03:24
	← dermoth left	03:24
	→ ttree joined	03:25
	← atrigent left	03:30
	← onichomp left	03:30
	→ zmt01 joined	03:34
	→ durham_ joined	03:35
	← xiongxin8802 left	03:35
	← R2robot left	03:36
	→ R2robot joined	03:36
	← durham left	03:37
	→ dermoth joined	03:38
	← zmt00 left	03:38
	→ jaredchung joined	03:38
	← jaredchung left	03:39
	← Murr left	03:40
	→ Murr joined	03:41
	→ tejr joined	03:42
	← pyeveryt_ left	03:43
	← bitmega left	03:43
	→ odoood joined	03:45
	← howdoi left	03:45
	→ chenxuez_ joined	03:46
	← chenxuezhao left	03:48
	→ dsrt^ joined	03:50
	← ThorMojito1 left	03:55
	← odoood left	04:03
	← PenguinMan98 left	04:07
	→ bitmega joined	04:08
	← Strom left	04:11
	→ odoood joined	04:12
	← dviola left	04:12
	→ Strom joined	04:13
	← arkho left	04:15
	→ arkho joined	04:15
	← bitmega left	04:16
	← ferdna left	04:17
	← chenxuez_ left	04:19
	← zebrag left	04:21
	→ va5c0 joined	04:28
	← odoood left	04:31
	← AnAverageHuman left	04:32
	← zmt01 left	04:32
	→ zmt00 joined	04:33
	← va5c0 left	04:33
	← ttree left	04:34
	→ Lunatrius` joined	04:35
	← Lunatrius left	04:37
	Lunatrius` → Lunatrius	04:37
	→ chenxuezhao joined	04:38
	← chenxuezhao left	04:39
	→ chenxuezhao joined	04:39
	← chenxuezhao left	04:39
	→ chenxuezhao joined	04:40
	← chenxuezhao left	04:40
	→ chenxuezhao joined	04:40
	← chenxuezhao left	04:41
	→ chenxuezhao joined	04:41
	← chenxuezhao left	04:42
	← lavos left	04:44
	→ molt joined	04:45
	← Shentino left	04:46
	→ bitmega joined	04:46
	→ Shentino joined	04:46
	← vishal left	04:47
	→ vishal joined	04:50
	← bitmega left	04:51
	→ odoood joined	04:54
	→ onichomp joined	04:54
	← arcatech left	04:55
	← AbleBacon left	04:58
	→ aniruddha joined	04:59
	← reset left	05:01
	← ferz left	05:05
	← FH_thecat left	05:08
	← pulse left	05:10
	→ Doraemon joined	05:22
	← NeoCron left	05:24
	← odoood left	05:31
	→ makara joined	05:35
	→ ackyshake joined	05:40
	→ ferz joined	05:43
	→ FH_thecat joined	05:45
	→ Mo joined	05:47
	← subopt left	05:47
Mo	Hi, question about https://github.com/Zygo/bees/commits/master, the last commit about "TOTAL RATES" was on Aug 31, but if I clone the repo, git log says Jun 22. Why?	05:48
foo	How can I see a git log history of changes on a specific file?	05:49
Mo	foo: git log <file>	05:51
foo	Mo: oh, I thought I tried that. Thanks.	05:53
jinsun	Mo: github is probably showing commit date, and git log is showing author date	05:56
	← CommunistWolf left	05:56
Mo	jinsun: What is author date? I started comparing because git log has a different sorting than the showed date, probably sorting for commit date and showing author date.	05:58
	→ CommunistWolf joined	05:58
	← elibrokeit left	05:59
	→ elibrokeit joined	05:59
jinsun	a commit just has two dates associated with it, when you create a new commit then both author date and commit date are set to the time when it was created	06:01
	Mo: but if you amend a commit using rebase or --amend or something, then usually only the commit date changes	06:02
bradyt	github relies too much on dates for display, so they better use commit date	06:03
	author dates can easily be out of order without any doctoring	06:03
	but you can doctor commit dates to make github's display kinda garbage	06:04
	i think git log uses parent-child, so it's free to put any date i guess	06:05
	← durham_ left	06:12
	→ mexen joined	06:13
	← FH_thecat left	06:17
	← lgc left	06:24
	→ saroy joined	06:31
	← Vonter left	06:33
	→ palasso joined	06:34
	← hbautista_ left	06:36
	→ Haohmaru joined	06:41
	→ infl00p joined	06:45
	→ Sazhen86 joined	06:48
	→ pflanze joined	06:49
	→ furrymcgee joined	06:51
	→ christall joined	06:52
	→ Tabmow joined	06:53
	← christall left	06:57
	→ Gurkenglas joined	07:04
	← gnoo left	07:05
	← unluckyshrubbery left	07:05
	→ gnoo joined	07:06
	→ onizu joined	07:11
	← gnoo left	07:11
	→ mei joined	07:12
	→ gnoo joined	07:14
	→ theoceaniscool joined	07:18
	→ otisolsen70 joined	07:21
	→ TomyWork joined	07:23
	→ FH_thecat joined	07:23
	→ xiongxin8802 joined	07:26
	← xiongxin8802 left	07:29
	→ christall joined	07:30
	→ va5c0 joined	07:30
	← christall left	07:34
	→ christall joined	07:35
	← pflanze left	07:35
	← thiago left	07:37
	← furrymcgee left	07:37
	← christall left	07:39
	→ bitmega joined	07:41
dermoth	bradyt, afaik git log orders by author date but also retain child/parent ordering, so when listing commits through multiple branches a merge commit will always have all commits from all parents showing below it.	07:42
bradyt	dermoth: where do you think ordering by child/parent does not suffice in git's display?	07:45
	i didn't mean that git _only_ considers parent child	07:45
	← bitmega left	07:45
	→ goldfish joined	07:45
bradyt	but rather that it considers parent child with reasonable precedence, at all	07:46
	whereas github display just completely drops the ball	07:46
dermoth	hummm I can't actually find the reference for this statement, not sure if it changed or maybe was about some more specialized tool...	07:46
bradyt	if i use --graph, parents are below children	07:47
	iiuc	07:47
	→ furrymcgee joined	07:47
bradyt	you can pretty easily put parents above and below children in github	07:47
	← furrymcgee left	07:47
	← fflam_ left	07:48
	→ The_Blode joined	07:49
	→ ppang joined	07:49
bradyt	like for A <- B <- C, you can get that to look like B, A, C in github	07:50
dermoth	fun...	07:50
	← The_Blode_ left	07:50
bradyt	just put B as an earlier commit date than A	07:50
dermoth	might be the same with git log actually, but you have to alter the author date	07:51
	unless I missed what I was referring to	07:51
bradyt	no, at least with --graph, i've never seen git mess this up	07:51
dermoth	yes i'm talking default sort order	07:51
bradyt	ah, i rarely use it	07:51
	sounds vaguely familiar	07:51
makara	`git log -z` separates commits by NUL instead of newline. How can I separate by commas?	07:52
	`git log -z` separates commits by NUL instead of newline. How can I separate by commas?	07:52
	command `git log -z` separates commits by NUL instead of newline. How can I separate by commas?	07:52
	← makara left	07:52
	→ makara joined	07:52
makara	sorry	07:53
	→ alkino joined	07:54
	→ Wuzzy joined	07:55
	→ furrymcgee joined	07:56
dermoth	makara, did you mean "how can I separate the commits" ?	07:56
	oh nm	07:56
	mistread	07:56
	→ xiongxin8802 joined	07:57
dermoth	you could use tr...	07:57
	but are you using a format? else you will also split on commas in commit messages?	07:57
bradyt	hmm, how about `git log -z \| tr '[:cntrl:]' '\n'`	07:58
	oh comma	07:58
	how about git log -z \| tr '[:cntrl:]' '🐶' \| less	07:59
dermoth	git log --pretty=format:%H -z\|tr '\000' ','	07:59
	would print comma-separated hastes	08:00
	hashes	08:00
makara	i need a portable solution	08:00
bradyt	ah yeah, tr '\000' '🐶' works	08:00
dermoth	well as long as you don't tr to an emoticon :p	08:01
bradyt	i learn so much here	08:01
makara	powershell doesn't pipe. Its git or bust	08:02
dermoth	not not sure of the portability of tr \000 but I can check..	08:02
	as you mean non-POSIX portability?	08:02
makara	yes	08:02
bradyt	isn't NUL pretty portable?	08:04
	hmm	08:04
	can you use python or something for this?	08:05
	→ otisolsen70_ joined	08:05
bradyt	maybe this is just powershell script	08:05
osse	powershell pipes just fine	08:05
	← otisolsen70_ left	08:06
osse	git rev-list HEAD \| % { $str ="$str$_," }; echo $str	08:07
	← otisolsen70 left	08:09
makara	it also has to work in cygwin, and piping is not efficient. There should just be a log.separator config I can set	08:10
	← Betal left	08:11
jinsun	bradyt: why does your nul and comma look weird? https://pasteboard.co/SJ3LZXYQLfag.png	08:11
bradyt	jinsun: i didn't know about \ 0 0 0 so i wrote [ : c n t r l : ]	08:13
	and that's not a comma, it's a dog	08:13
jinsun	okay so you really wanted to write that	08:14
ppang	dog separated values	08:16
osse	makara: but that setting doesn't exist	08:16
	git log --pretty=format:%H,	08:19
	there	08:19
	why didn't I think of this before	08:20
	nvm, I'm stupid	08:20
makara	because it adds it after every commit, not just between commits	08:21
	fine for ECMA5, but not valid json	08:21
	ill try the -z \| tr \000 thing	08:22
	ive asked on the dev channel about adding the config	08:22
bradyt	remove last comma?	08:23
osse	Getting the exact same snippet of code to it, that should work in both powershell and cygwin, is a long shot	08:23
	→ sniperwolf joined	08:24
	→ EvilDMP joined	08:25
makara	i tried, it works	08:25
	grep behave differently on powershell	08:25
	→ lalitmee joined	08:25
makara	won't even bother with sed	08:25
	`git log -5 --pretty=format:'{%n%w(0,2,2)"commit":"%H",%n"date":"%ai",%n"changelog":"%-N"%n%w(0,0,0)}' -z \| tr '\000' ','`	08:26
	← xiongxin8802 left	08:26
	← ppang left	08:28
	→ vysn joined	08:30
makara	here's where the wheels come off - im using exec-maven-plugin to invoke git log. It doesn't like the pipe	08:33
osse	maybe that thing has a way to specify that you want to use a shell to process the command line	08:36
	or you can put the thing in a script, and have the thing run that script	08:36
	← goldfish left	08:37
makara	ag, then I have to fix the #! section of the sh script to be portable. The plugin will run a shell, but then it needs to be the same on all systems	08:38
	its a nightmare	08:38
	it seems I might be able to do something with git-interpret-trailers if I can just grok what the heck its all about	08:39
osse	Will #!/bin/sh work?	08:43
furrymcgee	maybe there is a eval-maven-plugin	08:43
	← tejr left	08:44
	→ tejr joined	08:44
	→ xiongxin8802 joined	08:45
	→ natrys joined	08:47
	← madewokherd left	08:48
	← EvilDMP left	08:49
	→ YuGiOhJCJ joined	08:51
	→ igemnace joined	08:52
makara	https://maven.apache.org/plugins/maven-scripting-plugin/jsr223-script-engines.html	08:57
	→ EvilDMP joined	08:58
	← AnisBarghouthi[m left	09:00
furrymcgee	this is not a pipe	09:03
	← skapata left	09:03
makara	?	09:04
	← Arokh left	09:10
	→ Arokh joined	09:11
furrymcgee	the biggest mistake in programming is not using shell in the first place	09:14
	→ lalitmee_ joined	09:14
	← lalitmee left	09:15
makara	the biggest mistake in programming is trying to solve the biggest mistakes in programming	09:16
	→ unluckyshrubbery joined	09:16
makara	ill settle for invalid json if it means not having to fork a process insides a jvm	09:17
	→ speckz joined	09:18
	← va5c0 left	09:28
	→ sQVe joined	09:30
	→ va5c0 joined	09:30
	→ dege joined	09:35
	→ christall joined	09:36
	← christall left	09:40
	← Murr left	09:40
	→ Murr joined	09:41
	← gry left	09:41
dege	is there a way (short of aliasing all commands) to enforce --dry-run mode via configuration and instead require an opt-in to perform changes? I've been unable to find anything in the docs and code to support that such a thing exist	09:44
	← ferz left	09:45
	← sargon left	09:47
	← xiongxin8802 left	09:48
	← bn_work left	10:00
	→ tejr_ joined	10:01
	→ ferz joined	10:01
	← tejr left	10:02
	tejr_ → tejr	10:02
	→ keypusher joined	10:06
	← EvilDMP left	10:10
	← ferz left	10:18
	← makara left	10:18
	→ pflanze joined	10:19
Soni	how are submodules stored in trees?	10:21
osse	a tree is a list of references to blobs, or other trees, but sometimes commits.	10:23
	the latter case is used by submodule	10:24
	→ pflanze_ joined	10:31
	← pflanze left	10:34
	← stkrdknmibalz left	10:34
	→ EvilDMP joined	10:34
Soni	how does it know where to get the commit?	10:36
	← va5c0 left	10:36
	→ va5c0 joined	10:38
	← aniruddha left	10:39
	→ computeiro joined	10:39
	← onichomp left	10:41
	→ wender joined	10:41
	← tejr left	10:42
	→ tejr joined	10:42
	→ jwillikers joined	10:43
	← computeiro left	10:44
	← igemnace left	10:45
canton7	Soni, that's what the configuration in .gitmodules (which is then copied into .git/config) is for: that gives the URL to fetch that commit from	10:45
Soni	ah, so it must be work-tree-aware to figure that out	10:46
canton7	How do you mean?	10:50
	← rafspiny left	10:53
osse	Soni: it can probably read .gitmodules without relying on it being on disk	10:55
Soni	osse: sure but you can't start at an arbitrary tree for that, you need to start at a commit/ref	10:57
	and you need to do that for every commit/ref and then collect the results and check that they all agree or otherwise do something else	10:57
	← Sazhen86 left	11:03
osse	That last part sounds specific to what you're doing	11:04
	But yes, .gitmodules can only be at the top level	11:04
Soni	yeah deduplicating loose but processed trees and blobs is kinda weird	11:05
	→ Guest842 joined	11:05
osse	And you cannot tell if an arbitrary tree is a toplevel tree or not just by looking at that tree.	11:05
Soni	yeah	11:05
osse	But you can check if if it contains a .gitmodules regardless. The majority of tree objects won't have one, probably	11:06
	← gnoo left	11:08
	← speckz left	11:12
	→ gnoo joined	11:13
	→ rewrit3 joined	11:14
	← mei left	11:17
	← Guest842 left	11:18
	→ tsdh joined	11:19
	→ otisolsen70 joined	11:20
	← tejr left	11:23
	→ tejr joined	11:25
	→ atrigent joined	11:29
	→ emanuele6 joined	11:30
	→ Tobbi_1 joined	11:30
	← Mo left	11:32
	← Tobbi_ left	11:32
	Tobbi_1 → Tobbi_	11:32
	← FH_thecat left	11:33
	← Nalt left	11:35
	→ gh34 joined	11:36
	← tsdh left	11:37
	→ tsdh joined	11:39
	← FinnElija left	11:39
	→ bitmega joined	11:42
	→ reset joined	11:44
	← bitmega left	11:47
	→ FinnElija joined	11:48
	→ masber joined	11:54
masber	hi, I have a situation with git I don't understand, I did a git commit and then a git checkout on a branch	11:54
	→ Ballerburg9005 joined	11:54
masber	now I did some changes and then commit and push. Push is telling me that I am not in a branch?	11:55
	https://dpaste.org/6Sph	11:56
Anunay	git push <remote, eg. origin> <branch> to push that branch.	11:56
masber	but that branch exists in remote	11:56
	I don't understand, if I did a checkout from a branch that exists in remote, why git does not understand?	11:57
Anunay	Oh you're in a detached head state	11:58
masber	https://dpaste.org/kbRo	11:58
	yes	11:58
	→ pulse joined	12:00
	→ christall joined	12:01
Anunay	You likely checked out a remote branch, now that you're in a detached state, just make a new branch with	12:02
	git branch	12:02
	check that out	12:02
	and then git push origin <branch>	12:02
	Oh like use the same name	12:03
	oh and you'll be told to use set-upstream	12:03
masber	how could I checkout a remote branch properly and at the same time avoid having a detached head?	12:04
	→ lalitmee__ joined	12:04
Anunay	git checkout -b <localname> remote/branch	12:05
	← lalitmee_ left	12:07
	→ bambanxx joined	12:07
Anunay	Basically git doesn't really have a checking out a "remote", instead you just create a local branch (of any name) can set the remote as it's upstream.	12:07
	or push that same local branch to multiple remotes.	12:08
	← aidalgol left	12:10
Anunay	Also I think if you have just 1 remote then just checking out with git checkout branch should automatically do that. I do not recommend making that a habit	12:10
	→ aidalgol joined	12:12
	→ drogas joined	12:15
	← va5c0 left	12:18
	→ va5c0 joined	12:20
	← gnoo left	12:21
	→ gnoo joined	12:21
	← christall left	12:28
	← srinidhi left	12:29
	← aidalgol left	12:34
	→ sandipan joined	12:35
	← wender left	12:36
	← saroy left	12:36
	→ computeiro joined	12:36
	→ bitmega joined	12:37
	→ aidalgol joined	12:37
	← bitmega left	12:38
	→ saroy joined	12:38
	→ christall joined	12:39
	← saroy left	12:40
	← sandipan left	12:41
	→ saroy joined	12:41
	→ jimklimov1 joined	12:44
	← YuGiOhJCJ left	12:47
	→ vaucouleur joined	12:47
	← jimklimov left	12:47
	← saroy left	12:48
	← gh34 left	12:48
	→ xiongxin8802 joined	12:49
	→ dviola joined	12:49
	→ vladoski joined	12:49
	→ zmt01 joined	12:51
	→ gh34 joined	12:52
	← Xenguy left	12:52
	→ wender joined	12:53
	← zmt00 left	12:54
	← computeiro left	12:56
	← bambanxx left	12:58
	← vladoski left	13:00
	← Samian left	13:06
	→ ThorMojito joined	13:14
	← cdown left	13:17
	→ malteger joined	13:17
	→ mei joined	13:19
	← mei left	13:20
	→ otisolsen70_ joined	13:21
	→ mei joined	13:22
	← kapil left	13:23
	→ kapil joined	13:24
	← brw left	13:24
	← otisolsen70 left	13:25
	→ pflanze joined	13:25
	→ brw joined	13:25
	← pflanze_ left	13:26
	← mei left	13:27
	→ mei joined	13:27
	→ jimklimov joined	13:32
	→ jimklimov2 joined	13:33
	← jimklimov1 left	13:34
	← jimklimov left	13:37
	→ ChmEarl joined	13:39
	→ AbleBacon joined	13:39
	→ tureba_ joined	13:43
	← tureba_ left	13:43
	→ tureba joined	13:46
	← ThorMojito left	13:47
	→ ThorMojito joined	13:48
	← masber left	13:48
	← sQVe left	13:55
	← fstd left	13:57
	→ fstd joined	13:57
	← wolfshappen left	13:58
	→ wolfshappen joined	13:58
	→ zebrag joined	14:01
	→ nyah joined	14:04
	← natrys left	14:05
	← fstd left	14:05
	→ fstd joined	14:05
	→ AnAverageHuman joined	14:07
	← otisolsen70_ left	14:07
	← fstd left	14:10
	→ fstd joined	14:10
	→ vladoski joined	14:10
	← jinsun left	14:12
	← fstd left	14:15
	→ fstd joined	14:15
	→ XV8 joined	14:15
	← fstd left	14:19
	→ fstd joined	14:20
	→ srinidhi joined	14:21
	→ odoood joined	14:23
	← fstd left	14:25
	→ fstd joined	14:25
	← fstd left	14:29
	→ fstd joined	14:29
	→ arcatech joined	14:30
	← fstd left	14:34
	→ fstd joined	14:34
	← arcatech left	14:37
	← fstd left	14:38
	→ fstd joined	14:38
	← fstd left	14:43
	← vladoski left	14:43
	→ fstd joined	14:43
	← fstd left	14:48
	→ fstd joined	14:48
	← XV8 left	14:50
	← dsrt^ left	14:50
	→ dehl^ joined	14:51
	← fstd left	14:53
	→ fstd joined	14:53
	← mexen left	14:53
	→ XV8 joined	14:53
	→ lalitmee_ joined	14:53
	← lalitmee__ left	14:56
	← mei left	14:57
	← fstd left	14:58
	→ fstd joined	14:58
	→ thiago joined	15:00
	→ zumba_addict joined	15:00
	← va5c0 left	15:00
	← fstd left	15:02
	→ fstd joined	15:02
	→ vladoski joined	15:03
	→ speckz joined	15:04
Soni	finally https://soniex2.autistic.space/git-repos/htmlgdump.git/browse/refs/heads/deploy/tree/git-hooks/post-receive/	15:07
	← fstd left	15:07
	→ fstd joined	15:07
	→ va5c0 joined	15:07
	→ SilverFox joined	15:08
	→ teut joined	15:09
	← LuKaRo left	15:09
SilverFox	heyo! This is sorta off topic and weird but, we use a lot of git pipelines and stuff and have a lot of branches etc, im wondering.. is there perhaps a digital signage software or something similar that could, display a few stats and update them whenever? sorta like gitg with the branch view or, idk just throwing it out there if anybody has used anything like that before!	15:10
teut	my project has a single branch master, now a colleague clones the repo , works on it, I meanwhile work on the master branch add few commits , so now we have a diversion, now he sends a pull request	15:11
	I click the fat green button on github of "rebase and merge"	15:11
	← fstd left	15:12
	→ fstd joined	15:12
teut	so if rebase happens then all commits of him should be cherry picked and added to front of my master	15:12
	is this correct ?	15:12
	I got no conflicts	15:12
SilverFox	if nothing he did conflicted with anything you did, then the changes even to the same file can come together	15:13
	like a zipper ;3	15:13
	to be sure its the functionality u want, u could merge master back into your developing bracnch, test/ci/cd whatever and then confirm its ok to merge back to master	15:14
	→ LuKaRo joined	15:14
teut	no, he changed a file	15:15
	he changed code inside footer.js totally	15:16
	← fstd left	15:17
	→ fstd joined	15:17
teut	I asked him and he said he just ammend's every commit	15:17
	→ lalitmee joined	15:17
teut	Uploaded file: https://uploads.kiwiirc.com/files/dca9292f16aa17e54748c672d8cf405b/image.png	15:18
	→ Guest67 joined	15:18
teut	so would if I had just merged , I had received conflicts?	15:18
Guest67	Hi. Is there a built-in command to "git mv" a file from my top-level repo, to a submodule? Or am I supposed to git rm on the 1st, git add on the 2nd?	15:18
teut	but I know in some cases rebase also gives conflicts	15:19
SilverFox	teut, shrug	15:19
teut	can someone tell those plz?	15:19
	← lalitmee_ left	15:19
SilverFox	I dont understand what ur asking	15:19
	if there are no conflicts, whats the problem?	15:19
teut	understanding the scenerio , that s it	15:19
SilverFox	if u wanna make sure it all actually still works, merge master back into ur developing branch and check	15:19
	https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase	15:21
	← wender left	15:21
	← TomyWork left	15:21
teut	I m lucky this guy only added a single commit, but other people can add 10-20 commits and if I used rebase in that situation	15:21
	X)	15:21
	← fstd left	15:21
	→ fstd joined	15:21
	→ lalitmee_ joined	15:22
Guest67	teut: if you're not comfortable using git, stick to regular merge, dont rebase. Sure it makes for a slightly uglier log history but at least you'll understand what's going on	15:24
	← lalitmee left	15:25
	← fstd left	15:26
	→ fstd joined	15:26
teut	actually I only rebase	15:27
	I never have used merge	15:28
	even when merging several branches	15:28
	and then , stashing them	15:28
	the commits	15:28
	I have lost hot of work due to using the merge features, then conflicts arise and strange squiggly line in vscode asked to select incoming, outstanding , etc and I always messed that up	15:29
	lots*	15:29
	I only did solo work on git till now, now I m doing a collaborative work	15:30
	→ arcatech joined	15:31
	← fstd left	15:31
teut	ok so teut 20:57:52 I never have used merge , is not true	15:31
	→ fstd joined	15:31
	← FFY00 left	15:31
	← arcatech left	15:33
	← vladoski left	15:34
	← fstd left	15:36
	→ fstd joined	15:36
	← xiongxin8802 left	15:36
	← Guest67 left	15:37
	→ madewokherd joined	15:39
	← Murr left	15:40
	→ Murr joined	15:40
	← fstd left	15:40
	→ fstd joined	15:41
	← jazzy2 left	15:41
	→ Theguest joined	15:45
	← fstd left	15:45
	→ fstd joined	15:45
	→ FFY00 joined	15:48
	← va5c0 left	15:48
	← hqdruxn08__ left	15:49
	→ hqdruxn08__ joined	15:49
	→ va5c0 joined	15:50
	← fstd left	15:50
	→ fstd joined	15:50
	→ natrys joined	15:51
teut	I did git fetch --all	15:54
	then I rebased a pull request	15:54
	now I want to reject the fetch, how to do it?	15:54
	then I rebased a pull request , <---- this I did on github with the green button	15:55
	← fstd left	15:55
	→ fstd joined	15:55
	← Arokh left	15:55
teut	I want to pull the latest	15:56
elibrokeit	What does "reject a fetch" mean?	15:57
teut	to what I know git pull is a shortcut of git fetch + git commit	15:57
	→ Samian joined	15:57
elibrokeit	Fetch is "look at what the remote has done lately"	15:58
another\|	"In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD."	15:58
	← speckz left	15:58
teut	oh sorry, not git commit but git merge	15:58
elibrokeit	If you get up in the morning and look outside the window, then see it's a beautiful day. How do you "reject looking out the window"?	15:58
teut	yes , I get it, so if I do git pull	15:59
elibrokeit	You could do it by inventing a mind-wiping device and removing your own memories I guess.	15:59
another\|	fetch is basically "download stuff from the remote but don't do anything with it"	15:59
teut	it will fetch again from github and modify my local	15:59
	← AnapodoPsalidaki left	15:59
	← fstd left	16:00
elibrokeit	But you can't change the sky, and you can't tell git "no, pretend the remote is different"	16:00
	→ fstd joined	16:00
	→ docmax_ joined	16:00
elibrokeit	You can, however, do whatever you want with the commit hash of the remote (or the recollection of what the remote used to be)	16:00
	None of your local anything got modified, only the little notebook that keeps track of what the remote is doing	16:01
teut	thinking	16:02
	hey wait, I didnt tell git about remote	16:02
	I only have added my remote, I didnt add the other person's remote	16:02
	← docmax left	16:02
teut	did it got automatically added when I accepted a pull request from him previously?	16:03
elibrokeit	No	16:03
	Git doesn't know what a pull request is.	16:03
	It also definitely doesn't know what github is	16:04
	← fstd left	16:04
elibrokeit	I suppose some non-git software (github desktop? IDK) might do what you suspected though	16:04
	→ fstd joined	16:04
elibrokeit	I wouldn't have any clue.	16:04
	elibrokeit does not use github desktop or other non-git software to interact with git repos	16:05
elibrokeit	Oh, I guess that's a lie, I do use `hub`	16:05
Soliton	there is git request-pull.	16:06
imMute	Soliton: different kind of PR	16:07
elibrokeit	That's not a pull-request	16:07
	That's an RP, not a PR	16:08
Soliton	sure, it's nothing like what github calls a pull request.	16:08
elibrokeit	It's also not even named the same thing.	16:08
	→ durham joined	16:08
elibrokeit	It's like saying "okay, there isn't a pull-request, but there is a git-worktree, it's nothing like the former though"	16:08
	← dege left	16:08
	→ Arokh joined	16:09
	← fstd left	16:09
	→ fstd joined	16:09
	→ fflam joined	16:09
Soliton	well, i'll assume you know about the command then and will leave you to the semantic games.	16:12
	← vaucouleur left	16:12
	← va5c0 left	16:12
	→ computeiro joined	16:12
	← fstd left	16:14
	→ fstd joined	16:14
	← fstd left	16:18
	→ fstd joined	16:19
	← fstd left	16:23
	→ fstd joined	16:24
	← fflam left	16:25
	← theoceaniscool left	16:26
	ormaaj2 → ormaaj	16:26
	→ fflam joined	16:26
	→ m0viefreak joined	16:27
	→ lalitmee__ joined	16:27
	→ FH_thecat joined	16:27
	← fstd left	16:28
	→ fstd joined	16:28
	→ Vonter joined	16:29
	← lalitmee_ left	16:29
	← Vonter left	16:30
	← dminuoso left	16:30
	→ vicfred joined	16:32
	→ Vonter joined	16:33
	← fstd left	16:33
	→ fstd joined	16:33
	← fstd left	16:38
	→ fstd joined	16:38
	← Vonter left	16:39
	← christall left	16:41
	→ christall joined	16:42
	← fstd left	16:42
	→ fstd joined	16:43
	← merethan left	16:45
	→ Vonter joined	16:45
	← christall left	16:46
	→ christall joined	16:47
	← fstd left	16:47
	→ fstd joined	16:47
	← FFY00 left	16:48
	→ Niklas36 joined	16:49
	← computeiro left	16:51
	→ computeiro joined	16:51
	← fstd left	16:52
	→ fstd joined	16:52
	→ FFY00 joined	16:54
Niklas36	Hi, I have a bunch of local commits. One of the first of these commits mistakenly includes an API token for a service. Is there a way to edit a line in an earlier commit (but keep the rest of the changes)?	16:54
teut	thanks elibrokeit	16:57
	← fstd left	16:57
	→ fstd joined	16:57
	→ gast0n joined	16:58
	→ timmcg joined	17:00
	docmax_ → docmax	17:00
	← pflanze left	17:01
	→ pflanze joined	17:01
	← fstd left	17:02
	→ fstd joined	17:02
Soliton	!filter_sensitive	17:06
gitinfo	You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	17:06
	← fstd left	17:06
	→ fstd joined	17:07
	← Ballerburg9005 left	17:07
	→ meator joined	17:07
Soliton	Niklas36: if you haven't pushed the commits you can do an interactive rebase and just drop the commit.	17:08
	← pflanze left	17:09
	→ pflanze joined	17:09
Niklas36	Thank you Soliton that helped a lot :)	17:09
	← fstd left	17:11
	← gast0n left	17:11
	→ fstd joined	17:11
	← Niklas36 left	17:11
	→ jyg joined	17:12
	→ gast0n joined	17:12
jyg	I'm trying to parse the output from a pull, but it's really vague. I specifically would like to be able to discern which files were added, which were updated, and which were deleted. These identifications will fire off other, external processes.	17:14
	← yuljk left	17:14
	← pflanze left	17:15
jyg	Even if it is a two part solution, such as get the two commits from the pull output and then do a git log or something.	17:15
	→ skapata joined	17:15
	← skapata left	17:15
	→ skapata joined	17:15
	→ yuljk joined	17:16
	← fstd left	17:16
gnoo	jyg: have you tried git pull --stat ?	17:16
	→ fstd joined	17:16
jyg	gnoo, yes, I'm testing with it right now. Making changes in a test repo and seeing the output. But, it doesn't seem to offer enough distinction between those operations to really tell. Or, I'm not seeing it	17:18
imMute	doing stuff on 'git pull' seems fragile. like what happens if the merge results in a conflict?	17:18
jyg	imMute, no doubt you are right. I have a Shibboleth admin who I am desprate to get off of subversion. All I need to do is replace the parts in his arcane shell script so that it works with git instead...	17:19
	imMute, he can have such issues with either VCS... not my problem ;)	17:20
	← tejr left	17:20
	← fstd left	17:21
	→ fstd joined	17:21
elibrokeit	jyg: https://github.com/eli-schwartz/dotfiles/blob/master/.config/git/config#L30	17:21
	→ jinsun joined	17:22
elibrokeit	You can do a git diff of the revision from before the pull and the revision of now, or diff-index, or any other command to programmatically parse two commit hashes	17:22
	I use it via an alias to recreate the human-readable stat+summary which git pull also shows	17:23
jyg	elibrokeit, wow...	17:23
	This is great stuff. Thanks for sharing. Going to spend some time mulling over it	17:24
elibrokeit	But, you probably want to use git diff --name-status to get the filenames and a letter indicating why it changed	17:24
	As that is a bit easier to parse ;)	17:24
	See https://git-scm.com/docs/gitrevisions#Documentation/gitrevisions.txt-emltrefnamegtltngtemegemmaster1em for more details	17:26
	← fstd left	17:26
	→ fstd joined	17:26
	← furrymcgee left	17:26
elibrokeit	Man gitrevisions has a lot of really cool ways to refer to refs, and is well worth reading.	17:26
	← zumba_addict left	17:27
jyg	yessss... --name-status is the key	17:27
	If only pull had that	17:28
	But that's cool, just two commands instead of one.	17:29
elibrokeit	You may also want to use -z to make the output be NUL terminated instead of doing path munging in some cases	17:29
jyg	Thank you so much... I cannot wait to shut that svn server down. He's like the grumpy last homeowner from Up :)	17:29
elibrokeit	Although "people who use normal filenames don't need to worry about newlines and unprintable characters and G-d knows what in their filenames" and all that.	17:30
	← gnoo left	17:30
	← fstd left	17:30
	→ fstd joined	17:30
	← meator left	17:32
	→ vladoski joined	17:33
	← fstd left	17:35
	→ fstd joined	17:35
imMute	elibrokeit: normally, I'd agree with that, but unicode exists and languages that don't use latin alphabets also exist	17:36
	→ batrick joined	17:39
elibrokeit	Not saying I agree with that quote about normality! I prefer to write robust scripts on principle.	17:39
	← AnAverageHuman left	17:39
elibrokeit	The people who do say it without joking, would argue that ASCII is next to godliness in the dictionary and only ASCII constitutes normal filenames...	17:40
	← fstd left	17:40
	← cliluw left	17:40
	← Murr left	17:40
	→ Murr joined	17:40
jyg	lol	17:41
elibrokeit	I guess they believe non-english content should stick to file contents?	17:41
jyg	I feel like such a shit stirrer :D	17:41
elibrokeit	Kind of unfortunate for non-americans.	17:41
	jyg: nah, we are the ones who went on a total tangent :D	17:41
	← Notgnoshi left	17:42
	→ subopt joined	17:42
	→ Notgnoshi joined	17:42
elibrokeit	Anyway my mission is done as long as I point out the potential concern and let the questioner decide whether to care about foreign languages and other inconveniently non-ASCII filenames	17:43
	→ fstd joined	17:43
teut	if master and another branch diverge, then you rebased "another" onto master, now master and all commits on other branch are there	17:43
	is there a possiblity of merge conflict in this?	17:44
elibrokeit	Correct, when you rebase "another" onto "master" you copy all the commits from "another" and add them to "master"	17:44
teut	scenario	17:44
	yes cherry pick all commits	17:44
elibrokeit	And sure, they can conflict, if their divergent commits both edited the same lines of the same file	17:44
teut	oh ok that actually is the case	17:44
	but I did not get conflicts	17:45
	→ AnAverageHuman joined	17:45
teut	thats shocking	17:45
	← vicfred left	17:45
elibrokeit	Sometimes git is smart e.g. if they made the same change then it can tell you don't need to do anything more.	17:45
teut	since master was already ahead of divergence point git wont be able to link those ahead commits with the cherry picked	17:46
	they change full 1 file	17:46
	changed*	17:46
elibrokeit	git cherry-pick -x	17:46
	Will add links	17:46
teut	someone told me earlier git rebase is just git cherry pick all commits	17:47
elibrokeit	Specifically it adds "cherry-picked from commit X" style comments to the commit message, and those commit hashes are links in most repository browsers.	17:47
	← fstd left	17:47
	→ fstd joined	17:48
	← docmax left	17:48
	← onizu left	17:48
elibrokeit	Yes, git rebase is essentially that.	17:49
	← tang^ left	17:49
	→ onizu joined	17:51
	→ jumpcutking joined	17:51
	→ tang^ joined	17:51
	→ kenyon joined	17:52
	→ Ballerburg9005 joined	17:52
	→ jsvcycling joined	17:52
	→ Puyo joined	17:52
	← fstd left	17:52
	→ fstd joined	17:52
	← vladoski left	17:52
	← elastic_dog left	17:53
	← Haohmaru left	17:54
	→ elastic_dog joined	17:54
	← fstd left	17:57
	→ fstd joined	17:57
	→ vladoski joined	17:59
	← jyg left	18:00
	← AnAverageHuman left	18:00
	→ AnAverageHuman joined	18:00
	← jetchisel left	18:01
	← fstd left	18:02
	→ fstd joined	18:02
	→ DvdKhl joined	18:05
	→ bongobrown joined	18:06
lantech19446	how do i change my username and password on a local repo just for that one repo?	18:06
	← fstd left	18:07
	→ fstd joined	18:07
	← vladoski left	18:07
teut	so I also squashed last 2 commits, one was the latest commit from the other guy and before it was mine, so I put a "s" on his commit in interative rebase, now what did this thing do?	18:08
	→ vladoski joined	18:08
teut	it melds the commits	18:08
	thats what I know	18:08
	so he had wriitten the style="color:'blue'" and I had style="color:'#fgfjhj'" in a line	18:09
	and I got no conflict	18:09
	→ jimklimov joined	18:11
	← fstd left	18:12
	→ fstd joined	18:12
	← jimklimov2 left	18:14
imMute	lantech19446: that depends on what credential helper you're using.	18:15
lantech19446	I'm just using git via git bash	18:15
imMute	what kind of URL are you using for the remote? SSH? https?	18:16
	← fstd left	18:17
	→ fstd joined	18:17
lantech19446	https	18:17
	and I did it at home but i can't remember how	18:17
	→ jetchisel joined	18:18
imMute	ok I've never used HTTPS before, but I thought it normally just asked for the credentials when you push/fetch	18:18
lantech19446	it does	18:19
	but for some reason it's got them stuck in this one	18:19
imMute	oh. so just enter the credentials you want to use. there's nothing to "change"	18:19
lantech19446	it's not asking me	18:20
	← srinidhi left	18:20
lantech19446	that's the problem	18:20
imMute	what does 'git config credential.helper' output?	18:20
	→ lalitmee_ joined	18:21
lantech19446	manager-core	18:21
	← fstd left	18:21
	→ fstd joined	18:21
	→ srinidhi joined	18:22
imMute	ah, that's a Microsoft one. https://github.com/microsoft/Git-Credential-Manager-Core/blob/main/docs/configuration.md might be useful	18:22
	← kapil left	18:23
	← lalitmee__ left	18:23
lantech19446	no such luck, the command they have to get me prompted doesn't do anything. Maybe i'll remove origin and add ssh origin instead	18:24
	→ kapil joined	18:25
	← sniperwolf left	18:26
	← fstd left	18:26
	→ fstd joined	18:26
lantech19446	ok ssh worked which you pretty much told me it would in the beginning. I guess i'll just go that route from now on	18:27
	→ daoudr joined	18:27
	imMute prefers SSH remotes, so that I can use an ssh-agent	18:28
	← kapil left	18:29
	→ kapil joined	18:30
	← Ballerburg9005 left	18:30
	← fstd left	18:31
	→ fstd joined	18:31
	→ jyg joined	18:34
	← fstd left	18:36
	→ fstd joined	18:36
	← jetchisel left	18:37
	→ Betal joined	18:38
	← odoood left	18:39
	← fstd left	18:41
	→ fstd joined	18:41
	← XV8 left	18:42
	← jyg left	18:44
	→ XV8 joined	18:44
	→ sudoforge joined	18:44
	← fstd left	18:46
	→ fstd joined	18:46
	← dflick left	18:48
	→ dflick joined	18:49
	← vladoski left	18:50
	← fstd left	18:50
	→ fstd joined	18:51
	→ odoood joined	18:51
	← Theguest left	18:52
	← fstd left	18:55
	→ fstd joined	18:55
	← bongobrown left	18:58
	← fstd left	19:00
	→ fstd joined	19:00
	← irrgit left	19:03
	← fstd left	19:05
	→ fstd joined	19:05
	→ lgc joined	19:06
	→ hubble joined	19:09
	← fstd left	19:10
	→ fstd joined	19:10
	→ jyg joined	19:11
	← EvilDMP left	19:13
	← Samian left	19:13
	→ EvilDMP joined	19:13
	← fstd left	19:14
	← teut left	19:14
	→ fstd joined	19:14
	→ vladoski joined	19:15
	← jyg left	19:15
	→ onichomp joined	19:17
	→ vicfred joined	19:17
	← fstd left	19:19
	→ fstd joined	19:19
	→ QtScripter joined	19:20
	← EvilDMP left	19:21
	← fstd left	19:24
	→ fstd joined	19:24
	← FFY00 left	19:24
	← vladoski left	19:26
	→ crimsonr0se joined	19:28
	← fstd left	19:29
	→ fstd joined	19:29
	← Wuzzy left	19:30
	→ Ballerburg9005 joined	19:31
	← fstd left	19:33
	→ fstd joined	19:33
	← fstd left	19:38
	← ThorMojito left	19:38
	→ fstd joined	19:38
	← Murr left	19:40
	→ Murr joined	19:40
	← fstd left	19:43
	→ Samian joined	19:44
	← SilverFox left	19:50
	→ ThorMojito joined	19:51
	← crimsonr0se left	19:52
	→ FFY00 joined	19:53
	→ arcatech joined	19:58
	→ ekathva joined	19:59
	← platta left	20:08
	→ Nalt joined	20:09
	→ Guest3635 joined	20:09
	→ ZacSharp joined	20:10
	← rahl left	20:14
	→ rahl joined	20:15
	→ Wuzzy joined	20:25
	→ epolanski joined	20:25
	← AnAverageHuman left	20:27
	← ekathva left	20:27
	→ EvilDMP joined	20:29
	← computeiro left	20:33
	← Vonter left	20:34
	← Guest3635 left	20:36
	← EvilDMP left	20:53
	→ Lord_of_Life_ joined	20:58
	← Lord_of_Life left	20:58
	Lord_of_Life_ → Lord_of_Life	20:59
	→ EvilDMP joined	20:59
	→ kingjulian joined	20:59
	→ maxs joined	20:59
	← daoudr left	21:00
	→ orbyt joined	21:01
	← orbyt left	21:01
	→ ThorMojito1 joined	21:04
	← onichomp left	21:06
	→ onichomp joined	21:06
	← ThorMojito left	21:08
	← vicfred left	21:08
	← madewokherd left	21:10
	← gxt left	21:13
	→ gxt joined	21:13
	← ano left	21:14
	← hubble left	21:16
	→ ano joined	21:17
	→ hqdruxn08 joined	21:18
	← dviola left	21:19
	→ velix joined	21:19
velix	Sorry for asking. How can I add branch v5.6 after downloading the shallow v5.7 only? `git clone --depth 1 --branch v5.7 https://github.com/torvalds/linux/`	21:20
	→ hqdruxn08_ joined	21:20
	← hqdruxn08__ left	21:22
	← hqdruxn08 left	21:24
velix	Ah forget it, I'll downoad it all ;)	21:26
	seems easier then messing around	21:26
	← elastic_dog left	21:30
	→ ZacSharp29 joined	21:30
	← Gurkenglas left	21:32
	→ ferdna joined	21:33
	→ elastic_dog joined	21:34
	← ZacSharp left	21:34
	← elastic_dog left	21:35
	→ elastic_dog joined	21:35
	← srinidhi left	21:36
	← odoood left	21:37
	→ AnAverageHuman joined	21:37
	← Murr left	21:40
	→ Murr joined	21:40
	→ madewokherd joined	21:40
	→ Guest3641 joined	21:41
	→ jetchisel joined	21:42
	← XV8 left	21:43
	jess → j	21:48
	← gh34 left	21:48
	← arcatech left	21:49
	← kingjulian left	21:52
	→ Nalt\| joined	21:56
	← m0viefreak left	21:57
	← Nalt left	21:59
	→ odoood joined	22:01
	ZacSharp29 → ZacSharp	22:05
	→ FFY00_ joined	22:06
	← palasso left	22:08
	← Wuzzy left	22:08
	← FFY00 left	22:09
	← christall left	22:09
	→ christall joined	22:10
	← natrys left	22:10
	← rewrit3 left	22:12
	→ gioyik joined	22:12
	→ ThorMojito joined	22:15
	← christall left	22:17
	← ThorMojito1 left	22:18
	→ sargon joined	22:21
	← Guest3641 left	22:22
	→ vicfred joined	22:28
	← atrigent left	22:29
	← jwillikers left	22:30
	← odoood left	22:30
	→ Sazhen86 joined	22:38
	← yuckey2d0 left	22:38
	→ lalitmee__ joined	22:40
	→ stkrdknmibalz joined	22:42
	→ christall joined	22:42
	← lalitmee_ left	22:43
	→ rpb joined	22:44
	← sargon left	22:45
	← vysn left	22:48
	← lalitmee__ left	22:49
	← AnAverageHuman left	22:49
	→ AnAverageHuman joined	22:50
	→ gioyik_ joined	22:51
	← christall left	22:52
	← gioyik left	22:55
	← Nalt\| left	22:56
	← elastic_dog left	22:58
	→ hbautista_ joined	23:01
	← pizdets left	23:03
lantech19446	what are potential reasons for git pull to say it's working but not update the files?	23:03
	← acidsys left	23:03
	→ LSD joined	23:03
	→ pizdets joined	23:04
	← LSD left	23:04
	→ acidsys joined	23:05
	← Betal left	23:05
	← EvilDMP left	23:05
	→ pflanze joined	23:05
	← Sazhen86 left	23:05
	→ EvilDMP joined	23:06
	→ atrigent joined	23:08
	→ Betal joined	23:09
	← sudoforge left	23:15
	← pizdets left	23:18
	→ pizdets joined	23:18
	→ elastic_dog joined	23:20
	← maxs left	23:20
	→ remyabel joined	23:22
	→ wickedjargon joined	23:23
	← Ballerburg9005 left	23:25
	→ christall joined	23:28
bradyt	lantech19446: i'm a git newb, but what is evidence it's not updating the files?	23:28
	→ thiago_ joined	23:28
bradyt	*perpetual newb	23:29
lantech19446	bradyt: after I pull I nano the index.html file and my changes aren't there	23:30
bradyt	what is output of git status?	23:30
	i guess it might say if <branch> matches <origin>/<branch>	23:31
vdamewood	For what it's worth, I (almost) never use git pull.	23:31
bradyt	me too	23:31
lantech19446	bradyt: I fucked it all up so it's showing untracked files at this point	23:31
bradyt	i do git fetch and consider the commit graph	23:31
lantech19446	git fetch didn't work either	23:31
vdamewood	Git fetch doesn't update the working direcctory.	23:31
	You need to git merge after doing git fetch to update your working directory.	23:32
lantech19446	ok i'll keep that in mind, right now i'm getting kind of a concerning message it's telling me that the folder for my other site is untracked	23:33
	← christall left	23:33
bradyt	you could add them, commit them to a branch just in case	23:33
	if i don't know why i have files there, and want to figure it out later, sometimes i just put them on an extra branch	23:33
vdamewood	lantech19446: Okay, so pick a problem to solve first.	23:34
bradyt	pros might use "stash"	23:34
	i rarely use stash	23:34
vdamewood	stash is all the fun of a temporary branch without having to make a temporary branch.	23:34
bradyt	"i was like, 'where'd he go?!', and he was like, 'where'd who go?!'!"	23:35
lantech19446	well there's absolutely no reason for it to be tracking those files from outside of the directory i'm in right now and when i run git status in those repos it says it's clean and nothing to commit	23:35
bradyt	top gun reference	23:35
	← elastic_dog left	23:35
bradyt	lantech19446: okay, but you can just save them to an auxiliary branch and figure it out later	23:35
	yeah, i guess we're at, "pick a problem"	23:36
lantech19446	i've never seen it do this before it's kind of odd	23:36
bradyt	i guess i would recommend getting comfortable with navigating a commit graph	23:36
	which is maybe not a useful statement	23:36
vdamewood	lantech19446: So, which problem do you want to solve first?	23:37
bradyt	a changed .gitignore could be one source of surprise untracked files	23:38
	iiuc	23:38
	or maybe a commit that moves files	23:39
	← wickedjargon left	23:39
lantech19446	I've copied all the files to my desktop now so if something goes wrong I can get back up and running	23:42
	→ elastic_dog joined	23:42
lantech19446	so apparently 2 of my files got written to /var/www I wonder if that's causing the issue	23:44
	it's the files for the site i'm having the problems with I must have fucked up somewhere	23:45
	← epolanski left	23:45
	← timmcg left	23:46
lantech19446	yep it was being caused by stray files but now I have no idea if i still have a problem or not so i guess i'll have to come back	23:47
	← DvdKhl left	23:48
	← thiago_ left	23:48
	→ Codaraxis_ joined	23:49
	← Codaraxis left	23:53
	→ gioyik joined	23:53
	← gioyik_ left	23:56
gumnos	I have a daily cron job to `git pull -q >/dev/null` yet I'm getting output even when there's success ("Updating files: 100% (58/58), done"). How do I shush everything but errors? Using -q doesn't seem to cut it.	23:57
	it means my system mailbox keeps getting noise-messages when I've told git to be quiet	23:58
bremner	this seems like a question for #bash	23:58
	or whatever your shell is	23:59
	did you try redirecting stderr?	23:59
gumnos	I can redirect stderr, but then I suppress any actual errors (which I do want)	23:59

Logs Search ←Prev date Next date→

Channels Documentation