IRCloggy #git 2023-01-07

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-01-07

→ dvopgy joined00:00
← inline__ left00:03
← dvopgy left00:05
→ inline__ joined00:05
→ terminalpusher joined00:06
→ fspax joined00:07
← inline left00:09
→ lgc joined00:09
← terminalpusher left00:09
← sa0 left00:09
→ Novi joined00:13
← EvilDMP left00:13
← causasui left00:15
→ dvopgy joined00:16
→ inline joined00:18
tomhg Hey. I have created multiple submodules to separate the code in order to track their issues seperately. I have troubles keeping them in sync and referring to the correct commit. I am seeking advices and opinions or a read!00:18
← dvopgy left00:21
← inline__ left00:22
← lgc left00:22
← Sulky_ left00:23
← cbreak left00:24
→ cbreak joined00:28
→ YuGiOhJCJ joined00:30
← duxsco left00:33
→ dvopgy joined00:33
← lucasta left00:34
← dvopgy left00:38
→ inline__ joined00:38
← derjanni left00:39
→ derjanni_ joined00:39
nedbat tomhg: i've never used submodules, but they sound like a headache you should avoid.00:41
← inline left00:42
tomhg nedbat: They led me devide my issues, since they code is "stalling".00:43
← theoceaniscool left00:44
→ lucasta joined00:44
nedbat stalling?00:45
← bertronika left00:46
← ripdog left00:47
→ dvopgy joined00:50
→ Saloframes joined00:50
nedbat tomhg: what do you mean by stalling?00:50
← fillx left00:50
← Saloframes left00:50
→ Xardas joined00:52
← farzat left00:53
tomhg The code is not a regular object to change in comparsion to the actual software00:54
← dvopgy left00:55
← BUSY left00:57
nedbat tomhg: sorry, i don't know what you mean. I wouldn't change the repo organization to organize the issues. I'd use labels on the issues.00:58
← Xardas left00:58
→ Xardas joined00:58
→ sa0 joined01:00
→ Saloframes joined01:01
tomhg Okay. I realized this. Was hoping for a suggestion about subtree I am unable to research about tbh01:02
← Saloframes left01:02
→ Saloframes joined01:02
→ Sulky joined01:03
→ boxframes_ joined01:05
← boxframes_ left01:05
← ferdna left01:07
→ dvopgy joined01:08
← nyah left01:11
→ boxframes_ joined01:12
← giu--- left01:13
→ boxframes__ joined01:13
← boxframes__ left01:13
← dvopgy left01:13
→ inline joined01:16
→ boxframes__ joined01:17
← audaine left01:17
← boxframes__ left01:17
→ boxframes__ joined01:17
← lucasta left01:19
← Saloframes left01:19
← boxframes__ left01:19
← inline__ left01:19
← boxframes_ left01:19
← ZacSharp left01:24
→ cdown joined01:26
→ dvopgy joined01:26
→ ripdog joined01:27
← dvopgy left01:32
→ lucasta joined01:34
→ dvopgy joined01:44
← The_Blode left01:49
← dvopgy left01:49
← kostkon left01:52
→ kostkon joined01:53
← lucasta left01:57
→ lucasta joined01:59
← fspax left02:01
→ dvopgy joined02:03
← austincheney left02:04
← dvopgy left02:08
→ BUSY joined02:09
→ inline__ joined02:11
← inline left02:15
← moldorcoder7 left02:17
← inline__ left02:18
→ dvopgy joined02:19
← dvopgy left02:24
→ Vesryn joined02:33
→ dvopgy joined02:37
→ Zeit joined02:38
→ gsi_ joined02:39
← teddyc left02:41
← gsi left02:42
← fuzzybear396539 left02:42
← dvopgy left02:42
← jiffe left02:43
→ jiffe joined02:45
→ funhouse__ joined02:46
← funhouse_ left02:49
← Novi left02:51
→ d1b joined02:53
→ dvopgy joined02:53
→ jundran joined02:55
← skered left02:56
← ciarltb^ left02:57
← dvopgy left02:58
← defjam left03:02
→ dvopgy joined03:09
← dvopgy left03:14
← jiffe left03:22
→ jiffe joined03:23
→ pconst167 joined03:24
→ dvopgy joined03:26
← squirrel left03:27
← cdown left03:30
← dvopgy left03:31
→ defjam joined03:31
← weko left03:31
→ weko joined03:32
→ Maxattax1997 joined03:33
← defjam left03:36
→ dvopgy joined03:43
← Murr left03:43
→ Guest92 joined03:43
→ Murr joined03:44
← dvopgy left03:48
→ defjam joined03:48
← defjam left03:52
← Guest92 left03:55
← jundran left03:57
→ dvopgy joined03:59
→ jundran joined03:59
→ finn_elija joined03:59
← FinnElija left03:59
finn_elija → FinnElija03:59
← dvopgy left04:04
→ Novi joined04:08
← peterhil left04:09
← thiago left04:10
→ dvopgy joined04:15
→ Inline joined04:16
← dvopgy left04:20
→ defjam joined04:20
→ zenobit joined04:23
← m0viefreak left04:24
← defjam left04:25
← pconst167 left04:28
→ pconst167 joined04:29
← Novi left04:30
→ Novi joined04:30
← tirnanog left04:31
→ dvopgy joined04:31
← dvopgy left04:37
→ defjam joined04:38
← pconst167 left04:40
→ funhouse_ joined04:41
→ pconst167 joined04:41
← defjam left04:43
← funhouse__ left04:45
→ inline__ joined04:47
← ChmEarl left04:48
← zenobit left04:48
← wootehfoot left04:49
→ dvopgy joined04:50
← Inline left04:51
← jundran left04:52
→ igemnace joined04:54
→ inline joined04:54
← dvopgy left04:54
← bywaterloo left04:55
→ defjam joined04:56
→ fspax joined04:57
← Zeit left04:57
← inline__ left04:58
→ Zeit joined04:58
← defjam left05:00
← fspax left05:02
← igemnace left05:03
→ inline__ joined05:03
→ skered joined05:04
← skered left05:04
→ skered joined05:05
← skered left05:05
→ dvopgy joined05:06
→ farzat joined05:06
→ skered joined05:07
← pconst167 left05:07
← inline left05:07
← adamtajti left05:09
← dvopgy left05:11
→ inline joined05:16
← lolok left05:19
→ Vonter joined05:19
← inline__ left05:20
← Maxattax1997 left05:21
→ dvopgy joined05:22
← inline left05:24
← dvopgy left05:27
← skapata left05:29
→ adamtajti joined05:30
→ defjam joined05:31
← adamtajti left05:35
← defjam left05:36
→ dvopgy joined05:39
→ nerdypepper joined05:41
← nerdypepper left05:41
← dvopgy left05:44
→ Xenguy joined05:48
→ defjam joined05:49
← lucasta left05:53
→ lucasta joined05:53
→ dvopgy joined05:56
→ lolok joined05:56
← dvopgy left06:01
→ currenthandle joined06:05
→ Jong joined06:07
← rgrinberg left06:10
→ mra90 joined06:10
mra90 How should I add a windows based ssh repository from gitbash06:11
I try to do git remote add ssh://user@server/c/work/repository but get an error message "''/c/work/repository''does not appear to be a git repository"06:11
→ dvopgy joined06:13
← jinsun left06:13
→ madewokherd` joined06:14
→ jinsun joined06:16
← madewokherd left06:17
→ kostkon_ joined06:17
← kostkon left06:17
← dvopgy left06:18
← kostkon_ left06:23
→ kostkon__ joined06:23
← Ram-Z left06:28
→ dvopgy joined06:31
→ peepsalot joined06:31
peepsalot I messed up a merge of master into a feature branch, tried to redo it via git reset HEAD~1, editing, then commiting again. I force pushed to my personal github repo and it is acting like all those merge changes were done independently in my PR06:34
I guess I lost some metadata about the merge when I redid it this way? how can I make this right?06:34
← dvopgy left06:35
→ EvgenyK_ joined06:39
→ Ram-Z joined06:42
← EvgenyK_ left06:43
→ dvopgy joined06:47
→ Inline joined06:48
→ EvgenyK_ joined06:49
→ iomari891 joined06:50
← dvopgy left06:50
→ dvopgy joined06:50
→ kostkon_ joined06:53
→ inline__ joined06:53
← kostkon__ left06:53
← dvopgy left06:55
← Inline left06:57
→ inline joined06:57
mra90 I have a problem adding remote with ssh and windows path06:58
I try to do git remote add ssh://user@server/c/work/repository but get an error message "''/c/work/repository''does not appear to be a git repository"06:58
← bket left06:58
← inline__ left07:01
→ bket joined07:01
→ inline__ joined07:05
→ dvopgy joined07:06
← inline left07:08
← dvopgy left07:11
→ The_Blode joined07:12
→ inline joined07:13
→ blackhawk joined07:15
← inline__ left07:17
→ inline__ joined07:17
← inline__ left07:18
→ inline__ joined07:19
inline → Guest602207:21
← Guest6022 left07:21
inline__ → Inline07:22
→ dvopgy joined07:22
← Inline left07:24
→ Inline joined07:25
← dvopgy left07:27
← hbautista left07:37
→ funhouse__ joined07:39
→ dvopgy joined07:41
← Betal left07:41
← funhouse_ left07:43
← Murr left07:43
← hrberg left07:43
→ Murr joined07:43
→ hrberg joined07:45
→ put_in joined07:45
← dvopgy left07:46
← blackhawk left07:49
→ dvopgy joined07:58
→ Sulky_ joined08:01
← dvopgy left08:03
← Sulky left08:03
→ Murr- joined08:04
← Murr left08:06
Murr- → Murr08:06
← unluckyshrubbery left08:09
← Sulky_ left08:10
← roadie` left08:10
→ roadie joined08:10
→ dvopgy joined08:16
← dvopgy left08:21
→ mei_ joined08:26
← mei left08:29
→ selve joined08:30
→ dvopgy joined08:33
← very_sneaky left08:34
→ very_sneaky joined08:36
← EvgenyK_ left08:38
← dvopgy left08:39
← defjam left08:47
← gas51627 left08:48
→ dvopgy joined08:51
← very_sneaky left08:54
→ very_sneaky joined08:55
← dvopgy left08:56
→ defjam joined08:58
→ fspax joined09:01
← aidalgol left09:02
← defjam left09:03
← mra90 left09:06
→ dvopgy joined09:06
→ defjam joined09:11
← dvopgy left09:11
→ ___nick___ joined09:12
→ einabej joined09:14
← fspax left09:14
← Xardas left09:15
→ theoceaniscool joined09:18
→ OnkelTem joined09:20
→ feriman joined09:21
→ dvopgy joined09:25
← Xenguy left09:26
← momomo left09:27
→ Xenguy joined09:29
← dvopgy left09:30
→ rosco joined09:38
→ cdleonard joined09:39
→ dvopgy joined09:41
← Murr left09:43
→ Murr joined09:43
← dvopgy left09:46
← ___nick___ left09:53
← sa0 left09:53
→ sa0 joined09:53
← lucasta left09:55
→ ___nick___ joined09:55
← ___nick___ left09:55
← blahboybaz left09:56
→ ___nick___ joined09:57
→ dvopgy joined09:58
← dvopgy left09:58
→ dvopgy joined09:58
← einabej left09:59
← OnkelTem left10:01
→ lucasta joined10:02
→ OnkelTem joined10:02
← dvopgy left10:03
← defjam left10:03
→ dvopgy joined10:03
→ parsnip joined10:05
→ unluckyshrubbery joined10:07
← dvopgy left10:08
← lucasta left10:09
← jazzy left10:10
→ defjam joined10:11
→ einabej joined10:17
→ lucasta joined10:18
→ dvopgy joined10:21
← feriman left10:23
← dvopgy left10:26
← ___nick___ left10:27
→ __nick__ joined10:27
← einabej left10:29
→ einabej joined10:29
← rosco left10:32
→ duxsco joined10:35
cbreak peepsalot: to redo a merge, you need to commit --amend it, or actually recreate a merge, for example by merging again10:35
just committing won't do it10:35
→ Lord_of_Life_ joined10:36
← Lord_of_Life left10:38
→ dvopgy joined10:38
→ Sulky joined10:38
Lord_of_Life_ → Lord_of_Life10:39
← f451 left10:41
← dvopgy left10:42
← lucasta left10:43
→ f451 joined10:43
← f451 left10:43
→ f451 joined10:46
← roadie left10:49
← currenthandle left10:49
→ dvopgy joined10:54
→ EvilDMP joined10:56
→ igemnace joined10:58
← f451 left10:58
← dvopgy left10:59
→ f451 joined10:59
← Xenguy left11:03
← vishal left11:08
← defjam left11:10
→ dvopgy joined11:10
→ vishal joined11:12
← dvopgy left11:15
→ defjam joined11:19
→ dvopgy joined11:26
→ lucasta joined11:27
← dvopgy left11:31
← reset left11:33
← EvilDMP left11:35
← hamburgler left11:36
← farzat left11:39
→ adamtajti joined11:40
→ reset joined11:40
→ dvopgy joined11:42
← defjam left11:45
→ bertronika joined11:45
← dvopgy left11:47
← zmt00 left11:50
→ defjam joined11:53
→ moldorcoder7 joined11:56
→ dvopgy joined11:59
→ rosco joined12:03
← dvopgy left12:04
→ zzz joined12:05
→ dvopgy joined12:09
← dvopgy left12:11
← defjam left12:11
→ dvopgy joined12:11
← zzz left12:12
→ mei joined12:20
← mei_ left12:23
→ defjam joined12:25
← igemnace left12:27
→ warmana joined12:29
→ chimbosonic11 joined12:32
← dvopgy left12:33
← Novi left12:38
→ shored joined12:39
→ farzat joined12:42
← rosco left12:46
→ dvopgy joined12:50
→ alexherbo2 joined12:54
← theoceaniscool left12:55
← dvopgy left12:56
← Sulky left13:02
→ dvopgy joined13:07
→ theoceaniscool joined13:07
→ dvopgy_ joined13:10
→ john_johnk joined13:11
← dvopgy left13:12
→ surfist1 joined13:13
→ Xenguy joined13:14
→ thiago joined13:19
→ Xenguy_ joined13:23
→ DaNeenjah joined13:25
← weko left13:25
← Xenguy left13:26
→ Xenguy__ joined13:29
→ fstd_ joined13:31
← Xenguy_ left13:31
→ happytoad joined13:32
fstd_ → fstd13:32
← theoceaniscool left13:32
→ Xenguy_ joined13:33
← tchan left13:33
← umbramalison left13:34
→ tchan joined13:34
happytoad i did a "git fetch", which worked and "git diff" shows some changes, but when i try to "git merge" it tells me "Already up to date." and "git branch" only shows one branch, "master"... how can i merge these changes?13:34
← Xenguy__ left13:35
← duxsco left13:36
happytoad actually, nevermind.. i think the changes git is showing with the diff were previously made by me long ago and not committed... and looking back in my history i see that "git fetch" actually did *not* show it fetching anything13:37
my bad.. sorry, nevermind13:37
← happytoad left13:37
→ theoceaniscool joined13:45
→ bywaterloo joined13:47
→ zmt00 joined13:48
← moldorcoder7 left13:50
← defjam left13:53
→ Xenguy__ joined13:56
← Xenguy_ left13:58
→ umbramalison joined13:58
← YuGiOhJCJ left13:59
→ dob1 joined14:00
→ Xenguy_ joined14:01
← dvopgy_ left14:03
→ Xenguy joined14:03
← Xenguy__ left14:04
→ Xenguy__ joined14:05
← Xenguy_ left14:06
← Xenguy left14:08
→ duxsco joined14:10
kostkon_ → kostkon14:10
→ Xenguy_ joined14:11
→ structoha1 joined14:13
→ f_ joined14:13
← Xenguy__ left14:14
← c0dehu1k left14:15
→ defjam joined14:22
← chimbosonic11 left14:26
→ rgrinberg joined14:30
← defjam left14:30
← roo- left14:34
→ roo- joined14:34
→ Guest40 joined14:35
← Guest40 left14:35
→ skapata joined14:40
→ defjam joined14:43
← finalriposte left14:44
→ madewokherd joined14:45
← einabej left14:47
← defjam left14:47
← madewokherd` left14:47
→ riposte joined14:48
← duxsco left14:49
→ duxsco joined14:51
→ rosco joined14:53
→ defjam joined14:59
← lolok left15:01
← thiago left15:04
← defjam left15:04
← DynamiteDan left15:05
→ DynamiteDan joined15:06
← structoha1 left15:08
→ weko joined15:09
← DaNeenjah left15:14
→ defjam joined15:16
→ EvilDMP joined15:17
← defjam left15:20
→ roadie joined15:21
← keypusher left15:21
→ keypusher joined15:22
← flying_sausages left15:24
→ einabej joined15:29
→ Murr- joined15:31
→ defjam joined15:33
← Murr left15:34
Murr- → Murr15:34
← jacobk left15:36
← defjam left15:38
← demonspork left15:43
← dob1 left15:48
→ demonspork joined15:49
→ dob1 joined15:49
→ defjam joined15:49
→ feriman joined15:49
→ jacobk joined15:51
← kostkon left15:53
→ flying_sausages joined15:53
← flying_sausages left15:53
→ flying_sausages joined15:53
→ kostkon joined15:53
← defjam left15:54
→ dvopgy joined15:59
← dvopgy left16:04
← ArtfulDodger left16:05
→ defjam joined16:07
← defjam left16:11
→ structoha1 joined16:13
→ Betal joined16:15
← structoha1 left16:16
← john_johnk left16:18
← jacobk left16:23
→ defjam joined16:24
leah2 is there something like git clone --reference that writes back the new objects to the reference repo?16:24
i.e. i want to make many checkouts of a repo and only really fetch what i never saw before16:25
i guess worktrees could work but then i need to keep track of which repos i know already16:26
← defjam left16:26
→ defjam joined16:27
← bywaterloo left16:28
→ blackhawk joined16:30
← bertronika left16:34
← ripdog left16:36
← rgrinberg left16:37
→ osprey joined16:42
blackhawk → Guest441616:42
← Guest4416 left16:42
osprey → blackhawk16:42
→ AlexKalopsia joined16:42
→ rgrinberg joined16:44
→ [SyntaxError] joined16:44
nedbat leah2: can you say more about "only fetch what i never saw before"? That sounds like "git fetch", so i must be missing something16:47
→ lolok joined16:47
→ cart_ joined16:47
→ Xardas joined16:48
→ epolanski joined16:49
leah2 think of a ci build server that gets told to "check out this repo, this commit" and tries to cache as much as possible16:49
nedbat leah2: the cache is a local git tree, right?16:50
leah2 yes16:50
so i could make a bare clone or somethinf and then use git clone --reference16:51
nedbat leah2: so why isn't "git pull" what you want?16:51
leah2 but that wont write the newly fetched stuff back16:51
guess i could git pull in the reference repo and then git clone16:51
← lolok left16:51
nedbat leah2: reading between the lines, the problem is that each ci run starts with an empty disk workspace, and you want to avoid pulling everything from the git host?16:53
leah2 no, i have shared disk space16:53
→ c0dehu1k joined16:57
→ bywaterloo joined17:04
← EvilDMP left17:04
→ ChmEarl joined17:06
→ bertronika joined17:08
→ alfatau joined17:14
alfatau hello everybody. I need help to understand some concepts about git branching/merging, compared to other common VCS like subversion. With SVN, each commit is stored as a difference wrt previous commit (on the same branch); so when I execute a merge, as I understand, SVN sequentially applies all these patches (deltas) to the target branch, and for17:14
each one it computes a three-way merge using source, target and base branches. On the other side, since GIT stores snapshots and not differences, when I execute a merge as I understand, it computes "on-the-fly" the whole set of differences performing once a single three-way merge with the 3 snapshots (source, target and base). Is it correct or not?17:14
ikke correct17:15
It needs to look at just 3 trees, the ones you mentioned17:15
so it compares the source to the base, target to the base, and then merges the result17:16
→ jinsun__ joined17:17
← jinsun left17:17
jinsun__ → jinsun17:17
← rosco left17:19
alfatau ikke: thanks. to be even more precise: suppose in the source (feature) branch I have 3 commits which modify the same source line in such a way the first one adds some text to the line (wrt base), the second modifies again the line and the third restores the line as the first commit. suppose also in the target branch, there is a commit which changes17:23
that line. when merging with SVN I "should" (not so sure given such simple example) obtain at least 3 consecutive conflicts on that line, while merging with GIT i should expect only one. is it correct?17:23
→ mra90 joined17:23
ikke yes, a merge does not look at intermediate history17:24
What you describe what is happening in SVN is similar to what happens when you rebase in git17:25
where each commit is reapplied onto another base17:25
alfatau so, can I expect this kind of merging model can drastically reduce conflicts frequence?17:25
(on the average)17:25
mra90 I have a problem adding remote with ssh and windows path17:26
I try to do git remote add ssh://user@server/c/work/repository but get an error message "''/c/work/repository''does not appear to be a git repository"17:26
← weko left17:26
mra90 and of course it is a valid git repository17:26
→ rosco joined17:26
→ no_gravity joined17:27
← c0dehu1k left17:28
ikke alfatau: I have no recent experience with SVN, but historically git was a lot better at merging as svn17:28
no_gravity In my last commit, I included two files that should not be in the commit. What's the best way to take them out?17:28
ikke mra90: do you perhaps mean ssh://user@server:/c/work/repository17:28
gsi_ mra90: between asking the same question several times (ideally even before that) -- have you tried looking at the git-remote documentation?17:29
→ c0dehu1k joined17:29
alfatau ikke: thanks17:30
Xenguy_ → Xenguy17:31
mra90 ikke, yes I tried it as well, doesn't work too17:31
ikke alfatau: it has since been added, but around the time that git came out, merging in svn was painful, and it did not record what was merged, so trying to merge multiple times was a pain17:31
mra90 gsi_, no I haven't checked that yet17:31
ikke (ie, working on a branch, merging that, adding more commits on the branch, merging that again)17:31
mra90 I also tried to add /path/to/repo.git or */.git - neither on works17:33
→ weko joined17:33
← cart_ left17:33
mra90 scp to this location works fine17:34
ikke mra90: did you try what I suggested?17:36
mra90 gsi_, there is nothing useful in git-remote documentation, just basic remote related commands17:36
ikke oh, wait17:36
mra90 ikke, yes I did17:36
ikke mra90: is /c/work/repository a path on the server?17:36
mra90 it always says "fatal: ''/path/to/repo/''" does not appear to be a git repository17:36
ikke, yes currect, a path on server17:37
alfatau ikke: actually SVN supports merge-tracking, that more or less solves the problem of merging twice (or more) the same revisions from the source branch. however, I'm trying to understand a little in depth the GIT merging model.17:37
ikke alfatau: like I said, it has been added since17:37
mra90 but I think by adding remote as user@server:/location it will assume the location is from "remote server"17:38
ikke yes, it will ssh into server, and look for that path on that server17:38
→ Sulky joined17:39
mra90 Yes, that's why it is weird because this is for sure a valid location! oO17:39
ikke mra90: does: ssh user@server 'ls /c/work/repository' work?17:40
mra90 ikke, that's a WINDOWS server17:40
ikke is git installed and available?17:41
mra90 yes17:41
otherwise it would give an error17:41
for git commands17:41
→ gdd joined17:42
→ Guest92 joined17:45
← no_gravity left17:51
← Guest92 left17:53
mra90 In verbose mode I see git on the server tries to do "debug1: Sending command: git-receive-pack '/path/to/repo'17:57
and that leads to fatal /path/ does not appear to be a git repository17:58
→ squirrel joined17:58
mra90 why the path to repo is between ''17:58
I think that might be the problem17:59
← einabej left18:02
mra90 Yes I tested it on the remote and the '' are the problem18:03
→ nyah joined18:03
mra90 how to stop ssh adding them18:03
← feriman left18:04
→ tulpa_ joined18:05
← alfatau left18:05
→ feriman joined18:06
→ geosmile joined18:07
→ natrys joined18:07
← rosco left18:13
→ fspax joined18:14
→ pconst167 joined18:16
← pconst167 left18:16
→ pconst167 joined18:16
← thebombzen left18:16
→ srinidhi joined18:17
← srinidhi left18:17
← gryffus left18:17
→ srinidhi joined18:17
→ thiago joined18:19
→ EvilDMP joined18:22
← blackhawk left18:26
← EvilDMP left18:26
peepsalot cbreak: I just want to know if there is there a way to "redo the merge" but keep the exact changes which I re-commited18:27
cbreak remember the hash of the commit that you want to keep the content of18:28
then recreate the merge18:28
mra90 I believe it is a git who adds the '' around the path18:28
cbreak then get the state from the commit you want with git checkout (for example)18:29
→ gryffus joined18:29
cbreak you can recreate the commit by checking out one parent, and then merging the other, for example. On a new temp branch18:29
you can also synthesize a merge commit with git commit-tree18:30
peepsalot: see man git-commit-tree18:30
gitinfo peepsalot: the git-commit-tree manpage is available at https://gitirc.eu/git-commit-tree.html18:30
cbreak this is a low-level command, but quite powerful18:30
→ dvopgy joined18:30
← lucasta left18:31
← clime left18:32
→ clime joined18:32
← dvopgy left18:34
← gryffus left18:35
← Sulky left18:40
← pconst167 left18:40
← roo- left18:42
→ roo- joined18:43
→ EvilDMP joined18:44
→ rosco joined18:44
← EvilDMP left18:45
→ lucasta joined18:47
→ EvilDMP joined18:54
← iomari891 left18:56
← rgrinberg left19:00
← tulpa_ left19:00
← EvilDMP left19:00
← Noisytoot left19:02
→ Noisytoot joined19:02
→ Sulky joined19:02
← lucasta left19:04
→ EvilDMP joined19:04
← EvilDMP left19:05
→ tomhg joined19:05
→ rgrinberg joined19:05
← mei left19:06
→ blackhawk joined19:06
← rosco left19:06
jinsun → Guest321519:06
→ jinsun__ joined19:06
← Guest3215 left19:06
jinsun__ → jinsun19:06
→ osprey joined19:07
← defjam left19:08
← bywaterloo left19:09
← blackhawk left19:12
→ lucasta joined19:13
→ terminalpusher joined19:15
→ hans_ joined19:16
← chemsmith left19:19
peepsalot <cbreak> then recreate the merge19:19
that's what I'm asking HOW to do. i clearly don't know what that means because I failed on my last attempt19:20
→ chemsmith joined19:20
→ defjam joined19:20
cbreak you can recreate the commit by checking out one parent, and then merging the other, for example. On a new temp branch19:20
← jinsun left19:21
→ jinsun joined19:21
cbreak you can git checkout -b tempbranch parentcommit119:22
git merge parentcommit219:22
← fspax left19:25
← defjam left19:25
→ moldorcoder7 joined19:26
→ rosco joined19:28
→ Xenguy_ joined19:29
← Xenguy left19:32
→ axisys joined19:36
→ natrys_ joined19:37
← tofran left19:37
→ defjam joined19:38
← natrys_ left19:39
← natrys left19:40
→ bket_ joined19:41
← duxsco left19:41
← bket_ left19:41
← bket left19:42
← defjam left19:42
← Murr left19:43
→ Murr joined19:43
→ tofran joined19:44
→ bket joined19:45
→ axisys_ joined19:45
← axisys_ left19:45
→ foul_owl joined19:45
← axisys left19:45
→ fspax joined19:45
← rosco left19:46
← epolanski left19:48
→ axisys joined19:49
→ blahboybaz joined19:51
← Xardas left19:51
← lucasta left19:51
→ Xenguy__ joined19:52
← __nick__ left19:53
← blahboybaz left19:53
→ Xenguy joined19:54
← Xenguy_ left19:55
→ ___nick___ joined19:55
→ defjam joined19:55
← ___nick___ left19:55
← Xenguy__ left19:56
→ blahboybaz joined19:56
→ jacobk joined19:57
→ ___nick___ joined19:57
→ Sulky_ joined19:58
← Sulky_ left19:58
← Sulky left19:59
→ Sulky_ joined19:59
← defjam left20:00
← theoceaniscool left20:05
← jacobk left20:06
→ jacobk joined20:08
→ hbautista joined20:10
→ john_johnk joined20:13
← john_johnk left20:14
→ tirnanog joined20:21
← small left20:25
→ jazzy joined20:28
→ rosco joined20:28
→ Xenguy_ joined20:30
→ defjam joined20:30
→ Xenguy__ joined20:32
← Xenguy left20:32
→ caef^ joined20:32
← epony left20:33
← Xenguy_ left20:35
← ProperNoun left20:36
← defjam left20:36
→ Ron4ldinho joined20:37
← rgrinberg left20:42
→ Xenguy joined20:43
← Xenguy__ left20:44
→ bywaterloo joined20:46
→ ghost43 joined20:47
→ defjam joined20:48
← defjam left20:52
→ tulpa_ joined20:56
→ small joined20:58
→ lucasta joined20:58
← terminalpusher left20:59
→ lolok joined20:59
→ einabej joined21:00
→ terminalpusher joined21:00
← rosco left21:01
← feriman left21:01
← tulpa_ left21:02
← fspax left21:03
← ___nick___ left21:04
← osprey left21:05
→ Murr- joined21:06
→ defjam joined21:06
→ Xardas joined21:08
← Murr left21:08
Murr- → Murr21:08
→ john_johnk joined21:09
→ Xenguy_ joined21:10
→ ferdna joined21:10
← Xenguy left21:12
← blahboybaz left21:14
Xenguy_ → Xenguy21:15
→ EvilDMP joined21:17
← lucasta left21:23
→ lucasta joined21:23
← Lord_of_Life left21:25
← magic_ninja left21:25
→ Cromulent joined21:25
→ oprypin_ joined21:27
→ Lord_of_Life joined21:29
← Sulky_ left21:33
← small left21:34
← hans_ left21:35
→ ___nick___ joined21:37
← Murr left21:43
→ Murr joined21:43
→ duxsco joined21:43
→ ProperNoun joined21:45
→ theoceaniscool joined21:46
← srinidhi left21:47
→ currenthandle joined21:50
← EvilDMP left21:52
→ rosco joined21:58
→ rgrinberg joined21:58
← lucasta left22:02
← f_ left22:02
← weko left22:04
→ weko joined22:05
← ___nick___ left22:06
← john_johnk left22:06
→ Xenguy_ joined22:09
← Xenguy left22:13
→ EvilDMP joined22:13
← rgrinberg left22:20
→ m0viefreak joined22:23
→ Xenguy__ joined22:23
← ghost43 left22:25
← Xenguy_ left22:26
→ ghost43 joined22:26
→ hamburgler joined22:28
→ humanface joined22:29
← EvilDMP left22:29
→ epony joined22:32
→ lucasta joined22:32
Xenguy__ → Xenguy22:32
← bywaterloo left22:35
→ ZacSharp joined22:38
→ raindrop777 joined22:39
← jfsimon1981 left22:48
→ jfsimon1981 joined22:50
→ Xenguy_ joined22:54
← Xenguy left22:56
← reset left23:07
→ brw joined23:08
← defjam left23:13
← bertronika left23:15
→ john_johnk joined23:16
← alexherbo2 left23:17
→ alexherbo2 joined23:18
← lucasta left23:24
→ defjam joined23:26
← einabej left23:28
← defjam left23:31
← [SyntaxError] left23:31
→ lucasta joined23:31
← umbramalison left23:32
← The_Blode left23:32
→ Sulky joined23:36
← keypusher left23:36
Soni trying to do weird stuff with URIs, thoughts? https://soniex2.tumblr.com/post/705832532473724928/so-heres-our-plan-we-wanna-have-web-git-urls23:36
→ rgrinberg joined23:37
Soni (mostly trying to piss off browser devs by making the foo:bar@ extremely important)23:37
(as one does)23:38
→ Xenguy__ joined23:40
→ Grace joined23:42
→ defjam joined23:42
← Xenguy_ left23:43
← phylaz left23:43
→ Dotz0cat| joined23:43
← john_johnk left23:44
← Xenguy__ left23:45
← Cromulent left23:45
Dotz0cat| → Dotz0cat23:45
← defjam left23:47
→ small joined23:48
→ odoood joined23:50
← odoood left23:51
← humanface left23:55
→ thebombzen joined23:55
→ keypusher joined23:56
→ dionysus69 joined23:57
← put_in left23:58
→ defjam joined23:59

Logs Search ←Prev date Next date→ Channels Documentation