IRCloggy #git 2023-03-05

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.

2023-03-05

← sa0 left00:01
← FinnElija left00:05
→ FinnElija joined00:05
← fspax left00:07
← rurtty left00:08
→ miira9 joined00:09
← miira9 left00:10
← FinnElija left00:11
← lucasta left00:14
→ FinnElija joined00:14
→ lucasta joined00:17
← baine left00:18
→ baine joined00:20
→ roadie joined00:24
← kkawg left00:34
← Suchiman left00:34
← The_Blode left00:34
← selve left00:35
→ selve joined00:36
← roadie left00:38
← m0viefreak left00:43
→ roadie joined00:50
← roadie left00:55
← crabbedhaloablut left00:59
→ crabbedhaloablut joined01:02
→ R2robot_ joined01:03
← R2robot left01:03
R2robot_ → R2robot01:06
← ferdna left01:07
→ roadie joined01:09
→ R2robot_ joined01:09
← R2robot_ left01:10
← R2robot left01:10
← roadie left01:13
→ R2robot joined01:14
← jacobk left01:25
→ jacobk joined01:27
→ roadie joined01:27
→ ThorMojito joined01:30
← nyah left01:38
← jacobk left01:42
← roadie left01:43
← jaykelly450 left01:48
→ felipec joined01:58
← ThorMojito left01:59
→ jaykelly450 joined02:01
→ jacobk joined02:05
→ ferdna joined02:07
← jaykelly450 left02:08
→ gsi_ joined02:15
← SuperLag left02:16
← gsi left02:18
→ jaykelly450 joined02:21
← liminal left02:21
→ Lord_of_Life_ joined02:22
← Lord_of_Life left02:22
Lord_of_Life_ → Lord_of_Life02:23
Mealsalon → Mesailent02:25
→ SuperLag joined02:26
← jaykelly450 left02:26
← ___nick___ left02:26
← baine left02:27
→ ___nick___ joined02:28
→ baine joined02:29
→ krushia joined02:29
← ___nick___ left02:31
→ jaykelly450 joined02:32
→ ___nick___ joined02:34
← jaykelly450 left02:36
→ matt0x6f joined02:37
→ whatsupdoc joined02:46
← Inline left02:46
→ jaykelly450 joined02:49
← jaykelly450 left02:55
→ roadie joined03:03
← Frogging101 left03:04
→ Frogging101 joined03:04
→ jaykelly450 joined03:06
← moldorcoder7 left03:07
← jaykelly450 left03:11
← dupondje left03:13
→ dupondje joined03:14
← stenno left03:18
← roadie left03:20
← epicout_ left03:20
← gast0n left03:20
← squirrel left03:24
← FinnElija left03:33
→ finn_elija joined03:33
finn_elija → FinnElija03:33
← ferdna left03:34
→ junebug joined03:36
← felipec left03:42
→ ghost43_ joined03:42
← ghost43 left03:42
← R2robot left03:43
→ oermnusds^ joined03:44
← jacobk left03:46
→ jaykelly450 joined03:48
← enrh left03:48
→ roadie joined03:49
← caffblks left03:50
jjakob I have branch 1, from which I created branch 2, then used rebase on branch 2 to modify commits from branch 1, how do I now get branch 1 to reflect branch 2 exactly? no merges or manually editing merge or rebase conflicts03:51
tried rebase 2 1, but it always ends in a bunch of manual conflicts03:52
← roadie left03:53
← jaykelly450 left03:53
→ R2robot joined04:04
→ jaykelly450 joined04:05
→ roadie joined04:06
← junebug left04:09
← jaykelly450 left04:10
← mirai left04:11
→ mirai joined04:12
← mirai left04:13
→ mirai joined04:13
← roadie left04:21
→ jaykelly450 joined04:24
← oermnusds^ left04:33
→ Jong joined04:33
← baine left04:36
← vdamewood left04:37
← jaykelly450 left04:37
→ baine joined04:38
→ llh joined04:39
→ vdamewood joined04:39
→ gsi joined04:44
← hololeap left04:44
→ jacobk joined04:48
← gsi_ left04:48
→ hololeap joined04:50
→ jaykelly450 joined04:51
← lxi left04:53
← jaykelly450 left04:56
← gxt__ left05:06
→ chandash joined05:07
→ gxt__ joined05:08
← chandash left05:14
← CovertDuck left05:15
← mirai left05:17
→ mirai joined05:17
→ jaykelly450 joined05:29
→ FH_thecat joined05:30
← momomo left05:35
← Jong left05:35
← jaykelly450 left05:36
→ powftw joined05:37
← derpydoo left05:38
← Murr left05:38
→ momomo joined05:41
→ derpydoo joined05:52
→ Jong joined05:55
→ roadie joined05:55
← lucasta left06:03
→ lucasta joined06:04
← roadie left06:04
→ jaykelly450 joined06:05
← mirai left06:06
→ mirai joined06:07
→ dsrt^ joined06:10
← jaykelly450 left06:10
← mirai left06:17
→ mirai joined06:17
→ traph joined06:19
→ bywaterloo joined06:19
→ jaykelly450 joined06:22
← traph left06:22
→ traph joined06:23
→ EvgenyK joined06:23
← EvgenyK left06:24
→ EvgenyK joined06:24
← jaykelly450 left06:26
→ Murr joined06:27
→ Guest85 joined06:27
→ shokohsc61 joined06:28
← shokohsc6 left06:29
shokohsc61 → shokohsc606:29
← bywaterloo left06:31
→ jaykelly450 joined06:39
← Jong left06:40
→ roadie joined06:42
← EvgenyK left06:44
← lucasta left06:45
← jaykelly450 left06:46
← baine left06:46
→ Sulky_ joined06:47
→ baine joined06:48
← Sulky left06:49
← vdamewood left06:51
→ vdamewood joined06:53
→ lucasta joined06:55
← navi left06:55
← roadie left06:58
→ jaykelly450 joined07:00
→ EvgenyK joined07:02
← jaykelly450 left07:04
→ stenno joined07:06
← Guest85 left07:10
→ CovertDuck joined07:10
→ Fischmiep joined07:15
→ panella32 joined07:16
← panella32 left07:16
→ panella32 joined07:16
→ jaykelly450 joined07:17
← Fischmiep left07:20
← jaykelly450 left07:22
← thiago left07:22
← matt0x6f left07:26
← FH_thecat left07:31
→ EvgenyK_ joined07:32
← EvgenyK left07:34
→ Guest97 joined07:34
← Guest97 left07:37
→ FH_thecat joined07:38
→ roadie joined07:38
← lucasta left07:38
← roadie left07:43
→ curious[m] joined07:44
→ bgs joined07:47
→ roadie joined07:49
← xandris left07:50
→ lucasta joined07:50
→ xandris joined07:51
→ jaykelly450 joined07:52
← roadie left07:55
→ dionysus69 joined07:56
→ roadie joined07:58
→ The_Blode joined07:58
← jaykelly450 left07:59
← dionysus69 left08:03
← farzat left08:04
→ farzat joined08:05
→ mirai_ joined08:10
← mirai left08:10
→ jaykelly450 joined08:10
← jaykelly450 left08:15
← roadie left08:17
→ c0dehu1k joined08:17
← c0dehu1k left08:18
→ c0dehu1k joined08:18
← c0dehu1k left08:19
→ c0dehu1k joined08:19
← c0dehu1k left08:20
← panella32 left08:20
← taupiqueur1 left08:21
→ c0dehu1k joined08:21
→ roadie joined08:22
→ rsx joined08:23
← mirai_ left08:26
← lucasta left08:26
→ mirai_ joined08:26
→ taupiqueur joined08:26
→ matt0x6f joined08:27
→ jaykelly450 joined08:27
← roadie left08:32
← jaykelly450 left08:32
→ xx joined08:34
← FH_thecat left08:35
→ jaykelly450 joined08:35
→ FH_thecat joined08:35
← apteryx left08:35
→ lucasta joined08:37
→ roadie joined08:38
← jaykelly450 left08:40
← tomboy64 left08:44
→ apteryx joined08:49
→ jaykelly450 joined08:54
← baine left08:55
→ sebag joined08:56
sebag Hi. Why doesn't a merge introduce a graph fork anymore?08:57
→ tomboy64 joined08:57
→ baine joined08:57
← jaykelly450 left08:59
← mirai_ left09:07
→ mirai_ joined09:07
→ jaykelly450 joined09:11
bookworm ?09:11
a merge tends to combine things, not fork them ;)09:12
← baine left09:12
bookworm also, which software / command etc... we don't have our crystal balls back yet09:12
← EvgenyK_ left09:13
→ EvgenyK_ joined09:14
→ sa0 joined09:15
← jaykelly450 left09:16
← rkta left09:17
→ rkta_ joined09:18
→ Kangie_ joined09:18
← lucasta left09:19
→ lucasta joined09:19
← Kangie left09:19
rkta_ → rkta09:20
← roadie left09:20
→ MajorBiscuit joined09:20
→ feriman joined09:21
← lucasta left09:23
→ hamburgler2 joined09:27
← powftw left09:27
← skapata left09:28
→ clime joined09:28
← hamburgler left09:30
→ liminal joined09:30
→ roadie joined09:33
→ lucasta joined09:34
← Betal left09:40
← hamburgler2 left09:43
→ lucasta_ joined09:43
← EvgenyK_ left09:44
Kangie_ → Kangie09:44
← Kangie left09:44
→ jaykelly450 joined09:45
→ Kangie joined09:45
→ Jong joined09:51
← jaykelly450 left09:52
→ roadie` joined09:54
← mirai_ left09:55
→ mirai joined09:56
← roadie left09:56
← roadie` left09:58
→ kkawg joined09:59
→ jaykelly450 joined10:04
← lucasta left10:04
← jaykelly450 left10:12
→ mjt0k joined10:16
mjt0k Hi! What's wrong with git:// urls, why many public services (github, gitlab etc) disabled it? Is it okay to use for read-only (pull-only) access?10:17
→ gurkenglas joined10:18
→ vsynthese joined10:19
← vsynthese left10:20
→ flower_ joined10:23
→ SilentGhost joined10:25
→ vsynthese joined10:25
→ fspax joined10:26
← vsynthese left10:26
← fling left10:26
→ fling joined10:26
→ f_ joined10:27
← stenno left10:28
← mirai left10:29
→ mirai joined10:29
→ EvgenyK_ joined10:30
→ gloomy_desktop joined10:31
→ vsynthese joined10:31
← gloomy left10:31
← vsynthese left10:32
→ stenno joined10:32
sebag bookworm: git merge {local-branch} has been differing from rebase in that it had two parents, introducing 2 paths in graph. it doesn't do this anymore…10:33
bookworm mjt0k: why not just use https?10:34
mjt0k bookworm: on a local server I don't have https which actually works, to begin with10:34
sebag bookworm:ah, no, it does work like previous, it's just that i have been running Tig with graph disabled10:35
← tomboy64 left10:35
bookworm sebag: merge can do fast forwards, which would just be linear. You can force it with --no-ff10:35
← EvgenyK_ left10:35
→ igemnace joined10:36
→ vsynthese joined10:37
→ EvgenyK_ joined10:38
← vsynthese left10:38
→ jaykelly450 joined10:40
← DaTa left10:43
← EvgenyK_ left10:43
→ DaTa joined10:43
→ vsynthese joined10:44
← clime left10:44
← vsynthese left10:45
← jaykelly450 left10:45
← DaTa left10:47
→ YuGiOhJCJ joined10:48
→ tomboy64 joined10:48
→ nyah joined10:49
→ vsynthese joined10:50
gsi there's nothing wrong with git:// URLs, when they are used for the purpose which they were made for (anonymous read only access)10:51
← vsynthese left10:51
gsi disabling them is just a matter of being fancy, not finding them hip enough in web based minds10:51
← Sulky_ left10:52
→ fuzzybear396597 joined10:55
bookworm assuming you have an encrypted transport layer... else it's just stupid considering that you have no auth and no integrity10:56
→ vsynthese joined10:56
bookworm or in other words, no, it's not just the "web based minds"10:57
← vsynthese left10:57
gsi "no auth" is one of the points of using a git:// URL10:59
encryption with SSL and/or VPN transparently combines with git:// URLs if you want them11:00
in a strictly local setup you may neither need them nor want them (not everything is a PC)11:00
bookworm authentication, not authorization11:00
gsi which leaves you with the "bytes stream" capabilities of TCP, and the integrity which is part of git itself11:01
bookworm in a strictly local setup, why are you even using the git protocol, just push to the folder ;)11:01
gsi and you can always check hashes by other means (and you should if you feel paranoid, regardless of https)11:01
the point of my response is: there is a place for git:// URLs, they were made for a purpose, and a blank "don't use these, they are baaad" is ... strange11:02
→ CoolerX joined11:02
bookworm you can shoehorn git over an encrypted tunnel, but then you might as well just use the encrypted protocols directly, which is the point. There's no benefit to use the git protocol11:02
CoolerX Hi11:02
How do I show the diff for a single file between 2 commits?11:02
between 2 tags11:02
→ vsynthese joined11:02
bookworm git diff a b -- file11:03
CoolerX https://stackoverflow.com/questions/3338126/how-do-i-diff-the-same-file-between-two-different-commits-on-the-same-branch11:03
bookworm: Thanks11:03
a and b are the hashes?11:03
bookworm anything that identifies a commit11:03
branches, tags, commtis, @ ...11:03
← vsynthese left11:04
bookworm "refspec" is the fancy term iirc11:04
gsi man git-diff refers the them as commit, other docs may use the term commit-ish11:04
gitinfo the git-diff manpage is available at https://gitirc.eu/git-diff.html11:04
bookworm GITREVISIONS(7) has the details11:05
→ Suchiman joined11:06
← gurkenglas left11:08
→ vsynthese joined11:09
CoolerX in ruby what is #<> ?11:09
→ gurkenglas joined11:10
CoolerX #<Pathname:/aaa/bbb/ccc>11:10
← vsynthese left11:10
CoolerX I am getting that when I try to print a file path11:10
puts filepath.insepct11:10
inspect11:10
bookworm ask in the ruby channel11:11
CoolerX oh XD11:11
Thanks for the help11:11
← CoolerX left11:11
→ jaykelly450 joined11:15
→ vsynthese joined11:16
← vsynthese left11:20
→ robobub joined11:20
← jaykelly450 left11:25
← MajorBiscuit left11:28
← derpydoo left11:28
→ Sulky joined11:29
← feriman left11:32
→ feriman joined11:34
← f_ left11:35
→ carl-- joined11:36
→ gpap joined11:37
← Sulky left11:37
→ Sulky joined11:37
→ jaykelly450 joined11:39
← traph left11:42
→ traph joined11:42
← jaykelly450 left11:44
← dsrt^ left11:48
→ coot joined11:52
← arch-angel left11:53
→ jaykelly450 joined11:55
→ miira9 joined12:01
← rsx left12:04
← jaykelly450 left12:05
→ arch-angel joined12:06
← YuGiOhJCJ left12:06
→ jaykelly450 joined12:07
← jaykelly450 left12:12
→ rsx joined12:17
→ jaykelly450 joined12:17
← arch-angel left12:19
→ jinsun joined12:20
→ iamtheranger joined12:21
→ f_ joined12:21
← jaykelly450 left12:22
← Jong left12:23
→ YuGiOhJCJ joined12:25
← whatsupdoc left12:28
← YuGiOhJCJ left12:28
→ YuGiOhJCJ joined12:29
→ jaykelly450 joined12:34
→ iomari891 joined12:35
← gurkenglas left12:35
← flower_ left12:37
← jaykelly450 left12:40
→ epicout joined12:41
← lucasta_ left12:43
→ Xeroine joined12:46
← coot left12:46
→ mirai_ joined12:48
← mirai left12:48
mirai_ → mirai12:48
→ duxsco joined12:51
← YuGiOhJCJ left12:55
→ lucasta joined12:55
→ YuGiOhJCJ joined12:55
→ trafficjam joined12:56
← trafficjam left12:56
→ mexen joined12:57
← iomari891 left12:58
→ Sulky_ joined13:02
→ flower_ joined13:03
← YuGiOhJCJ left13:04
← Sulky left13:05
→ jaykelly450 joined13:06
← Sulky_ left13:06
→ Sulky_ joined13:07
← cambrian_invader left13:10
← jaykelly450 left13:10
→ roadie joined13:14
← dansan left13:15
← fuzzybear396597 left13:19
← duxsco left13:23
→ cambrian_invader joined13:24
→ jaykelly450 joined13:24
→ Fischmiep joined13:30
← flower_ left13:30
← Fischmiep left13:30
→ MajorBiscuit joined13:31
← jaykelly450 left13:32
→ Fischmiep joined13:32
→ jaykelly450 joined13:33
← fspax left13:34
→ fspax joined13:37
← jaykelly450 left13:38
← taupiqueur left13:41
→ jaykelly450 joined13:42
← jaykelly450 left13:46
→ jaykelly450 joined13:48
← miira9 left13:49
← MajorBiscuit left13:51
→ MajorBiscuit joined13:51
← MajorBiscuit left13:55
→ DaTa joined13:55
← carl-- left13:56
← momomo left13:57
← DaTa left13:58
→ DaTa joined13:59
→ MajorBiscuit joined14:02
→ Major_Biscuit joined14:03
← MajorBiscuit left14:03
→ momomo joined14:05
← Lord_of_Life left14:05
→ Lord_of_Life_ joined14:05
Lord_of_Life_ → Lord_of_Life14:08
← roadie left14:09
→ rurtty joined14:11
→ flower_ joined14:28
← Major_Biscuit left14:38
← flower_ left14:41
← eqw left14:46
→ eqw joined14:46
→ TomyLobo joined14:50
→ Major_Biscuit joined14:50
← liminal left14:52
→ roadie joined14:52
← Xeroine left14:55
→ m0viefreak joined14:57
→ warmana joined15:03
→ giu- joined15:06
← fspax left15:11
→ traph_ joined15:11
← eroux left15:13
← traph left15:14
← traph_ left15:15
→ traph_ joined15:15
→ eroux joined15:17
→ navi joined15:21
← sickdyd left15:22
← iamtheranger left15:26
→ Jong joined15:28
← rurtty left15:28
← Major_Biscuit left15:29
← traph_ left15:31
→ iomari891 joined15:33
→ Major_Biscuit joined15:34
→ bywaterloo joined15:35
→ ThorMojito joined15:38
← ThorMojito left15:41
→ dansan joined15:51
← Major_Biscuit left15:54
← giu- left15:58
← mirai left16:08
→ mirai joined16:08
← feriman left16:12
← mirai left16:14
→ ThorMojito joined16:16
→ shokohsc66 joined16:17
→ feriman joined16:17
← f_ left16:18
← shokohsc6 left16:18
shokohsc66 → shokohsc616:18
← FH_thecat left16:20
→ f_ joined16:20
← lucasta left16:22
← rsx left16:25
→ lucasta joined16:28
← shokohsc6 left16:28
→ Major_Biscuit joined16:34
← ThorMojito left16:38
→ FH_thecat joined16:40
→ shokohsc6 joined16:42
← f451 left16:51
← Vonter left16:58
← f_ left16:58
→ Vonter joined17:00
→ f_ joined17:00
← Oblomov left17:06
← momomo left17:09
← cdleonard left17:10
→ thiago joined17:11
→ cdleonard joined17:11
→ mirai joined17:21
← sebag left17:23
← mirai left17:31
→ mirai joined17:33
→ flower_ joined17:35
→ carl-- joined17:39
→ baine joined17:40
← Echoz left17:43
← Major_Biscuit left17:51
← Jong left17:52
← f_ left18:01
→ rurtty joined18:01
← mohit left18:03
→ mohit joined18:03
→ EvgenyK_ joined18:06
← EvgenyK_ left18:11
← xandris left18:13
→ Oblomov joined18:13
→ xandris joined18:15
→ EvgenyK_ joined18:15
← eroux left18:29
← EvgenyK_ left18:31
→ SJrX joined18:33
→ EvgenyK_ joined18:33
→ eroux joined18:33
← lucasta left18:36
← EvgenyK_ left18:38
→ Betal joined18:39
→ Echoz joined18:45
→ duxsco joined18:48
→ EvgenyK_ joined19:00
→ ThorMojito joined19:02
← ThorMojito left19:02
← EvgenyK_ left19:05
→ forgotmynick joined19:05
← dansan left19:12
→ finn_elija joined19:15
← FinnElija left19:15
finn_elija → FinnElija19:15
→ moldorcoder7 joined19:16
→ ThorMojito joined19:19
← ThorMojito left19:19
← Echoz left19:20
← carl-- left19:21
→ Echoz joined19:21
→ lgc joined19:24
← lgc left19:25
→ derpydoo joined19:28
← epicout left19:31
→ skapata joined19:34
→ irc_user joined19:34
← ghost43_ left19:36
→ ghost43 joined19:37
irc_user Hi, I have a master branch and a feature branch, and on master I did one large formatting commit that removed only extra whitespace, and on the feature branch there are actual code changes in some of the same files. I want to merge master into the feature branch but there are many conflicts. Is there a standard way to deal with this?19:37
My first idea is to create a temp branch before the formatting commit, merge that branch, then move the branch to the formatting commit, merge that with -Xours, then merge master.19:37
→ fflam joined19:39
→ mven5 joined19:42
← mven left19:44
mven5 → mven19:44
→ Maxattax joined19:47
← FinnElija left19:47
→ FinnElija joined19:47
← baine left19:48
→ baine joined19:50
← mexen left19:53
→ finn_elija joined19:56
← FinnElija left19:56
finn_elija → FinnElija19:56
← fflam left19:56
→ shored1 joined19:56
→ taupiqueur joined19:56
→ fflam joined19:58
← shored left19:58
→ alexherbo2 joined19:59
← igemnace left20:01
→ ferdna joined20:08
← fflam left20:10
← baine left20:10
← eqw left20:10
← Lord_of_Life left20:10
← farzat left20:10
← bgs left20:10
← Murr left20:10
← gsi left20:10
← krushia left20:10
← HelloShitty left20:10
← foul_owl left20:10
← mei left20:10
← wavesong left20:10
← mgedmin left20:10
← xcm left20:10
← bindu left20:10
← zulutango left20:10
← astlep5504 left20:10
← mika left20:10
← kgz left20:10
← samuelb left20:10
← din0 left20:10
← Unode left20:10
← tmz left20:10
← hqdruxn08 left20:10
← Vaelatern left20:10
← m5zs7k left20:10
← dharrigan left20:10
← Ranhir left20:10
← Lunatrius left20:10
← BlessJah left20:10
← auri left20:10
← wagle left20:10
← Anu left20:10
← npcomp left20:10
← Raclenyan left20:10
← ikonia left20:10
← nochi left20:10
← Maxattax97 left20:10
← waterkip left20:10
← sword_smith left20:10
← rektide_ left20:10
← Gamah left20:10
← kandinski left20:10
← nedbat left20:10
← dminuoso_ left20:10
← xcpep left20:10
← tomek_ left20:10
← rapha left20:10
← ghoti left20:10
← ario left20:10
← cmn left20:10
← Archer left20:10
← bubba left20:10
← mjh4386 left20:10
← surfist1 left20:10
← njt left20:10
← gustik left20:10
← ZeroDamage left20:10
← B4ckBOne left20:10
← scottg489 left20:10
← qsx left20:10
← fingercomp left20:10
← Albright left20:10
← gef left20:10
← DoubleJ left20:10
← iokill left20:10
← Foxboron left20:10
← teear left20:10
← tonitch left20:10
← gordonfish left20:10
← Norkle left20:10
Dotz0cat_ → Dotz0cat20:10
→ clime joined20:10
→ ThorMojito joined20:10
← ThorMojito left20:11
warthog9 → 020AAPQ8E20:11
→ fflam joined20:11
→ baine joined20:11
→ eqw joined20:11
→ farzat joined20:11
→ Murr joined20:11
→ gsi joined20:11
→ krushia joined20:11
→ HelloShitty joined20:11
→ foul_owl joined20:11
→ wavesong joined20:11
→ mgedmin joined20:11
→ zulutango joined20:11
→ rapha joined20:11
→ mika joined20:11
→ kgz joined20:11
→ samuelb joined20:11
→ din0 joined20:11
→ Unode joined20:11
→ tmz joined20:11
→ Vaelatern joined20:11
→ dminuoso_ joined20:11
→ dharrigan joined20:11
→ Ranhir joined20:11
→ Lunatrius joined20:11
→ BlessJah joined20:11
→ wagle joined20:11
→ Anu joined20:11
→ npcomp joined20:11
→ ikonia joined20:11
→ Raclenyan joined20:11
→ nochi joined20:11
→ Maxattax97 joined20:11
→ waterkip joined20:11
→ sword_smith joined20:11
→ rektide_ joined20:11
→ Gamah joined20:11
→ kandinski joined20:11
→ nedbat joined20:11
→ xcpep joined20:11
→ tomek_ joined20:11
→ ghoti joined20:11
→ ario joined20:11
→ cmn joined20:11
→ Archer joined20:11
→ bubba joined20:11
→ mjh4386 joined20:11
→ surfist1 joined20:11
→ njt joined20:11
→ gustik joined20:11
→ ZeroDamage joined20:11
→ B4ckBOne joined20:11
→ scottg489 joined20:11
→ qsx joined20:11
→ fingercomp joined20:11
→ Albright joined20:11
→ gef joined20:11
→ DoubleJ joined20:11
→ iokill joined20:11
→ Foxboron joined20:11
→ teear joined20:11
→ tonitch joined20:11
→ Norkle joined20:11
→ gordonfish joined20:11
→ xcm joined20:11
→ auri joined20:11
→ bgs joined20:11
→ m5zs7k joined20:11
→ hqdruxn08 joined20:11
→ bindu joined20:11
→ astlep5504 joined20:11
← WilhelmII left20:12
quesker → quesker_20:12
→ pikapika joined20:12
← Lunatrius left20:12
← mjh4386 left20:12
← ikonia left20:12
← tonitch left20:12
← qsx left20:12
← eqw left20:12
← kgz left20:12
← din0 left20:12
← mgedmin left20:12
← njt left20:12
← farzat left20:12
← Archer left20:12
← ZeroDamage left20:12
← scottg489 left20:12
← dminuoso_ left20:12
← gordonfish left20:12
← samuelb left20:12
→ qsx joined20:12
→ ZeroDamage joined20:12
→ scottg489 joined20:12
→ eqw joined20:12
→ njt joined20:13
→ gordonfish joined20:13
→ ikonia joined20:13
→ tonitch joined20:13
quesker_ → quesker20:13
→ farzat joined20:13
→ kgz joined20:13
→ dminuoso joined20:13
020AAPQ8E → warthog920:13
→ mei joined20:13
→ din0 joined20:13
← din0 left20:13
→ din0 joined20:13
→ mgedmin joined20:13
→ mjh4386 joined20:14
→ Lord_of_Life joined20:14
← mikemoerk left20:14
→ Lunatrius joined20:14
→ rein-er joined20:14
→ mikemoerk joined20:14
→ samuelbernardo joined20:15
← pikapika left20:16
→ pikapika joined20:17
← dmvrtx left20:17
→ EvgenyK_ joined20:17
→ dmvrtx joined20:19
→ mirai_ joined20:20
ikke irc_user: try merge -X ignore-space-change20:20
→ shabius joined20:21
← gxt__ left20:21
← mirai left20:22
← EvgenyK_ left20:24
→ Major_Biscuit joined20:27
→ dansan joined20:28
← flower_ left20:29
← mirai_ left20:29
← shabius left20:30
← iomari891 left20:34
→ gurkenglas joined20:38
→ gxt__ joined20:39
→ iomari891 joined20:44
← Major_Biscuit left20:45
← Fischmiep left20:45
irc_user ikke: That worked great, thank you. I'm also confused about git revert. There was an attempted merge in the feature branch which was reverted with `git revert`. It looks like if I do `git merge master` on the most recent commit (the revert), it just prefers the feature branch changes, but if I hard reset to pre-merge, there are conflicts, even though if I diff the revert commit and the pre-merge commit, there is no output.20:46
→ EvgenyK_ joined20:47
→ Fischmiep joined20:48
irc_user does having the affected lines present in the feature branch change how git processes the merge or something?20:48
ikke things like revert and merge are sensitive to the context20:49
so if the context changes, you can also get conflicts20:49
← EvgenyK_ left20:52
← zer0bitz left20:52
→ EvgenyK_ joined20:54
irc_user ikke: Ah, thank you. Is there anywhere I could read more about that specifically?20:54
→ coot joined20:56
→ zer0bitz joined20:57
← EvgenyK_ left20:58
irc_user I guess it's high time I just read the entire merge man page, hopefully that will mention the contexts :P21:00
← travisghansen left21:01
→ EvgenyK_ joined21:01
→ travisghansen joined21:02
← ___nick___ left21:04
→ flower_ joined21:06
← EvgenyK_ left21:06
→ mirai_ joined21:07
← mirai_ left21:13
→ mirai_ joined21:14
← forgotmynick left21:15
← coot left21:19
→ szkl joined21:21
→ Inline joined21:24
→ EvgenyK_ joined21:28
→ felipec joined21:28
← EvgenyK_ left21:32
→ EvgenyK_ joined21:34
← c0dehu1k left21:37
→ ThorMojito joined21:37
← theoceaniscool left21:38
→ dsrt^ joined21:39
← bywaterloo left21:39
← duxsco left21:39
← cbreak left21:41
→ karabaja4 joined21:42
→ cbreak joined21:43
← kkawg left21:43
skered How complicated would it be to have a list of all files that were once in the repo but are not longer there?21:46
← EvgenyK_ left21:46
ikke Probably using git diff with --diff-filter=D21:48
← ThorMojito left21:55
skered git diff-tree --diff-filter=DR start end kinda works.21:58
← baine left21:58
skered But using the init commit returns nothing which I don't think is the case.21:58
→ coot joined21:59
→ baine joined22:00
skered The real issue here is I symlink dotfiles from ~/repos/dotfiles. I have no issue creating them but cleaning them is a by hand thing. I could travel all of ~/ looking for broken links but I'd rather not.22:00
I'm sure I could mindpeth maxdepth to limit it but... it seems that git should be able to help me here.22:01
→ EvgenyK_ joined22:03
irc_user ikke: Just read the git merge man page. There was mention of "if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result" but I'm not sure if that has to do with this situation. In fact it says "It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits." which would seem to be context-less?22:07
← EvgenyK_ left22:08
→ Jong joined22:08
irc_user skered: Not sure it'd address your current issue, but I've been managing dotfiles with a bare repo and it works great.22:08
← bgs left22:16
← roadie left22:19
← jaykelly450 left22:19
→ jaykelly450 joined22:23
mirai_ → mirai22:24
← jaykelly450 left22:28
→ roadie joined22:29
← flower_ left22:31
← roadie left22:33
skered It seems git diff and I'd guess diff-tree don't work between merges which might explain why I don't get anything from start to end.22:34
← Inline left22:34
→ Inline joined22:35
← Inline left22:36
skered Looks like limiting find is fast so I'll forget the git side of it.22:36
→ Inline joined22:36
→ jaykelly450 joined22:38
← xx left22:39
← coot left22:40
→ roadie joined22:46
← iomari891 left22:46
← jacobk left22:48
→ iomari891 joined22:49
← roadie left22:51
← jaykelly450 left22:51
→ ThorMojito joined22:54
← omethe left22:57
← chemsmith left23:01
→ liminal joined23:01
→ jaykelly450 joined23:02
← gvg left23:04
→ roadie joined23:05
← iomari891 left23:06
← jaykelly450 left23:07
→ jaykelly450 joined23:08
→ finn_elija joined23:09
← FinnElija left23:09
finn_elija → FinnElija23:09
← gxt__ left23:10
→ gxt__ joined23:11
← crabbedhaloablut left23:11
→ crabbedhaloablut joined23:13
← jaykelly450 left23:13
→ jaykelly450 joined23:15
← roadie left23:16
← jaykelly450 left23:20
← mirai left23:21
→ mrcsno joined23:25
→ Xeroine joined23:25
← ThorMojito left23:25
→ mirai joined23:26
→ jaykelly450 joined23:29
← Maxattax left23:36
← Disconsented left23:37
← irrgit_ left23:39
→ irrgit_ joined23:41
← OnkelTem left23:41
→ karx joined23:42
← karx left23:42
→ roadie joined23:42
← karabaja4 left23:43
→ airplanemodes joined23:44
→ Disconsented joined23:50
← nyah left23:50
← Jong left23:52
← roadie left23:54
← Suchiman left23:56
← m0viefreak left23:57

Logs Search ←Prev date Next date→ Channels Documentation