IRCloggy #git 2020-10-29

Logs Search ←Prev date Next date→ Channels Documentation

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-10-29

← tiin57 left00:02
← fstd left00:03
← feriman left00:03
← dmc left00:03
→ tiin57 joined00:05
← orbyt_v7 left00:05
→ fstd joined00:06
sgn1 → sgn00:07
→ fstd_ joined00:12
← fstd left00:13
← calcul0n left00:13
→ sotram joined00:14
← raymond__ left00:15
← fstd_ left00:17
→ fstd joined00:18
→ shored1 joined00:25
← shored left00:26
→ sdwrage joined00:26
← sdwrage left00:28
→ sdwrage joined00:29
← clime left00:31
← dionysus70 left00:31
← tiin57 left00:32
→ tiin57 joined00:35
→ orbyt_ joined00:39
← fstd left00:39
→ wgrant joined00:39
→ dionysus70 joined00:40
← m0viefreak left00:40
→ clime joined00:42
→ nomadicmathmo joined00:43
→ saveNexit joined00:49
← sdwrage left00:55
← Technodrome left00:57
← saveNexit left00:58
← dionysus70 left00:59
→ dionysus70 joined01:01
← tiin57 left01:02
← clime left01:04
→ tiin57 joined01:05
← klonn left01:08
← dionysus70 left01:08
→ clime joined01:09
→ fstd joined01:10
← dionysus69 left01:14
← igemnace left01:22
→ sdwrage joined01:22
← notnatebtw left01:23
→ igemnace joined01:24
← tiin57 left01:32
bn_work so anyone have any thoughts on my conundrum above?01:34
→ tiin57 joined01:35
← sdwrage left01:37
→ dmc joined01:41
← yohnnyjoe left01:42
← mirrorbird left01:52
→ cdown_ joined01:55
← Aquazi left01:55
← cdown left01:57
cdown_ → cdown01:57
← ignapk left02:00
← CustosLimen left02:00
← Zenstecm left02:00
← lolmac left02:00
← afisher left02:00
← Lewix left02:00
← gajus left02:00
→ Zenstecm joined02:00
→ afisher joined02:00
→ CustosLimen joined02:00
→ lolmac joined02:00
→ gajus joined02:00
→ Lewix joined02:00
← oh4 left02:01
← fahadash left02:01
← willnorris left02:01
← metametapod left02:01
→ cdown_ joined02:01
← tiin57 left02:02
→ ignapk joined02:02
← eamanu left02:02
→ eamanu joined02:02
→ fahadash joined02:02
→ willnorris joined02:03
→ oh4 joined02:03
→ metametapod joined02:03
← cdown left02:03
cdown_ → cdown02:03
→ tiin57 joined02:05
← nuxdie left02:09
← davispuh left02:10
← igemnace left02:10
← PJBoy left02:13
← sotram left02:13
← gschanuel left02:19
← durham left02:19
→ gschanuel joined02:20
← AnAverageHuman left02:23
→ justan0theruser joined02:24
← justanotheruser left02:26
→ cloud69 joined02:28
← antiPoP left02:29
← miguel_clean left02:29
← tiin57 left02:32
→ durham_ joined02:32
→ tiin57 joined02:35
cloud69 Hey hey! How do I `git show`all the commits from a single author?02:36
Similar to `git log --author=` except I need to see the actual code02:37
haha funny joke in the topic :)02:37
→ igemnace joined02:38
→ smallville7123 joined02:39
← madduck left02:45
→ mirrorbird joined02:50
→ madduck joined02:52
← mowcat left02:52
← tiin57 left03:02
← mns left03:05
→ tiin57 joined03:05
→ mns joined03:06
lagothrix → Guest4915103:12
← Guest49151 left03:12
→ lagothrix joined03:12
→ gigasu_shida joined03:14
→ drbean joined03:15
→ vicfred joined03:19
← igemnace left03:19
Gurkenglas_ → Gurkenglas03:19
← orbyt_ left03:28
← jab416171 left03:29
← howdoi left03:31
← tiin57 left03:32
→ jab416171 joined03:34
← Wetmelon left03:35
→ tiin57 joined03:35
→ igemnace joined03:38
← pac1 left03:44
← pac1_ left03:44
→ Goplat joined03:47
← hyperair left03:53
← tiin57 left04:02
← milkt left04:03
→ tiin57 joined04:04
→ milkt joined04:05
← Gurkenglas left04:06
← milkt left04:08
← theoceaniscool left04:08
→ milkt joined04:09
← milkt left04:12
← g00s left04:13
← yoh left04:14
← mirrorbird left04:14
→ milkt joined04:15
← drbean left04:18
← milkt left04:19
→ milkt joined04:20
→ theoceaniscool joined04:22
← gast0n left04:24
← milkt left04:25
→ milkt joined04:25
→ kalbasit joined04:26
← Shentino left04:28
→ Shentino joined04:31
← tiin57 left04:32
→ tiin57 joined04:35
→ jetchisel joined04:38
← theoceaniscool left04:38
← ojdo left04:41
← cbreak left04:41
→ settermjd_ joined04:42
circuitbone cloud69: there is a 3rd party tool cllaed git history that shows the code as its changed.04:42
https://githistory.xyz/04:42
← settermjd left04:43
settermjd_ → settermjd04:43
→ cbreak joined04:44
→ ojdo joined04:48
→ duderonomy joined04:48
→ theoceaniscool joined04:51
→ powerhouse joined04:53
→ mirrorbird joined04:53
→ aamir-madari joined04:54
aamir-madari hi, sorry to be such a noob. For the first time an actual client wants to go with Git to manage their project but it's on shared hosting, so no SSH access. Am I crazy to use a Gitlab CI to FTP files with lftp?04:54
Hello71_ that's called "CD"04:56
also !3rdparty04:56
gitinfo Your question is about a third-party tool or service, not a core `git` component. It is OK to ask, but replies are not guaranteed04:56
← powerhouse left04:57
aamir-madari -_-, actually yeah. I''ll ask on #gitlab04:58
Hello71_ there's nothing wrong with it except for the obvious problem that your deployment is then tied to git04:59
→ powerhouse joined04:59
Hello71_ so you need to work that into your workflows, and not push to master or deploy or whatever until you're really ready04:59
aamir-madari Is it normal practice for it to be?04:59
Hello71_ well if you just push all your shit to master without testing then it's a crap idea05:00
aamir-madari That makes sense05:00
Hello71_ but if you do your development on dev and then substitute "git push origin master" for "./scripts/deploy" then there's not really a big difference05:01
except obviously you give your credentials to gitlab05:01
aamir-madari Hmm05:01
→ OnkelBlade joined05:01
Hello71_ if you're using shared hosting then gitlab is not a serious threat though05:01
← tiin57 left05:01
← jetchisel left05:02
→ tiin57 joined05:05
aamir-madari As much as I love Git, my colleagues are averse to anything technical so never dove down the path of git. In terms of real world practice would you make any changes on a 'dev' site and then use git to manage the live site?05:07
→ sgn1 joined05:08
← madewokherd left05:10
← sgn left05:11
aamir-madari I've only ever properly worked on 1 project with Git and the only way I felt I wasn't making crappy commits was working on a local version and only commiting the finished code05:12
→ tejr_ joined05:17
← tejr left05:17
tejr_ → tejr05:17
Hello71_ !book05:18
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 !parable05:18
aamir-madari Thanks! I do need a good study on this.05:18
← cloud69 left05:19
→ Hounddog joined05:19
← aamir-madari left05:21
← Betal left05:24
→ smallvil_ joined05:28
← smallville7123 left05:29
← CCR5-D32 left05:29
← tiin57 left05:32
→ tiin57 joined05:35
← milkt left05:42
→ milkt joined05:42
← umask077 left05:48
→ umask077 joined05:49
← umask077 left05:49
→ raymond joined05:49
→ umask077 joined05:49
← umask077 left05:49
→ umask077 joined05:50
← mirrorbird left05:50
→ bocaneri joined05:53
→ Technodrome joined05:54
← crose left05:56
← geosmile left05:56
→ dirkmkdir joined05:57
← bocaneri left06:01
→ bocaneri joined06:02
← tiin57 left06:02
← bocaneri left06:03
→ bocaneri joined06:03
← bocaneri left06:04
← clime left06:04
→ tiin57 joined06:05
← sudoforge left06:09
← cd left06:10
→ Guest20 joined06:10
← arcatech left06:11
← thiago left06:11
→ mirrorbird joined06:16
→ ricks_ joined06:21
← wagle left06:23
→ wagle joined06:24
→ mightyjens joined06:25
→ CoolerX joined06:26
CoolerX how does git play with the gh tool?06:27
the new cli tool for Github06:27
if I do something like gh pr checkout xxx will that thrash the current directory?06:27
because the PR on Github is from a fork06:27
some branch on some fork06:27
so you can't just pull it06:28
→ zamba joined06:29
zamba i just initialized a new repository.. and i want to push to this.. i ticked the box where i wanted to automatically add a README.. and this means that both ends, the central/remote repository, and the local one have changes that need to be synched06:29
so i'm unable to push06:29
and i'm also unable to pull06:29
There is no tracking information for the current branch. Please specify which branch you want to merge with.06:30
fatal: refusing to merge unrelated histories06:31
i hate this part of git, or version control in general..06:31
CoolerX zamba, HA, I have done that a couple times06:31
zamba i have no idea what i'm doing.. i'm just stabbing at random..06:31
rudi_s zamba: man git-merge and search for unrelated06:31
gitinfo zamba: the git-merge manpage is available at https://gitirc.eu/git-merge.html06:31
← tiin57 left06:32
rudi_s In the past that worked by default but it was changed to prevent accidents.06:32
zamba ah! perfect.. thanks06:32
rudi_s np06:33
→ tiin57 joined06:35
→ bamdad_ joined06:36
← bamdad left06:37
→ mat001_ joined06:38
← mat001 left06:39
→ KnoP joined06:40
← Shentino left06:40
→ Shentino joined06:41
← dqx left06:42
← Guest20 left06:56
← tonyj left06:59
← tiin57 left07:01
← unluckyshrubbery left07:03
→ Kaisyu joined07:04
→ tiin57 joined07:05
← mirrorbird left07:05
→ kaartic joined07:06
→ jstein joined07:06
← justan0theruser left07:09
← jas4711 left07:09
← yonder left07:15
← Goplat left07:19
← powerhouse left07:27
→ powerhouse joined07:27
← tiin57 left07:31
→ Guest20 joined07:33
→ tiin57 joined07:35
→ brunosaboia_ joined07:36
← ferdna left07:36
← mat001_ left07:39
← brunosaboia_ left07:40
→ Haohmaru joined07:41
← dodobrain left07:41
← bamdad_ left07:53
← tejr left07:53
← tryte left07:53
→ tryte joined07:53
→ bamdad joined07:53
→ tejr joined07:53
→ LetoThe2nd joined07:55
→ vicfred_ joined07:55
→ rfuentess joined07:56
← vicfred left07:59
← Guest20 left07:59
← tiin57 left08:01
← kaartic left08:04
→ tiin57 joined08:05
← settermjd left08:06
→ mirrorbird joined08:06
→ settermjd joined08:06
← gigasu_shida left08:08
→ feriman joined08:10
← ndbopoi^ left08:14
→ ndbopoi^ joined08:14
← ndbopoi^ left08:14
→ ndbopoi^ joined08:15
← ndbopoi^ left08:15
→ ndbopoi^ joined08:15
← ndbopoi^ left08:15
→ ndbopoi^ joined08:15
← ndbopoi^ left08:15
→ ndbopoi^ joined08:15
← ndbopoi^ left08:15
→ ndbopoi^ joined08:16
← ndbopoi^ left08:16
→ ndbopoi^ joined08:16
← ndbopoi^ left08:16
→ ndbopoi^ joined08:16
← ndbopoi^ left08:16
← Loomaanaatii947 left08:16
→ ndbopoi^ joined08:16
← ndbopoi^ left08:16
← DuckyDev left08:16
→ ndbopoi^ joined08:17
← ndbopoi^ left08:17
→ DuckyDev joined08:17
→ ndbopoi^ joined08:17
← ndbopoi^ left08:17
→ ndbopoi^ joined08:17
← ndbopoi^ left08:17
→ ndbopoi^ joined08:17
← ndbopoi^ left08:17
→ ndbopoi^ joined08:18
← ndbopoi^ left08:18
→ PJBoy joined08:20
→ Loomaanaatii947 joined08:20
→ kaartic joined08:20
← durham_ left08:21
→ FabioP joined08:21
← zumba_addict left08:21
→ oxymoron93 joined08:31
← tiin57 left08:31
→ chele joined08:33
← teclator left08:35
→ tiin57 joined08:35
→ teclator joined08:36
→ unluckyshrubbery joined08:38
→ miguel_clean joined08:39
→ interrobangd joined08:39
← interrobangd left08:47
← milkt left08:48
← hnOsmium0001 left08:49
→ spiri joined08:53
→ milkt joined08:56
← cpackham left09:00
← tiin57 left09:01
← webmariner left09:03
→ webmariner joined09:03
→ dwmw2_gone joined09:05
→ tiin57 joined09:05
← milkt left09:06
← webmariner left09:08
→ milkt joined09:09
→ dodobrain joined09:09
← milkt left09:10
→ dodobrain_ joined09:11
← dodobrain left09:15
← dodobrain_ left09:16
→ milkt joined09:16
← milkt left09:18
→ Aquazi joined09:19
← ricks_ left09:20
→ rcoote joined09:21
→ milkt joined09:23
← R2robot left09:24
← gschanuel left09:31
← tiin57 left09:31
→ gschanuel joined09:32
→ tiin57 joined09:35
← nomadicmathmo left09:37
→ Guest20 joined09:41
← Technodrome left09:45
← sweatsuit left09:48
→ sweatsuit joined09:50
→ clime joined10:01
← tiin57 left10:01
← sweatsuit left10:03
→ Anticom joined10:03
→ tiin57 joined10:05
→ sweatsuit joined10:07
→ yohnnyjoe joined10:09
← dirkmkdir left10:11
← kaartic left10:13
← yohnnyjoe left10:15
→ kaartic joined10:16
→ charvi077 joined10:20
→ hussam joined10:21
→ R2robot joined10:26
← tiin57 left10:31
← is_null left10:32
→ dionysus69 joined10:34
→ tiin57 joined10:34
← jaziz left10:36
→ agowa338 joined10:40
→ jaziz joined10:40
→ lacrymology joined10:40
← charvi077 left10:44
→ mobidrop joined10:45
← faceface left10:50
← tiin57 left11:01
→ tiin57 joined11:05
← CoolerX left11:06
← fahadash left11:08
→ samuelbernardo joined11:15
→ calcul0n joined11:17
→ loki59 joined11:17
→ yohnnyjoe joined11:18
← smallvil_ left11:18
← loki59 left11:19
→ wrobinso1 joined11:23
← wrobinson left11:25
← yohnnyjoe left11:25
→ faceface joined11:28
→ achilles joined11:29
← tiin57 left11:31
← vicfred_ left11:35
→ tiin57 joined11:35
→ p-core joined11:36
← p-core left11:45
→ wallacer3 joined11:46
→ aliss joined11:50
← settermjd left11:51
→ settermjd joined11:51
→ royal_screwup21 joined11:52
→ mat001 joined11:54
→ CalimeroTeknik joined11:57
→ yohnnyjoe joined12:00
← tiin57 left12:01
→ tiin57 joined12:05
← jstein left12:09
→ zumba_addict joined12:09
→ fandre1986 joined12:12
faceface hihi12:23
Can I do something like git rebase --dry-run ...?12:23
Did I just answer my own question?12:23
ikke What do you hope to get from a dry-run?12:24
faceface I guess git rebase ... || git rebase --abort ?12:25
ikke: I'm being lazy and playing wiht a live server12:25
will git rebase return a non zero exit code if it fails to rebase cleanly?12:25
ikke Not sure, i'd expect so though12:26
faceface The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the ...12:26
I'm guessing it applies to non-interactive too12:28
← tiin57 left12:31
← mirrorbird left12:32
→ sdwrage joined12:32
faceface So I don't understand what just happened...12:32
git rebase origin/REL1_3312:33
→ nurdie joined12:33
faceface let me make a paste12:34
← Guest20 left12:34
← nurdie left12:34
→ nurdie joined12:34
faceface Ah, ignore me, I see it now12:35
→ tiin57 joined12:35
→ hansh joined12:37
hansh where can i find documentation on the return value of "git diff" ? it somewhat unexpectedly returns 1 instead of 0 sometimes12:37
(without printing anything to stderr)12:37
kaartic man git diff ?12:38
gitinfo the git-diff manpage is available at https://gitirc.eu/git-diff.html12:38
hansh in what situations should "git diff" return 1 and not print anything to stderr?12:39
kaartic, that makes sense, but i can't see any section there explaining return values12:39
kaartic Yeah, strange indeed.12:40
← nurdie left12:40
ikke There is a --exit-code option12:40
← FabioP left12:40
ikke but, that only counts when you pass --exit-code12:40
hansh hmm, i didn't12:40
ikke "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences. "12:41
hansh git diff --text --no-index --color=always '/path/to/file' -12:41
printf foo | git diff --text --no-index --color=always '/path/to/file' -12:41
why does this command return 1? printf foo | git diff --text --no-index --color=always '/dev/null' -12:42
(/dev/null is an empty file, 0 bytes)12:43
→ yoh joined12:43
hansh if i added --exit-code it would make sense, but i didn't, so.. what does the 1 mean?12:43
i'm using an older git version tho, 2.28.012:44
can someone with >= 2.29.1 check if it returns 1 there too?12:44
← feriman left12:45
ikke it des12:46
does12:46
hansh thanks for checking ^^12:46
→ mirrorbird joined12:47
hansh until i find some return documentation, i'm just going to add --exit-code and treat anything except 0 and 1 as an actual error ^^12:48
(at least the return code for --exit-code is documented)12:48
kaartic I'm really doubtful about where else you cpuld find it if not in the man page. Also, see https://stackoverflow.com/a/491800212:53
hansh hmm, i don't think there should be any errors generated by diffing /dev/null with stdin, yet it makes git return 1, i'm guessing there's possibly a bug there somewhere12:54
← sweatsuit left12:55
← tejr left12:57
ikke kaartic: the source :P12:58
hansh luke12:58
→ tejr joined12:59
→ rsx joined12:59
← Xenguy left12:59
← oatmealraisin left13:00
kaartic ikke: Of course, it has to be there. Why do we even have man pages then? :P13:00
← hansh left13:00
→ hansh joined13:01
← tiin57 left13:01
→ sgn joined13:02
→ ph0b0s_ joined13:03
→ tiin57 joined13:05
← ph0b0s left13:06
→ CCR5-D32 joined13:08
kaartic hansh: Interesting fact '--no-index' implies '--exit-code'. So, not a difference if you explicitly pass it or not.13:09
ikke aha, that explains13:12
hansh kaartic, ohh thanks13:12
kaartic np13:12
→ agowa339 joined13:17
→ CodeSlingerPaul joined13:19
← agowa338 left13:19
agowa339 → agowa33813:21
→ physkets joined13:21
← mightyjens left13:22
physkets Hi! If I clone a specific tag, with depth 1, what will happen when I later `git pull`, after the repo has recieved more commits?13:22
→ sdwrage_ joined13:23
← sdwrage left13:23
← igemnace left13:23
→ Gurkenglas joined13:25
← tiin57 left13:31
osse physkets: nothing destructive, so you might as well try. But my guess is that nothing happens because git doesn't know what to pull13:33
or rather that it tries to update the tag, but tags never change13:33
→ tiin57 joined13:34
→ hyperair joined13:38
→ oatmealraisin joined13:44
← sgn left13:44
→ Heirlung- joined13:47
← lacrymology left13:48
← Heirlung left13:48
Heirlung- → Heirlung13:48
→ igemnace joined13:51
→ Amanas joined13:53
→ geosmile joined13:56
← tiin57 left14:01
→ mescalinum joined14:03
→ strk joined14:04
→ lss joined14:04
← vtx left14:04
strk is there a command to automatically resolve a worktree by picking one side of the "both modified" ?14:05
→ tiin57 joined14:05
← aliss left14:05
→ amahl joined14:05
→ tonyj joined14:06
← tonyj left14:06
→ tonyj joined14:07
← j7k6 left14:07
→ j7k6 joined14:07
→ tavito joined14:08
→ Betal joined14:10
ikke git checkout --theirs|ours <file>14:10
→ dqx joined14:10
strk excellent, thanks!14:17
← Tobbi_ left14:17
→ Tobbi_ joined14:21
← mns left14:27
→ mns joined14:29
→ thiago joined14:29
→ AndroUser2 joined14:30
sgn1 → sgn14:31
← tiin57 left14:31
← AndroUser2 left14:32
← ghost43 left14:34
→ ghost43 joined14:34
→ otisolsen70 joined14:34
→ tiin57 joined14:34
→ Newami joined14:35
→ sgn_ joined14:36
← sgn_ left14:36
← mobidrop left14:37
→ mobidrop joined14:38
← Newami left14:39
→ luna4444 joined14:41
← mobidrop left14:44
→ mobidrop joined14:44
← raymond left14:45
← tilpner left14:46
→ raymond joined14:46
→ Technodrome joined14:48
→ tilpner joined14:50
← luna4444 left14:51
← Kaisyu left14:53
→ gast0n joined14:54
→ justanotheruser joined14:55
← Kaivo left14:55
← strk left14:55
→ Kaivo joined14:58
→ hnOsmium0001 joined15:00
→ justan0theruser joined15:00
← tiin57 left15:01
→ endiruna joined15:02
→ lucasb joined15:02
← justanotheruser left15:03
→ sweatsuit joined15:03
→ tiin57 joined15:05
→ luna4444 joined15:07
physkets osse: Can I switch from that tag's branch to master?15:07
→ TomyWork joined15:11
← Heirlung left15:12
osse physkets: what does git config remote.origin.fetch say?15:13
← clime left15:13
physkets osse: It points to the tag:15:13
+refs/tags/stable_29Oct2020:refs/tags/stable_29Oct202015:13
osse You can do git fetch origin refs/heads/master and git checkout FETCH_HEAD15:15
or you can change the default fetch value15:15
depends on what exactly you want15:15
→ Maxattax joined15:15
← andreas303 left15:16
← RoseBus left15:18
→ Newami joined15:18
← Newami left15:19
→ gioyik joined15:20
← tilpner left15:23
→ zavulon joined15:24
→ tilpner joined15:27
wrobinso1 → wrobinson15:28
← zavulon left15:28
← tiin57 left15:31
→ astronavt joined15:32
→ tiin57 joined15:35
← luna4444 left15:35
→ clara97 joined15:36
→ FabioP joined15:37
← sdwrage_ left15:46
→ mns_ joined15:47
← mns left15:47
→ sdwrage joined15:48
← Amanas left15:48
← oxymoron93 left15:56
→ clime joined15:56
→ cloud69 joined15:56
cloud69 circuitbone: cool but not sure if that's what i need though15:58
to recap:15:58
→ calcul0n_ joined15:59
← h3ck left15:59
→ durham joined16:00
← durham left16:00
→ durham joined16:00
← calcul0n left16:01
← tiin57 left16:01
→ agowa339 joined16:02
cloud69 Hello! Is there a way to do `git show --author=JohnDoe` to get the actual diffs and not just the log like in `git log --author=JohnDoe`?16:03
→ pev_ joined16:03
← agowa339 left16:04
← agowa338 left16:04
→ tiin57 joined16:05
physkets osse: How do I switch the default fetch?16:05
When I do `git branch`, I get:16:06
* (no branch)16:06
← hansh left16:06
→ hansh joined16:06
← achilles left16:09
← dermoth left16:11
→ dermoth joined16:11
← hansh left16:11
→ relipse joined16:12
→ orbyt_ joined16:14
osse physkets: Provide the new value as argument to the git config command16:18
→ Guest20 joined16:21
→ madewokherd joined16:21
→ kerframil joined16:22
→ vdamewood joined16:26
← calcul0n_ left16:26
→ calcul0n_ joined16:27
← Haohmaru left16:27
→ howdoi joined16:28
→ gareppa joined16:29
physkets osse: OKay! looks like that works! thansks!16:29
→ ferdna joined16:30
→ andreas303 joined16:30
← tiin57 left16:31
← lss left16:33
← gareppa left16:34
← Guest20 left16:34
← sdwrage left16:35
→ tiin57 joined16:35
← clime left16:36
← flowinho left16:38
→ nomad77 joined16:39
→ flowinho joined16:39
← flowinho left16:39
→ flowinho joined16:39
← berken left16:39
← zalun left16:39
← disruptivenl left16:39
← omnidapps left16:39
← dunk left16:40
→ orbyt_v7 joined16:40
→ sdwrage joined16:40
→ berken joined16:40
→ dunk joined16:40
→ zalun joined16:40
→ omnidapps joined16:40
→ disruptivenl joined16:41
→ nomadicmathmo joined16:41
→ mowcat joined16:45
→ Guest20 joined16:46
← chele left16:48
→ arcatech joined16:52
→ LuxuryMode joined16:55
← rodarmor left16:55
→ rodarmor joined16:55
← rfuentess left16:57
← teward left16:59
→ lacrymology joined16:59
→ dirkmkdir joined17:00
→ teward joined17:00
← ferdna left17:00
← tiin57 left17:01
← arcatech left17:03
← andreas303 left17:05
→ tiin57 joined17:05
→ mns joined17:06
← mns_ left17:06
→ andreas303 joined17:07
← Gurkenglas left17:10
← yohnnyjoe left17:15
→ yohnnyjoe joined17:16
← KnoP left17:18
← samuelbernardo left17:18
→ AnAverageHuman joined17:21
← astronavt left17:26
← AnAverageHuman left17:27
← durham left17:27
→ durham joined17:27
→ bariscant joined17:28
→ crose joined17:29
→ arcatech joined17:30
← tiin57 left17:31
← mir100 left17:32
← vishal left17:33
→ vishal_ joined17:33
vishal_ → vishal17:33
→ mozgalom joined17:34
→ tiin57 joined17:35
← bariscant left17:37
← ghost43 left17:43
→ ghost43_ joined17:43
← gordonfish left17:43
← nomad77 left17:45
← OnkelBlade left17:46
→ feriman joined17:47
← TomyWork left17:50
← spiri left17:55
← Guest20 left17:56
← lungaro left17:56
← mirrorbird left17:57
← tiin57 left18:01
→ clime joined18:01
← kaartic left18:03
→ webmariner joined18:03
← thebope left18:05
→ tiin57 joined18:05
← yohnnyjoe left18:06
→ Gurkenglas joined18:07
← CCR5-D32 left18:08
← calcul0n_ left18:09
→ calcul0n_ joined18:09
Soni how do you recover the work tree from a .git?18:10
selckin git checkout -- .18:10
Soni thanks18:11
← physkets left18:16
→ otisolsen70_ joined18:21
← otisolsen70_ left18:22
← CodeSlingerPaul left18:22
← otisolsen70 left18:26
← independent_ left18:27
→ gordonfish joined18:28
← mobidrop left18:30
← Technodrome left18:30
← tiin57 left18:31
← arcatech left18:31
← scientes_ left18:31
← oatmealraisin left18:32
← LetoThe2nd left18:33
→ tiin57 joined18:35
← justan0theruser left18:35
← clara97 left18:36
→ sudoforge joined18:37
→ arcatech joined18:38
→ yohnnyjoe joined18:39
→ spiri joined18:40
→ calcul0n__ joined18:41
→ CodeSlingerPaul joined18:43
← kieto left18:43
← calcul0n_ left18:43
→ CCR5-D32 joined18:44
← gschanuel left18:44
→ Amanas joined18:45
← yohnnyjoe left18:46
→ AnAverageHuman joined18:47
← tilpner left18:48
→ tilpner joined18:49
→ LionsMane joined18:50
← AnAverageHuman left18:52
← Hounddog left18:54
→ p-core joined18:54
→ Hounddog joined18:55
→ yohnnyjoe joined18:56
← pev_ left18:58
→ fahadash joined18:58
→ Heirlung joined18:58
← spiri left18:59
← sdwrage left18:59
→ sdwrage joined19:00
← tiin57 left19:01
→ robrand joined19:03
← robrand left19:03
→ gump joined19:03
gump is it safe to use the output of `git show `ref:path` to copy a file from another branch/tag? is there a better way to do this?19:04
→ justanotheruser joined19:04
← Kaivo left19:05
→ tiin57 joined19:05
ikke gump: sure, it should just print the files contents19:05
→ Kaivo joined19:08
→ mokulus joined19:12
→ oatmealraisin joined19:16
→ myk_ joined19:21
← FabioP left19:21
← LuxuryMode left19:25
→ herren joined19:26
← durham left19:28
← tiin57 left19:31
← rsx left19:32
→ tiin57 joined19:35
← diverger left19:36
→ davispuh joined19:36
← oatmealraisin left19:38
← orbyt_ left19:39
← Amanas left19:39
Soni how do you handle name changes in git?19:41
ikke mailmap19:41
→ oatmealraisin joined19:41
← ThatOtherGuy left19:42
ikke man git check-mailmap has documentation on it19:42
gitinfo the git-check-mailmap manpage is available at https://gitirc.eu/git-check-mailmap.html19:42
← oatmealraisin left19:49
→ ThatOtherGuy joined19:53
← davispuh left19:55
→ davispuh joined19:58
dflick__ any gitignore experts? gitignore issues. This works fine: /inventory/hotcog/~$hotcog_devops_input_master.xlsx but these fail to ignore: **/~$.* and **/inventory/~$.*.xlsx20:00
I thought that ** would be any path no matter how deep.20:01
← Maxattax left20:01
← tiin57 left20:01
→ hansh joined20:01
dflick__ somehow after typing it, I may have answered my own question on one of them. **/inventory/~$.*.xlsx should likely be /inventory/**/~$.*.xlsx20:02
stenno its called rubber duck debugging20:03
dflick__ but shouldn't **/~$.* have worked?20:03
ROFL, yeah, the duck has an ear infection and won't listen. :-)20:04
stenno its not regexp, its glob20:04
~$hotcog is not matched by ~$.*20:04
dflick__ ahhhh20:05
→ tiin57 joined20:05
stenno but by ~$*20:05
ikke git check-ignore -v20:05
dflick__ Thanks stenno, I am not a programmer and sometimes I miss the simple stuff still....getting better though.20:05
stenno https://git-scm.com/docs/gitignore#_pattern_format20:05
dflick__ Thanks! I will try both.20:05
→ thebope joined20:06
← amahl left20:07
stenno globs and regexps are often confused, no worries20:07
dflick__ stenno, that is so much better than the reference I was looking at. Thanks again!20:07
stenno actually i wonder about this example:20:09
The pattern hello.* matches any file or folder whose name begins with hello20:09
← rcoote left20:09
stenno to be specific, it matches any file that begins with `hello.`, correct?20:10
ikke yes20:10
stenno this wording is pretty poor then imo20:11
i mean any file beginning with `hello.` also begins with `hello` of course, but still...20:11
i will submit a bug report for clarification i guess20:14
oh wait20:15
← ndim left20:15
stenno mailing lists, really :(20:15
i suddenly lost interest reporting this20:16
Soni how do you rewrite history to respect a trans person's wishes before publishing a repo?20:17
ikke !filter-repo20:17
gitinfo A new git add-on that greatly improves on git-filter-branch: https://github.com/newren/git-filter-repo20:17
ikke which still uses mailmap to provide the mapping20:18
→ ndim joined20:22
→ g00s joined20:24
ikke or just something like git-filter-repo --email-callback 'return email.replace(b".cm", b".com")'20:24
→ gigasu_shida joined20:24
ikke git-filter-repo --name-callback 'return name.replace(b"Wiliam", b"William")'20:25
filter-repo is a third-party tool which you need to install20:25
→ lungaro joined20:27
← tiin57 left20:31
→ macrover joined20:32
← qpdb left20:34
→ tiin57 joined20:35
← myk_ left20:40
dflick__ Thanks again stenno. Used the blob and it works like a champ!20:45
← hansh left20:46
← cloud69 left20:46
stenno np, glad you got it working20:50
also its 'glob' not 'blob' :P20:50
https://en.wikipedia.org/wiki/Glob_(programming)20:51
← mozgalom left20:55
← CCR5-D32 left20:59
→ prominentpotato joined21:01
← tiin57 left21:01
→ hansh joined21:04
← prominentpotato left21:04
→ prominentpotato joined21:04
→ tiin57 joined21:04
← prominentpotato left21:05
→ prominentpotato joined21:06
→ yonder joined21:08
← hansh left21:11
→ diverger joined21:13
← arcatech left21:14
→ oatmealraisin joined21:15
→ arcatech joined21:17
← arcatech left21:18
← lacrymology left21:18
← prominentpotato left21:22
→ prominentpotato joined21:23
← prominentpotato left21:23
→ prominentpotato joined21:24
← prominentpotato left21:24
→ prominentpotato joined21:24
→ lacrymology joined21:25
dflick__ stenno, got it! Thanks again. I will get this stuff eventually. :)21:26
→ arcatech joined21:31
← tiin57 left21:31
← diverger left21:32
→ m0viefreak joined21:32
→ tiin57 joined21:35
→ diverger joined21:35
→ azerus joined21:37
← orbyt_v7 left21:41
← R2robot left21:42
→ cd joined21:42
← misuto left21:43
→ misuto joined21:49
→ tuskkk____ joined21:53
← tavito left21:55
← tiin57 left22:01
← DNS left22:03
→ tiin57 joined22:04
→ DNS joined22:05
← Hounddog left22:05
← kerframil left22:07
← justanotheruser left22:14
marxarelli hi folks. i have a bugfix patch for upload-pack which i'd like to write a test for, but i'm unsure of the naming convention for those t/t-* scripts. are they just named in serial or are those bug report numbers? i've never contributed to git before so please excuse my ignorance22:14
→ orbyt_v7 joined22:14
← nomadicmathmo left22:14
← feriman left22:15
← dionysus69 left22:16
marxarelli oh. maybe i should ask this in #git-devel :)22:16
→ mobidrop joined22:16
→ nvmd joined22:19
← mobidrop left22:20
→ feriman joined22:21
← theoceaniscool left22:22
← herren left22:23
← sdwrage left22:23
← p-core left22:26
← clime left22:29
← tiin57 left22:31
← feriman left22:33
→ feriman joined22:33
← prominentpotato left22:34
→ tiin57 joined22:35
← orbyt_v7 left22:35
→ p-core joined22:36
→ kerframil joined22:38
← calcul0n__ left22:42
→ orbyt_ joined22:44
← bn_work left22:48
→ dionysus69 joined22:55
→ nomadicmathmo joined22:55
← mowcat left22:56
← tiin57 left23:01
→ astronavt joined23:02
← m0viefreak left23:02
← Anticom left23:04
← feriman left23:04
→ tiin57 joined23:04
→ Orbstheorem joined23:04
← CodeSlingerPaul left23:05
Orbstheorem Hi, I'm writing a custom command. I've managed to get it to run, but for some reason I seem unable to run it with `--help`. (i.e. `git foo` runs OK, but `git foo --help` fails with 'No manual entry for 'git-foo').23:05
→ justanotheruser joined23:06
→ kdlv joined23:08
→ dodobrain joined23:15
← milkt left23:18
← lacrymology left23:25
← cd left23:29
← tiin57 left23:32
→ cd joined23:32
→ tiin57 joined23:35
Hello71_ git-foo --help23:36
Orbstheorem Yes23:37
But seems a bit counter-intuitive x)23:37
(unless you know how the custom commands system works...)23:37
← endiruna left23:40
← nomadicmathmo left23:42
← HumanG33k left23:42
→ HumanG33k joined23:43
← Celelibi left23:44
← nadley left23:45
← kerframil left23:46
→ nadley joined23:46
→ Xenguy joined23:51
← astronavt left23:54
← miguel_clean left23:56
→ Celelibi joined23:56
→ ferdna joined23:59

Logs Search ←Prev date Next date→ Channels Documentation