IRCloggy #git 2022-09-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.

2022-09-29

← arch_angel left00:00
← dionysus69 left00:05
→ _apex2_ joined00:16
← clime left00:16
→ mthall joined00:19
← fling left00:20
→ fling joined00:21
← thiago left00:23
→ thiago joined00:24
→ softirq joined00:24
← mthall left00:24
→ mthall joined00:26
← xx left00:28
→ rashkov joined00:35
→ bket joined00:36
← loulou left00:43
← gildasio left00:47
→ gildasio joined00:48
← softirq left00:49
← nyah left00:51
→ softirq joined00:51
← softirq left00:51
← derpydoo left00:54
→ softirq joined00:54
← softirq left00:59
→ softirq joined01:00
← gsi left01:02
← softirq left01:02
→ gsi joined01:03
← nighterrors left01:05
→ nighterrors joined01:07
← vaaleyard left01:12
→ vaaleyard joined01:13
← madewokherd left01:18
← sudoforge left01:20
→ wallabra_ joined01:21
→ KlungelSmurf9208 joined01:22
→ sudoforge joined01:23
← wallabra left01:23
wallabra_ → wallabra01:23
→ lucasta joined01:25
→ transhumanist joined01:25
→ cdown joined01:26
→ transhumanist_ joined01:27
← _apex2_ left01:29
→ zumba_addict joined01:32
→ _apex2_ joined01:32
← gustik left01:33
← zebrag left01:34
← Sasazuka__ left01:35
← nighterrors left01:36
← _apex2_ left01:37
→ nighterrors joined01:38
→ loulou joined01:41
← loulou left01:41
→ loulou joined01:41
← lucasta left01:41
← cdown left01:50
→ furrymcg1e joined01:57
← R2robot left01:57
← bn_work left01:58
→ R2robot joined02:00
← furrymcgee left02:00
← derfflinger__ left02:04
→ _apex2_ joined02:08
→ derfflinger__ joined02:11
← _apex2_ left02:13
smol-hors I have a repo and want to setup a remote on the same filesystem, I tried push -u blah main, but it said "(path) does not appear to be a git repository" ... how do I make it one?02:19
← TomyLobo left02:22
→ softirq joined02:22
← softirq left02:22
→ journeyman joined02:24
mackerman smol-hors: git init02:26
smol-hors ah, and then push to that02:27
thanks02:27
mackerman Or going the other way, git clone I suppose02:27
← squirrel left02:27
smol-hors clone would set the remotes remote to the not remote02:28
mackerman Note that on the same file system, git will use hard links, and the objects won't actually be seperate files02:28
smol-hors but I could remove said remote02:28
yeah, I'm on a publix with a ~/public_repos02:28
→ madewokherd joined02:33
← gildasio left02:34
→ gildasio joined02:36
→ hbautista joined02:36
→ softirq joined02:37
→ nullref joined02:38
← hexadecagram left02:39
nullref Hi all, can someone please help me understand what "SP" and "LF" are in this line: "sha1-old SP sha1-new SP refname LF"02:40
found here: https://git-scm.com/docs/git-receive-pack02:40
→ off^ joined02:40
→ terrorjack joined02:43
mackerman Space and line feed02:44
← rashkov left02:44
→ _apex2_ joined02:45
← keypusher left02:45
→ keypusher joined02:46
nullref thanks mackerman! If eel a bit silly, seems obvious in retrospect. Do you know where I can find a list of similar abbreviations (or what to search for to find them).02:46
← jetchisel left02:47
→ nate3 joined02:48
← _apex2_ left02:49
→ jetchisel joined02:50
← fling left02:51
→ fling joined02:54
← loulou left02:54
→ elastic_dog joined02:59
→ hexadecagram joined02:59
← nullref left03:00
← LuKaRo left03:04
mackerman https://en.wikipedia.org/wiki/Newline03:06
Absent knowing it is a line delimited record format, could look up the implementation code of some example hooks03:06
→ gxt joined03:07
← softirq left03:23
→ softirq joined03:24
← softirq left03:26
→ junebug joined03:29
← gast0n left03:37
← k1773 left03:38
→ gast0n joined03:39
← nate3 left03:41
→ LuKaRo joined03:47
← gast0n left03:50
← vaaleyard left03:51
→ vaaleyard joined03:52
← relight left03:56
← tachoknight left04:04
→ LuxuryMode joined04:04
← fling left04:05
← barometz left04:06
→ barometz joined04:06
← dmc left04:09
← hamburgler left04:10
→ dmc joined04:11
← junebug left04:17
← dmc left04:17
→ junebug joined04:17
← bloody left04:20
→ fling joined04:22
← junebug left04:22
→ nate3 joined04:23
← nate3 left04:28
← gxt left04:29
→ dmc joined04:29
← journeyman left04:32
→ gxt joined04:33
→ YuGiOhJCJ joined04:40
← thiago left04:41
→ roadie joined04:42
→ onizu joined04:43
→ _apex2_ joined04:45
← _apex2_ left04:50
→ powftw joined05:06
← jimklimov left05:07
← Ram-Z left05:10
← YuGiOhJCJ left05:12
→ YuGiOhJCJ joined05:13
← fling left05:19
→ Jong joined05:19
Jong "in which" v "where" for git comments?05:19
→ fling joined05:20
Jong supposedly "where" is incorrect in the sentence "Add test case where the batch size evenly divides the dataset."05:20
→ maret joined05:22
← fling left05:25
→ fling joined05:28
ikke Jong: sounds fine to me05:30
or 'for when'05:31
← fling left05:31
→ fling joined05:32
Jong "Test when the batch size evenly divides the dataset." like that?05:34
ikke Sure05:34
← gxt left05:35
→ coot joined05:36
→ gxt joined05:37
← YuGiOhJCJ left05:37
→ YuGiOhJCJ joined05:38
→ vyryls joined05:40
← fling left05:44
→ manin891 joined05:49
→ reset joined05:51
→ madewokherd` joined05:51
← madewokherd left05:53
← jazzy left05:55
← hbautista left05:57
← magic_ninja left06:01
← epony left06:05
← howdoi left06:06
→ dvanloon95 joined06:08
→ igemnace joined06:10
← dvanloon9 left06:10
dvanloon95 → dvanloon906:10
← roadie left06:14
→ roadie joined06:14
→ magic_ninja joined06:15
← roadie left06:19
→ jimklimov joined06:21
→ peirik_ joined06:26
→ fling joined06:29
→ rfuentess joined06:30
→ epony joined06:30
→ hamburgler joined06:32
← Betal left06:34
← sudoforge left06:35
← fling left06:35
← peirik_ left06:36
→ fling joined06:36
← vyryls left06:38
→ lkor joined06:39
→ otisolsen70 joined06:39
→ nate3 joined06:39
→ csm3105 joined06:40
← otisolsen70 left06:40
→ mic4ael joined06:41
← hamburgler left06:41
→ otisolsen70 joined06:42
→ peirik_ joined06:43
← nate3 left06:44
→ roadie joined06:45
→ belsirk joined06:46
← otisolsen70 left06:46
→ mncheck joined06:46
→ _apex2_ joined06:47
→ carl- joined06:47
← rfuentess left06:48
→ benonline joined06:49
→ moldorcoder7 joined06:50
← _apex2_ left06:52
belsirk → rfuentess06:52
← fling left06:55
← roadie left06:55
→ fling joined06:56
← peirik_ left06:57
← LuxuryMode left06:58
→ zeenk joined06:59
→ peirik_ joined07:00
← peirik_ left07:08
→ valeyard joined07:09
← mat001 left07:10
← vaaleyard left07:11
← valeyard left07:13
→ theoceaniscool joined07:16
← dermoth left07:26
← m5zs7k left07:28
→ peirik_ joined07:30
→ m5zs7k joined07:33
← ackyshake left07:35
← gryffus left07:36
→ dermoth joined07:39
→ gryffus joined07:39
→ roadie joined07:41
→ dionysus69 joined07:44
→ Stooge joined07:44
← dionysus69 left07:48
→ dionysus69 joined07:48
← fling left07:48
→ peirik__ joined07:50
← peirik_ left07:50
→ fling joined07:51
← roadie left07:54
→ kurahaupo_ joined07:56
→ iomari891 joined07:57
→ MajorBiscuit joined07:58
← kurahaupo left07:59
→ leon_ joined08:00
← leon_ left08:00
→ leon_ joined08:01
→ reprazent joined08:03
← leon_ left08:04
→ aidalgol joined08:05
→ leon joined08:05
← dionysus69 left08:07
→ dionysus69 joined08:08
→ feriman joined08:08
← leon left08:08
→ leon joined08:09
→ atrigent joined08:10
→ cdown joined08:10
← dionysus69 left08:12
→ TomyWork joined08:12
→ dionysus69 joined08:13
← nighterrors left08:14
← fling left08:15
→ fling joined08:19
→ roadie joined08:21
← dionysus69 left08:27
→ dionysus70 joined08:27
dionysus70 → dionysus6908:30
→ mobidrop joined08:30
← skapata left08:31
← roadie left08:33
← csm3105 left08:35
→ csm3105 joined08:35
→ reprazent_ joined08:35
← reprazent left08:35
→ leftyfb joined08:40
← dionysus69 left08:44
→ dionysus69 joined08:44
← dionysus69 left08:47
→ _apex2_ joined08:47
→ dionysus69 joined08:48
← _apex2_ left08:52
← igemnace left08:54
← peirik__ left08:55
← dionysus69 left08:56
→ dionysus69 joined08:56
← atrigent left09:05
→ philipp64 joined09:07
→ peirik__ joined09:10
→ Ram-Z joined09:11
→ luffy joined09:11
← luffy left09:13
← inversed left09:14
→ igemnace joined09:14
→ luffy joined09:14
← luffy left09:15
← dionysus69 left09:16
→ dionysus70 joined09:16
dionysus70 → dionysus6909:18
→ zeroes joined09:19
zeroes is there a fast way to match the branch you can checkout in git? My branch name are pretty long.09:20
→ rosco joined09:21
zeroes something similar to this command: git checkout '*feature101'09:22
→ inversed joined09:22
← peirik__ left09:23
zeroes ofcourse wildcard not working in git checkout, but work in git diff ^^;09:23
*work in git add09:23
← reprazent_ left09:26
→ reprazent joined09:27
← onizu left09:27
rkta zeroes: Why don't you just rename the branch? Also depending on your shell, you may enable completion for branch names09:29
zeroes just following a standard <mode>/<developer name>/<component name>/...../<feature name>09:31
→ nate3 joined09:32
rkta zeroes: use a short name locally, set the upstream to the name following the convention09:32
→ rsx joined09:32
→ vyryls joined09:34
← nate3 left09:37
zeroes oh, I see, will get prettier list from git-branch. using PowerShell at the moment. Probably change to Git Bash at some point. Thanks for advicing.09:40
adanwan Is there a way to discard unstaged changes in the same way you can stage/unstage with add -p o reset -p? Something like restore -p or checkout -p I guess?09:42
(in an atomic way that is)09:43
nvm read the manual :P09:44
→ peirik__ joined09:46
→ arch_angel joined09:49
← csm3105 left09:52
→ csm3105 joined09:53
← peirik__ left09:56
← dionysus69 left10:02
→ dionysus69 joined10:02
→ FH_thecat joined10:03
← FH_thecat left10:03
← fling left10:08
← makara left10:09
← makara1 left10:10
← vishal left10:11
← rosco left10:13
→ rosco joined10:13
→ vishal joined10:14
→ fling joined10:16
← vyryls left10:17
← fling left10:20
→ fling joined10:22
→ makara joined10:25
→ makara_ joined10:25
→ peirik__ joined10:26
← nightstrike left10:26
→ tyson2 joined10:27
← fling left10:28
→ FH_thecat joined10:30
← gryffus left10:32
← rosco left10:36
→ peirik_ joined10:37
← peirik__ left10:39
→ rosco joined10:40
→ clime joined10:44
→ _apex2_ joined10:48
→ KnoP joined10:52
← clime left10:52
← _apex2_ left10:53
← rosco left10:54
← KnoP left10:54
→ KnoP joined10:55
→ rurtty joined11:01
→ bambanxx joined11:02
← maret left11:03
→ cloaker joined11:05
← peirik_ left11:12
→ nyah joined11:14
← KnoP left11:14
← dionysus69 left11:16
← eroux left11:19
→ gryffus joined11:19
kurahaupo_ → kurahaupo11:21
→ maret joined11:22
→ thuna` joined11:22
← terminaldweller left11:28
→ eroux joined11:30
→ KnoP joined11:31
→ terminaldweller joined11:33
→ nate3 joined11:33
← nate3 left11:38
→ clime joined11:42
← epony left11:43
→ gryffus_ joined11:49
← gryffus left11:49
→ vicecea joined11:54
→ antani joined11:55
→ rosco joined11:56
→ hxztnxt joined11:57
→ menace joined12:02
← menace left12:02
→ menace joined12:02
menace → Deknos12:03
← tyson2 left12:04
→ Koeniz joined12:09
→ Anticom joined12:10
→ GNUmoon joined12:14
→ bloody joined12:14
← powftw left12:16
→ rama joined12:17
→ skylize joined12:19
→ dionysus69 joined12:22
← zumba_addict left12:22
→ pulse joined12:22
← eroux left12:23
→ eroux joined12:29
← eroux left12:31
→ jaggz joined12:32
← off^ left12:32
→ hans_ joined12:33
jaggz okay, before I make a mess: I cloned a github repo, then worked on it in 'main'. I didn't fork yet or commit. Now on github I forked their project and want to set my remote (or whatever) to my github fork and commit this to a different branch (let's call it 'newb')12:33
← rama left12:34
ikke git checkout -b newb12:34
git remote set-url origin <fork-url>12:34
jaggz do i need fetch after that?12:35
(before push)12:35
kurahaupo jaggz: If the fork is entirely under your control, no. You can push --force-with-lease if necessary12:36
→ Laplace joined12:36
jaggz thanks12:36
(ugh.. I was just doing a diff and noticed I'd changed a bunch of their files' line endings from DOS to unix)12:37
kurahaupo jaggz: However I suggest that you rebase your newb onto your fork12:37
either it will do nothing, or it will pick up more recent changes in the main repo12:38
ikke If it's a new branch, force pushing would not matter at all12:39
jaggz kurahaupo, after checkout and remote set-url do a rebase to main?12:39
ikke and fetching neither12:39
← thuna` left12:40
kurahaupo I said "if necessary". It shouldn't be, unless the main repo advanced between when you started working at home and when you did the fork on GitHub12:40
jaggz and about the line endings, at this point, where I don't seem to have autocrlf set in my global config...12:41
kurahaupo jaggz: Yeah I likewise have trouble with inadvertently changing dos to Unix12:41
jaggz and I've already modified their files12:41
→ vaaleyard joined12:41
jaggz I'm sure I did it deliberately when first fiddling with their project, but then I got more elaborate, adding different features :}12:43
→ sa0 joined12:43
← vdamewood left12:43
→ thuna` joined12:45
← _sa0sin_ left12:45
← jed left12:45
← thuna` left12:46
→ thuna` joined12:46
→ rama joined12:47
→ zebrag joined12:50
jaggz hrm.. i'm not sure which of these options to use for the repo having crlf and me using lf12:52
foo I think it's reasonable to assume sometimes "git acts dumb" in merging conflicts, correct? I'm looking at a conflict right now and git seems to have removed a decent amount of stuff. I'm using CLI git merge --no-ff --no-commit feature-branch. I don't want to be disrespetful of git (I like it and it's powerful...), but there are times where I find myself checking files *before* a merge so then after the merge, I12:54
can look at the conflicts and understand what used to be there. I believe this is acceptable/to be expected, I simply wanted to run it by someone else. Thanks12:54
mackerman foo: Conflicts by definition means the algorithm was uncertain and wanted a human to look at it12:56
← Deknos left12:57
foo mackerman: is there a way to adjust how conflicts are handled? eg. "remove less code from the conflict than more" ? I'm having to go back to these 2 branches and copy/paste out of there into the conflict. eg. git show branch:file, I'm having to do this and then open up vim in the current branch *before* the commit on a file to copy/paste stuff out. This might be acceptable, simply wanted to make sure I'm going12:59
about this "right"12:59
mackerman A mergetool you like could help12:59
foo mackerman: yeah, I was wondering about that. I'm using git merge --no-ff --no-commit feature/branch in a terminal... is there another terminal based merge tool that is suggested?13:00
osse mergetool is something you invoke after conflicts has happened13:00
ie. after git merge13:00
foo osse: uh, what. I've always just went into the file with vim and looked for >>> === or <<<13:01
mackerman git mergetool --tool-help13:01
→ belsirk joined13:01
osse foo: sure, that works fine for lots of conflicts13:01
foo ohh, ok13:01
haha, I was going to say... I don't think I was *that* far off13:02
Is mergetool advised for more conflict merging issues?13:02
osse mergetool is advised if you're having trouble doing it the simple way13:02
foo osse: thank you, not sure how I missed the memo on this after so many years, heh. *investigaets13:04
osse have you used git difftool ever? it's basically the same thing13:04
← rfuentess left13:04
← arch_angel left13:05
foo osse: negative13:05
git mergetool "This message is displayed because 'merge.tool' is not configured." - heh13:05
selckin a 3way diff tool is a must for resolving conflicts, seeing both sides + merged13:05
→ luckman212_ joined13:05
foo selckin: I have had this happen several times where I'm stumped by the merge and I never know how to resolve it13:06
I literally open the before/after/current in different vim windows.13:06
heh13:06
foo sees opendiff tortoisemerge emerge vimdiff nvimdiff13:06
→ otisolsen70 joined13:06
mackerman You may like vimdiff13:06
→ delay joined13:06
foo I'll try that, thanks mackeran13:07
← luckman212 left13:07
luckman212_ → luckman21213:07
foo mackerman13:07
→ arch_angel joined13:07
→ derpydoo joined13:07
mackerman jaggz: core.eol may be set to crlf13:08
→ _sa0sin_ joined13:08
← csm3105 left13:08
mackerman Er, lf13:09
← coot left13:09
gsi this text conversion -- is there a way to disable it globally in a config item? because (from my POV) it violates the "you get out what you put in", and unexpectedly and surprisingly does13:09
→ tchan joined13:10
gsi could not find a config item when I last looked, hat to register an attributes file with the config, which then does -text13:10
← hxztnxt left13:11
→ hxztnxt joined13:11
gsi I can see how some (or many?) users want automatic conversion, and I can agree that they should be able to enable such an option, but I strongly disagree with data munging being on by default13:11
selckin fairly sure it isn't on by default13:11
← sa0 left13:12
foo falls into vimdiff13:12
foo thanks mackerman13:12
→ loulou joined13:13
← loulou left13:13
→ loulou joined13:13
← Murr left13:13
→ Murr joined13:14
mackerman If eol offends you, you'll hate working-tree-encoding attribute13:14
← luckman212 left13:14
→ luckman212 joined13:15
foo mackerman: eol = end of line?13:15
→ tyson2 joined13:15
→ apathor joined13:16
mackerman Yes, end of line. Related to core.eol configuration item, and eol git attribute13:16
← antani left13:17
gsi so is automatic text conversion on by default, or needs it get enabled first and my getting caught by it was due to a configuration that I used for some time before I noticed that I "did not get out what I put in"?13:18
and I'm not offended by the idea of automatic conversion being available, it just should not be enabled by default while users cannot know13:19
selckin are you on windows13:19
foo selckin: if that was for me, I'm on OS X13:19
gsi I was on the machine where I got caught13:19
→ coot joined13:20
selckin not sure then, i know windows installer asks you turn autocrlf on etc, which is usually the wrong thing (imo)13:20
→ powftw joined13:20
gsi but it should not matter, should it? as long as a content tracking system keeps the very content that it's handed13:20
oh never used "Git for Windows" if that was the question, used git in cygwin13:21
mackerman However users use dumb editors that don't preserve line endings13:21
← luckman212 left13:22
→ luckman212 joined13:23
← delay left13:23
→ delay joined13:24
foo mackerman: thanks, not familiar with eol stuff, not exactly sure I'm following. Unless we're talking about dumb windows ^M stuff?13:25
gsi that ^M is actually CR, and you only see it when the file is inconsistent (mixes LF and CR/LF)13:26
^M only happens to be how vim presents it to you13:26
foo ah, thanks13:27
← Xenguy left13:27
gsi not ending the last line in a text file is another popular bug (especially in DOS based environments)13:28
as is putting useless BOM at the start of files (very popular in Windows)13:29
foo mackerman: watching a youtube video on vimdiff. I don't know how I've went years as a dev not knowing this. thank ya'll.13:29
gsi you may like fugitive then, too13:30
→ csm3105 joined13:32
mackerman Git for Windows has autocrlf by default, I avoided that at install time with /NoAutoCrlf parameter13:32
← loulou left13:35
→ loulou joined13:36
← loulou left13:36
→ loulou joined13:36
gsi had trouble finding a machine where I haven't used git before :) found one with git version 2.25.113:38
have created a text file with DOS end-of-line, committed it, the CR/LF was kept13:38
yet git add kept warning for every text line about "trailing space", will check on more recent git later13:39
→ peirik_ joined13:40
gsi would be good if my suspicion was unfounded, and the "get out what you put in" principle still holds as high as it did in the early days13:40
→ Swahili joined13:42
← dionysus69 left13:42
→ dionysus69 joined13:43
← peirik_ left13:44
→ dnh joined13:44
foo mackerman: how do I know when I need to use vimdiff? My only point of reference in the past is "this conflict looks really odd"13:45
mackerman Personal preference.13:45
← feriman left13:49
← luckman212 left13:50
→ luckman212 joined13:50
← irrgit_ left13:51
← gildasio left13:54
→ lacrymology joined13:57
→ kenanmarasli joined13:59
foo Does anyone in here use vimdiff?13:59
ikke I do from time to time13:59
foo I'm going on 1 hour merging a simple readme file, heh. I think I mostly got it, I'm just a little confused on the top left window. So if I'm in staging branch merging in feature, top middle window is staging file before merge, top right is the file from feature branch, what is the top left window?14:00
ikke With a 3-way merge, there are 3 commits that are relevant14:01
← rama left14:01
→ rama joined14:01
ikke The head of the current branch, the head of the branch being merged in, and the commit that is a common ancestor to both (which git calls a merge base)14:01
→ gildasio joined14:01
← gildasio left14:02
← luckman212 left14:04
→ luckman212_ joined14:04
luckman212_ → luckman21214:05
foo ikke: in vimdiff I see local, base, and remote in filenames. current branch = local, remote = feature branch, base = common ancestor, correct?14:05
← clime left14:05
→ peirik_ joined14:05
← otisolsen70 left14:05
ikke yes14:07
→ gildasio joined14:07
foo Thanks ikke14:08
If vimdiff is my CLI option for more complicated diffs, what's a GUI based option?14:08
that ya'll prefer/are favorites14:08
:)14:08
ikke kdiff314:08
mackerman git mergetool --tool-help14:09
← YuGiOhJCJ left14:09
← rosco left14:09
mackerman Will list all the built in ones.14:10
foo Eek, I got out of vimdiff by doing :q on all windows... and now I have a bunch of _BASE_, _LOCAL_ and _REMOTE_ files in my repo14:10
kurahaupo foo: Yes I use vimdiff quite a bit14:10
foo mackerman: thanks. :)14:10
kurahaupo: thanks :) I'd like to use that, curious to try a gui version here. I do all stuff in vim14:10
kurahaupo foo: what does git status say?14:11
foo kurahaupo: I did git merge --abort to "start off"14:12
start over14:12
foo install kdiff314:12
kurahaupo ok14:12
so git status will be telling you about a bunch of "new" files?14:12
you can fairly safely delete them if you really want to start over14:13
foo kurahaupo: ok, thanks - I did. Still wrapping my head around this14:13
Considering this conflict is a readme file, I think it's a great one to experiment on14:14
selckin kdiff is my fav14:14
foo oh, apple. "kdiff3” can’t be opened because Apple cannot check it for malicious software.14:14
foo googles14:14
→ hbautista joined14:15
kurahaupo foo: if I get lots of merge conflicts, I find it's useful to separate out, "formatting" and "semantic" changes into separate commits, so that a simply git diff -w will tell you if you have anything besides whitespace changes14:16
foo Ok, got it. Total conflicts 42, total unresolved 1. The issue is the auto resolving is inaccurate, ok. This is a different view.14:17
← maret left14:17
foo kurahaupo: thanks! I use git diff -b a lot (which I believe is similar), but that's mostly for diffs. I haven't thought about that with merging conflicts yet14:18
kurahaupo formatting changes are often a source of large merge conflicts, which make it hard to be sure that you've cleaned up correctly14:19
You can always squash them later, once you're sure they're correct14:19
→ thiago joined14:19
kurahaupo yeah git diff -b & -w are similar14:20
← mobidrop left14:28
← gildasio left14:28
→ gildasio joined14:29
← kurahaupo left14:30
→ kurahaupo joined14:30
→ kurahaupo_ joined14:32
← kurahaupo left14:32
→ _apex2_ joined14:34
← luckman212 left14:37
→ luckman212 joined14:38
← _apex2_ left14:39
→ vitali64 joined14:44
→ sudoforge joined14:45
← peirik_ left14:45
← carl- left14:46
← dionysus69 left14:47
← KnoP left14:47
← tyson2 left14:49
← vaaleyard left14:52
← rama left14:53
→ rama joined14:53
→ dante-as joined14:53
→ vaaleyard joined14:54
→ tyson2 joined14:55
← very_sneaky left14:57
← vaaleyard left15:01
→ jazzy joined15:01
← csm3105 left15:04
← Anticom left15:05
→ very_sneaky joined15:10
← LogicAside left15:10
← hans_ left15:12
→ tachoknight joined15:13
← bambanxx left15:13
← Murr left15:13
→ Murr joined15:13
← sudoforge left15:14
→ vaaleyard joined15:17
← tyson2 left15:17
kurahaupo_ → kurahaupo15:19
← vaaleyard left15:21
→ peirik_ joined15:22
← nvmd left15:22
→ funhouse joined15:23
→ xandris joined15:23
← FinnElija left15:23
← belsirk left15:25
→ FinnElija joined15:26
→ madewokherd joined15:29
→ KnoP joined15:30
← cloaker left15:30
→ lucasta joined15:31
← madewokherd` left15:32
→ vaaleyard joined15:33
→ nate3 joined15:34
→ B-| joined15:37
→ rosco joined15:37
B-| hey, how do i unset upstream branches automatically on git fetch?15:37
← vaaleyard left15:38
thiago unset?15:39
I've never heard of "setting" branches, upstream or not15:39
← nate3 left15:39
→ LogicAside joined15:40
B-| Your branch is based on xxx, but the upstream is gone.15:41
(use "git branch --unset-upstream" to fixup)15:41
← KnoP left15:42
← leon left15:42
thiago ok, I'd never seen that message15:42
but yes, "setting upstream" makes sense15:43
if there's an option for that, it's listed in man git-config15:43
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html15:43
thiago I doubt there is15:43
→ leon joined15:43
← rurtty left15:44
→ vaaleyard joined15:50
→ bambanxx joined15:52
→ mcon joined15:53
← rama left15:54
← vaaleyard left15:55
← ghost43 left15:55
→ R2robot_ joined15:55
→ ghost43 joined15:58
← thuna` left15:59
→ rama joined15:59
← R2robot left15:59
mcon What is the spell to have "git log" to list only commits directly affecting a certain branch disregarding those leading to it? I mean: If I have several commits done on several different feature branches and I merge "finished" work on master I would like to list just the commits where feature branch is actually merged back to master, not creation of feature branches, work on them, possible inter-branch merges, etc. is this possible?15:59
thiago yes, git log otherbranch..16:00
or a more complex like: git log branch --not a b c16:00
← leon left16:01
mcon thiago: wouldn't that list just commits from "otherbranch" to master (or whatever I have currently checked out)? I want branches from everywhere to master.16:03
mackerman git log feature...master16:03
thiago including the .. at the end16:03
A..B is everything in B except what's in A16:03
A.. is the same as A..HEAD16:03
→ leon joined16:04
mackerman A...B is A or B, but not any of their merge bases16:05
← igemnace left16:05
→ wallabra_ joined16:05
mcon mackerman: It's unclear to me (I will do a bit of testing ASAP) I don't want just merges from featureA to master, but also featureB, featureC, hotfixA, ... to master16:07
→ feriman joined16:08
← wallabra left16:08
wallabra_ → wallabra16:08
mackerman Ah, I intepreted "a certain branch" to mean one branch.16:08
→ Rashad joined16:09
← lucasta left16:09
→ m0viefreak joined16:10
mcon mackerman: no, that's the easy case ;) I actually need something like "git log ..master", butIdon't think that's a valid syntax :(16:10
← B-| left16:11
mackerman git branch --merged master | xargs git log16:11
← Visne left16:12
mackerman Only works on existing branches.16:12
← Jenna16bit left16:12
mcon mackerman: I'll try it soon ;)16:13
→ epony joined16:13
mackerman Hmm, that's not a plumbing comand, formatting might cause problems16:14
Also it includes the ref passed to it, master in this case16:14
→ B-| joined16:15
← jab416171 left16:16
→ Visne joined16:16
mackerman git branch --format '%(refname)' --merged master | xargs git log16:18
→ thuna` joined16:19
← FH_thecat left16:19
→ jab416171 joined16:20
← jaggz left16:22
← madewokherd left16:22
→ vaaleyard joined16:22
→ madewokherd joined16:24
← benonline left16:24
← rama left16:25
← vaaleyard left16:25
← dmc left16:25
→ Jenna16bit joined16:25
← Jenna16bit left16:25
→ Jenna16bit joined16:25
→ vaaleyard joined16:25
→ rama joined16:25
→ jaggz joined16:25
← Laplace left16:26
← vaaleyard left16:26
← jaggz left16:27
→ jaggz joined16:28
← jaggz left16:29
→ lionkor joined16:30
→ jaggz joined16:30
→ carl- joined16:30
← lkor left16:31
← LuKaRo left16:31
← jaggz left16:31
← rama left16:33
→ jaggz joined16:33
→ LuKaRo joined16:33
→ dmc joined16:35
→ _apex2_ joined16:35
← jaggz left16:38
← _apex2_ left16:40
→ vaaleyard joined16:44
→ kantlivelong joined16:45
→ igemnace joined16:46
← vaaleyard left16:49
← bambanxx left16:50
→ anom joined16:53
→ bambanxx joined16:55
← kurahaupo left16:56
→ cdown_ joined16:56
→ kurahaupo joined16:56
← igemnace left16:56
← R2robot_ left16:57
← dante-as left16:58
→ skylize6 joined16:58
→ R2robot_ joined16:59
← cdown left16:59
cdown_ → cdown16:59
← PenguinMan98 left17:00
← skylize left17:00
skylize6 → skylize17:00
→ fling joined17:03
→ rama joined17:08
← R2robot_ left17:08
← wallabra left17:08
← _sa0sin_ left17:10
← theoceaniscool left17:10
→ sa0 joined17:10
→ wallabra joined17:11
→ stats4647 joined17:13
← Murr left17:13
→ Sasazuka joined17:13
→ Murr joined17:13
→ sympt joined17:19
← geosmile left17:19
← wallabra left17:21
→ geosmile joined17:21
→ wallabra joined17:21
← bambanxx left17:22
← rama left17:23
→ rurtty joined17:23
→ mat001 joined17:24
← mat001 left17:24
→ maret joined17:25
→ mat001 joined17:25
→ rama joined17:26
foo Is there a way to change how git merge processes conflicts? I'm trying to learn about this 3-commit git merge tool stuff and it seems like the merge over aggressively removed stuff17:27
← FinnElija left17:29
→ bambanxx joined17:30
← manin891 left17:31
foo kurahaupo: how do I exit out of vimdiff and save stuff? Do I have to exit out of each buffer and save it?17:31
kurahaupo same way you exit vim normally :xa17:32
foo: I suggest you read :help17:32
foo kurahaupo: I normally do :x, but the 4 buffers in vimdiff are throwing me off17:33
eg. 4 windows inside vim17:33
← Rashad left17:34
foo kurahaupo: ah, the :a ... ok, ok, got it17:34
← rama left17:34
→ FinnElija joined17:35
→ rama joined17:35
← maret left17:37
→ maret joined17:38
furrymcg1e join #vim17:41
← maret left17:42
→ maret joined17:42
← Natrick left17:43
← rama left17:44
→ rama joined17:45
← thuna` left17:45
← peirik_ left17:46
foo Well, I see what happened. A dev understood "add to our readme" as "wipe our entire readme" ... that's why these conflicts make no sense and it was merged so poorly... he overwrote the whole file.17:47
bookworm and your code review didn't work?17:48
← hxztnxt left17:48
bookworm poor form I'd say17:48
foo bookworm: Agreed. This is a good learning.17:48
→ vaaleyard joined17:48
← Visne left17:49
← stats4647 left17:49
← lacrymology left17:51
→ Visne joined17:52
← rsx left17:52
foo Difference between local file and working file in a 3-way git merge: the local file excludes the <<< === >>> stuff, correct?17:54
I've read man git-mergetool ... trying to wrap my head around this17:54
gitinfo the git-mergetool manpage is available at https://gitirc.eu/git-mergetool.html17:54
← FinnElija left17:55
→ FinnElija joined17:55
dob1 I used git config user.email [email@hidden.address] in the wrong directory, still a git repository, how can I revert this?17:58
← FinnElija left18:00
dob1 got it back from log18:00
→ FinnElija joined18:01
← ntz left18:03
→ ntz joined18:04
→ J-ro joined18:04
← vaaleyard left18:05
→ lgc joined18:06
← anom left18:06
← maret left18:07
→ maret joined18:08
→ Rashad joined18:09
rewt foo, the local file is what the local file was before you started the merge; remote is what the remote was before the merge; base is what it was at the time of divergence (last common ancestor)18:12
local being branch being merged into, and remote being branch merging in18:12
→ peirik_ joined18:13
→ Betal joined18:15
→ pretty_dumm_guy joined18:15
← J-ro left18:16
→ skapata joined18:17
→ Natrick joined18:17
← MajorBiscuit left18:21
← peirik_ left18:21
← terminaldweller left18:24
← Coop left18:27
→ terminaldweller joined18:28
→ irrgit_ joined18:32
← rosco left18:34
→ _apex2_ joined18:36
→ n1ghterr0rs joined18:40
← _apex2_ left18:41
→ clime joined18:44
→ MiguelX413 joined18:45
→ thuna` joined18:46
← derpydoo left18:46
→ peirik_ joined18:48
← rama left18:50
→ wallabra_ joined18:50
→ rama joined18:50
← lgc left18:51
← wallabra left18:52
→ derpydoo joined18:52
wallabra_ → wallabra18:53
← TomyWork left18:56
→ wallabra_ joined18:57
jetchisel Hi folks, can create a null delimited output, like for: git ls-files ?18:57
*git*18:57
← Lord_of_Life left18:57
→ nightstrike joined18:57
← wallabra left18:58
osse -z18:58
jetchisel Thanks osse, you're my hero!18:58
→ Lord_of_Life joined18:58
→ softirq joined18:58
wallabra_ → wallabra18:59
← powftw left19:00
← vitali64 left19:06
→ LuxuryMode joined19:07
← Sasazuka left19:12
→ defjam joined19:12
← rama left19:13
← maret left19:13
→ rama joined19:13
→ ferdna joined19:14
← Rashad left19:15
← Visne left19:16
← bambanxx left19:17
← terminaldweller left19:18
← piwu left19:19
→ Visne joined19:19
← Aminda left19:20
→ Aminda joined19:21
← iomari891 left19:21
← peirik_ left19:22
→ terminaldweller joined19:22
→ maret joined19:24
← maret left19:25
→ k8yun joined19:25
→ maret joined19:27
→ hans_ joined19:29
→ bambanxx joined19:32
→ piwu joined19:34
→ otisolsen70 joined19:34
→ Coop joined19:36
→ nate3 joined19:36
→ tyson2 joined19:40
← nate3 left19:41
← cdown left19:41
→ davidsong joined19:42
→ cdown joined19:44
→ stats4647 joined19:46
→ Rashad joined19:48
← piwu left19:49
← crabbedhaloablut left19:49
→ crabbedhaloablut joined19:50
← Swahili left19:51
→ rashkov joined20:00
→ Sasazuka joined20:01
→ tdfpsws^ joined20:02
← rama left20:03
→ J-ro joined20:03
← wallabra left20:05
← bambanxx left20:07
→ rama joined20:07
← mncheck left20:07
→ bambanxx joined20:08
← luckman212 left20:08
← carl- left20:08
→ luckman212 joined20:08
← FinnElija left20:08
→ wallabra joined20:11
→ FinnElija joined20:12
→ piwu joined20:12
← stats4647 left20:13
← rama left20:15
← delay left20:16
← mcon left20:19
→ rama joined20:20
← rama left20:25
→ rama joined20:25
← kenanmarasli left20:26
→ roadie joined20:29
← bambanxx left20:33
← rama left20:34
→ rama joined20:34
← maret left20:35
← clime left20:35
→ delay joined20:36
→ _apex2_ joined20:37
← _apex2_ left20:41
→ iomari891 joined20:43
← Aminda left20:45
→ Aminda joined20:47
← iomari891 left20:49
← k8yun left20:50
→ iomari891 joined20:50
→ peirik_ joined20:51
→ k8yun joined20:56
← feriman left20:57
← coot left20:57
← rama left21:01
→ rama joined21:02
← Visne left21:03
→ Visne joined21:04
→ nate3 joined21:05
→ R2robot joined21:06
← otisolsen70 left21:10
→ fiffi joined21:10
← derpydoo left21:10
← davidsong left21:12
→ clime joined21:12
← fiffi left21:13
← Murr left21:13
→ Murr joined21:13
→ ackyshake joined21:14
→ b0o joined21:14
foo rewt: thank you for explaiing21:14
→ Guest5924 joined21:14
← Guest5924 left21:15
← rama left21:15
← Visne left21:16
b0o I am not sure if my message went through, my IRC client glitched. Asking again: When I `git push -u origin main`, is any of the information inside `.git/logs` pushed as well?21:19
ikke no21:20
b0o thanks!21:20
← terminaldweller left21:21
→ NSOL joined21:23
← k8yun left21:23
→ k8yun joined21:24
← peirik_ left21:24
→ arescorpio joined21:24
← Aminda left21:26
← wallabra left21:26
← roadie left21:26
→ Aminda joined21:27
→ Visne joined21:27
← pretty_dumm_guy left21:27
→ roadie joined21:28
→ wallabra joined21:28
→ pretty_dumm_guy joined21:29
← B-| left21:31
→ Guest4843 joined21:33
← roadie left21:33
→ terminaldweller joined21:33
← luckman212 left21:34
← Guest4843 left21:34
→ peirik_ joined21:37
→ luckman212 joined21:37
← peirik_ left21:42
→ lolok joined21:42
← iomari891 left21:44
← hans_ left21:49
→ agarr joined21:51
→ iomari891 joined21:52
→ tolot joined21:52
→ roadie joined21:58
← ferdna left21:59
← iomari891 left22:02
← nate3 left22:03
← reset left22:07
← roadie left22:09
← tolot left22:09
→ Guest414 joined22:10
← rashkov left22:10
← Guest414 left22:10
teear If I wanna use git, I need to learn a new paradigm?22:11
I need to like rewamp my thinking, and learn a new language?22:11
→ peirik_ joined22:12
rewt git has differences from other vcses, so a bit of a change in how to think about it, and some terminology may be different, so new language in that sense22:13
a lot of people use git without knowing what git is doing, though, so it is possible to not know anything and still use it22:14
← pulse left22:15
→ BSaboia joined22:16
mackerman New paradigm relative to what, what is your experience?22:16
← ntz left22:18
→ ntz joined22:19
→ xx joined22:20
→ bambanxx joined22:21
→ luckman212_ joined22:25
← tdfpsws^ left22:25
→ Xenguy joined22:26
← luckman212 left22:27
luckman212_ → luckman21222:27
← softirq left22:32
→ softirq joined22:33
→ roadie joined22:34
→ rama joined22:37
→ luckman212_ joined22:40
← luckman212 left22:41
luckman212_ → luckman21222:41
← peirik_ left22:41
→ ron_ joined22:42
→ Xenguy_ joined22:46
← J-ro left22:46
← ron_ left22:46
← roadie left22:46
← gildasio left22:48
← Xenguy left22:49
← rama left22:49
→ gildasio joined22:49
← gildasio left22:49
→ gildasio joined22:50
← luckman212 left22:50
→ wallabra_ joined22:52
← arch_angel left22:52
← wallabra left22:52
wallabra_ → wallabra22:54
← dnh left22:55
← m0viefreak left23:00
← gildasio left23:06
← FinnElija left23:06
→ gildasio joined23:06
← pretty_dumm_guy left23:08
← bambanxx left23:09
→ FinnElija joined23:09
→ luckman212 joined23:10
→ pretty_dumm_guy joined23:10
← lionkor left23:11
← softirq left23:11
← Murr left23:13
→ Murr joined23:13
→ roadie joined23:13
→ dsrt^ joined23:16
← Aminda left23:16
→ Aminda joined23:18
→ softirq joined23:18
← loulou left23:22
← roadie left23:26
← LuxuryMode left23:27
← zeenk left23:28
→ BlessJah joined23:29
→ loulou joined23:30
← loulou left23:30
→ loulou joined23:30
→ vdamewood joined23:34
→ bambanxx joined23:42
← softirq left23:43
← loulou left23:45
→ YuGiOhJCJ joined23:48
→ gjnoonan joined23:48
→ peirik_ joined23:48
→ tsujp joined23:48
← vdamewood left23:49
→ rishi`` joined23:49
← delay left23:49
→ kapil joined23:49
→ vdamewood joined23:49
→ Arsen joined23:50
← xx left23:53
← nyah left23:54
→ odoood joined23:57
→ _apex2_ joined23:57
← odoood left23:57
→ gast0n joined23:57

Logs Search ←Prev date Next date→ Channels Documentation