| 2023-04-23 |
| ← sam113101 left | 00:00 |
| sam113102 → sam113101 | 00:00 |
| → BinarySavior joined | 00:00 |
| ← hamburgler left | 00:00 |
| ← GNUmoon left | 00:01 |
| → roadie joined | 00:02 |
| → GNUmoon joined | 00:04 |
| → user____ joined | 00:04 |
| ← Lunatrius left | 00:05 |
| → Lord_of_Life_ joined | 00:08 |
| → ThorMojito joined | 00:08 |
| ← user____ left | 00:09 |
| ← Lord_of_Life left | 00:09 |
| Lord_of_Life_ → Lord_of_Life | 00:09 |
| → Lunatrius joined | 00:15 |
| ← roadie left | 00:15 |
| ← vysn left | 00:16 |
| → vysn joined | 00:19 |
| → jacobk joined | 00:20 |
| → user____ joined | 00:22 |
| ← Yruama_ left | 00:24 |
| ← ferdna left | 00:25 |
| ← BrandonArnold left | 00:25 |
| ← jaykelly450 left | 00:25 |
| ← user____ left | 00:27 |
| ← squirrel left | 00:30 |
| ← giu- left | 00:33 |
| ← liefer396 left | 00:34 |
| ← ThorMojito left | 00:38 |
| → user____ joined | 00:38 |
| ← cdown left | 00:40 |
| ← PobodysNerfect left | 00:42 |
| → weaksauc_ joined | 00:44 |
| ← gryffus left | 00:47 |
| ← arescorpio left | 00:47 |
|
weaksauc_
| say you have a commit and branch that's a PR that adds some feature to your project. after sending off that PR what's your general strategy for using that feature in the project in the time between you opening the PR and the time it gets accepted? | 00:47 |
| → ferdna joined | 00:59 |
|
ch
| create a branch off that branch and work there | 01:15 |
| → catman joined | 01:15 |
|
ch
| is what i often do | 01:15 |
| ← jacobk left | 01:15 |
| ← catman left | 01:17 |
|
EdFletcher
| yup agreed, "stacked branches" is the term i've heard used to describe the technique | 01:18 |
| → roadie joined | 01:19 |
| ← sa0 left | 01:19 |
| → money joined | 01:19 |
| ← very_sneaky left | 01:20 |
| → very_sneaky joined | 01:22 |
|
weaksauc_
| and then just rebase later if the order changes? | 01:23 |
|
| like if you have a few different branches and prs at the same time? | 01:24 |
| → hamburgler3 joined | 01:31 |
| ← roadie left | 01:32 |
| ← hamburgler2 left | 01:34 |
|
ch
| i try not to work on multiple things in parallel that touch the same parts | 01:34 |
|
| but if i must, i often build myself a 'base' branch out of merged submitted branches, and then work off that, and if need be my new work can be rebased | 01:34 |
| ← vysn left | 01:35 |
| → hamburgler2 joined | 01:36 |
| ← hamburgler3 left | 01:39 |
| → cdown joined | 01:40 |
| ← user____ left | 01:42 |
| ← oriba left | 01:45 |
| ← cdown left | 01:50 |
| ← Suchiman left | 01:51 |
| → jacobk joined | 01:52 |
| → user____ joined | 01:53 |
| ← user____ left | 01:56 |
| → m0viefreak joined | 02:00 |
| → hbautista__ joined | 02:03 |
| ← elastic_dog left | 02:08 |
| → elastic_dog joined | 02:09 |
| → user____ joined | 02:10 |
| → fstd_ joined | 02:10 |
| ← user____ left | 02:12 |
| ← fstd left | 02:13 |
| fstd_ → fstd | 02:13 |
| ← gsi left | 02:23 |
| → gsi joined | 02:25 |
| ← Traneptora left | 02:26 |
| → user____ joined | 02:26 |
| ← terrorjack left | 02:40 |
| → terrorjack joined | 02:41 |
| → roadie joined | 02:43 |
| → keypushe- joined | 02:46 |
| ← keypusher left | 02:48 |
| keypushe- → keypusher | 02:49 |
| → catman joined | 02:50 |
| ← dviola left | 02:51 |
| → dviola joined | 02:53 |
| ← roadie left | 02:57 |
| → dtd-123 joined | 02:58 |
| ← FinnElija left | 02:59 |
| ← Visor left | 02:59 |
| → Visor joined | 02:59 |
| ← daru left | 03:01 |
| → FinnElija joined | 03:01 |
| → daru joined | 03:01 |
| ← catman left | 03:02 |
| ← dtd-123 left | 03:04 |
| → bret joined | 03:09 |
| ← wlemuel left | 03:10 |
| → wlemuel joined | 03:11 |
| → nate1 joined | 03:15 |
| → EvgenyK joined | 03:18 |
| ← chemsmith left | 03:28 |
| → chemsmith joined | 03:29 |
| ← user____ left | 03:31 |
| ← jacobk left | 03:33 |
| ← bret left | 03:35 |
| ← lucasta left | 03:36 |
| → jbg joined | 03:43 |
| → user____ joined | 03:43 |
| → bret joined | 03:47 |
| ← user____ left | 03:48 |
| → user____ joined | 04:00 |
| ← user____ left | 04:02 |
| → jacobk joined | 04:11 |
| → catman joined | 04:16 |
| → user____ joined | 04:16 |
| ← nate1 left | 04:18 |
| → roadie joined | 04:18 |
| ← alexherbo2 left | 04:18 |
| ← R2robot left | 04:21 |
| ← chemsmith left | 04:25 |
| → chemsmith joined | 04:27 |
| → R2robot joined | 04:30 |
| ← bloody left | 04:31 |
| ← d[-_-]b left | 04:32 |
| ← roadie left | 04:32 |
| → kaisyu joined | 04:48 |
| ← EvgenyK left | 04:49 |
| ← money left | 04:49 |
| ← blupier left | 04:57 |
| → roadie joined | 05:01 |
| → blupier joined | 05:02 |
| ← roadie left | 05:14 |
| ← user____ left | 05:18 |
| → stewie925 joined | 05:18 |
| → roadie joined | 05:21 |
| ← hbautista__ left | 05:21 |
| → JSkilton joined | 05:24 |
| → d[-_-]b joined | 05:31 |
| → user____ joined | 05:33 |
| ← user____ left | 05:35 |
| ← gast0n left | 05:36 |
| ← JSkilton left | 05:46 |
| → gnulinuxuser joined | 05:47 |
| → user____ joined | 05:49 |
| ← user____ left | 05:51 |
| → warmana1 joined | 05:52 |
| ← warmana left | 05:53 |
| warmana1 → warmana | 05:53 |
| ← geosmile left | 05:54 |
| → geosmile joined | 05:54 |
| crb_ → crb | 05:57 |
| → han-solo joined | 05:59 |
| → user____ joined | 06:05 |
| ← user____ left | 06:07 |
| ← FH_thecat left | 06:09 |
| → lgc joined | 06:09 |
| ← lgc left | 06:09 |
| → user____ joined | 06:23 |
| → feriman joined | 06:28 |
|
mjt0k
| "your branch foo and remote/foo have divirged and have M and N commits each" - what's the way to see the diff between the set of commits? | 06:30 |
|
ikke
| mjt0k: do you want to see a list of commits or actual file differences? | 06:31 |
|
mjt0k
| commits | 06:31 |
|
ikke
| git log --oneline foo..remote/foo shows you want remote/foo has, but foo has not | 06:32 |
|
| git log --oneline remote/foo..foo shows the opposite | 06:32 |
|
mjt0k
| oh. heh. Never thought about using git log this way | 06:33 |
|
| thank you ikke! | 06:33 |
| ← ferdna left | 06:33 |
|
mjt0k
| still it's fun there's no shortcut command for this | 06:35 |
|
ikke
| if you have foo checked out | 06:35 |
|
| git log ..@{u} | 06:36 |
|
| or | 06:36 |
|
| git log @{u}.. | 06:36 |
|
| (add --oneline if you want) | 06:36 |
|
mjt0k
| it looks like I have to re-read the docs about all these shortcuts | 06:38 |
|
| actually git log doesn't show me the differences | 06:38 |
|
| I have to compare the two git logs | 06:39 |
|
| one of the git log ..@{u}/${u}.. shows one extra commit | 06:39 |
|
| both shows all commits, but one of them shows one more commit than the other | 06:40 |
|
| there's one change at the *beginning* which is missing in one of the 2 branches | 06:40 |
|
| and ofcourse all the IDs are different, so diffing should not include the commit-ID | 06:41 |
|
| so it's like: git log --oneline ..@{u} | sed 's/^[a-z0-9]* //' > a; ditto for @{u}..; diff a b | 06:42 |
| → sa0 joined | 06:43 |
|
mjt0k
| but the shortcuts are very useful | 06:44 |
| ← terrorjack left | 06:44 |
| → terrorjack joined | 06:45 |
| ← Aryan left | 06:46 |
|
ikke
| mjt0k: if they are rebased branches with similar commits, you can use | 06:46 |
|
| git range-diff | 06:46 |
| ← valeyard left | 06:46 |
|
mjt0k
| just read man gitrevisions. What an excellent thing!.. I missed a decade of development in this area :) | 06:47 |
|
gitinfo
| the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html | 06:47 |
| ← terrorjack left | 06:48 |
|
mjt0k
| and yes, range-diff is what I was looking for. | 06:48 |
| → vaaleyard joined | 06:49 |
| → terrorjack joined | 06:49 |
| ← terrorjack left | 06:50 |
|
ikke
| 99% of what's in gitrevisions has been there for ages :) | 06:50 |
|
mjt0k
| git range-diff ...@{u} | 06:51 |
|
| this is exactly what I was looking fore | 06:51 |
|
| when it says the branches have divirged, that'd be a quick check for what's changed, without actually knowing beforehand | 06:52 |
| → terrorjack joined | 06:52 |
|
mjt0k
| very good stuff | 06:52 |
| ← kaisyu left | 06:58 |
| → jashim joined | 07:00 |
| → Inline joined | 07:01 |
| → xx joined | 07:03 |
| ← clarkh2 left | 07:04 |
| ← skapata left | 07:15 |
| ← peas left | 07:23 |
| → shokohsc3 joined | 07:26 |
| ← user____ left | 07:27 |
| ← shokohsc left | 07:29 |
| shokohsc3 → shokohsc | 07:29 |
| ← jacobk left | 07:29 |
| ← stewie925 left | 07:32 |
| → Aryan joined | 07:36 |
| → user____ joined | 07:39 |
| → theoceaniscool joined | 07:40 |
|
mjt0k
| one more question. When something gets merged into master branch, it might contain very old commits which were in some other repository which the merge has collected. So, for example, that'll be a commit which committed before a previous master release, which has been merged after the release. How to show all commits which has been *merged* after the last release? Is it git log --topo-order? | 07:40 |
| ← user____ left | 07:44 |
| → EvgenyK joined | 07:52 |
| → user____ joined | 07:56 |
| → clime1 joined | 07:58 |
| ← user____ left | 08:01 |
| → sam__ joined | 08:04 |
| sam__ → Guest7474 | 08:05 |
|
Guest7474
| Hello, as far I know docker uses same kernel as host but in my linux mint when I am printing kernel version of container, it is mismatching.Can some one please tell me the reason? https://pastebin.com/q4MJhb8r | 08:07 |
| ← clime1 left | 08:07 |
| → Masklin__Gurder joined | 08:08 |
| ← Masklin left | 08:09 |
|
mjt0k
| I wonder what it has to do with git.. :) | 08:09 |
|
Guest7474
| Sorry for wrong window. I did not find any IRC of Docker | 08:10 |
| → user____ joined | 08:11 |
| ← wlemuel left | 08:14 |
| → nate1 joined | 08:16 |
| → wlemuel joined | 08:18 |
| ← EvgenyK left | 08:19 |
| ← nate1 left | 08:20 |
| → EvgenyK joined | 08:26 |
| ← theoceaniscool left | 08:38 |
|
gnulinuxuser
| please +b me | 08:38 |
| ← d[-_-]b left | 08:41 |
| → d[-_-]b joined | 08:47 |
| ← epony left | 08:51 |
| → alexherbo2 joined | 08:58 |
| ← eqw left | 08:59 |
| ← _qw left | 09:00 |
| → humanface joined | 09:00 |
| ← nektro left | 09:01 |
| → KimK_ joined | 09:01 |
| ← EvgenyK left | 09:02 |
| ← KimK left | 09:03 |
| ← derpydoo left | 09:03 |
| → sb joined | 09:11 |
| sb → svpb | 09:12 |
| → EvgenyK joined | 09:14 |
| TeXMaster → Oblomov | 09:14 |
| ← user____ left | 09:16 |
| ← d[-_-]b left | 09:22 |
| ← EvgenyK left | 09:22 |
| → PobodysNerfect joined | 09:24 |
| → EvgenyK joined | 09:24 |
| ← Guest7474 left | 09:26 |
| → Guest7474 joined | 09:26 |
| → epicout_ joined | 09:26 |
| → user____ joined | 09:26 |
| ← user____ left | 09:29 |
| ← svpb left | 09:30 |
| ← Novi left | 09:30 |
| → Novi joined | 09:33 |
| ← wlemuel left | 09:35 |
| → wlemuel joined | 09:35 |
| → d[-_-]b joined | 09:35 |
| d[-_-]b → stenno | 09:43 |
| → user____ joined | 09:43 |
| ← elastic_dog left | 09:44 |
| → _qw joined | 09:44 |
| → elastic_dog joined | 09:44 |
| ← gildasio2 left | 09:48 |
| → gildasio2 joined | 09:48 |
| → f_ joined | 09:49 |
| → Gaboradon joined | 09:49 |
| → Suchiman joined | 09:50 |
| ← EvgenyK left | 09:53 |
| → ___nick___ joined | 09:57 |
| ← ___nick___ left | 09:58 |
| → EvgenyK joined | 09:58 |
| ← alexherbo2 left | 09:58 |
| → alexherbo2 joined | 09:59 |
| → ___nick___ joined | 10:00 |
| ← Gaboradon left | 10:01 |
| ← EvgenyK left | 10:04 |
| → fspax joined | 10:04 |
| → rosco joined | 10:05 |
| → vysn joined | 10:07 |
| ← zulutango left | 10:11 |
| ← bkircher left | 10:12 |
| → bkircher joined | 10:14 |
| → zulutango joined | 10:15 |
| ← skered left | 10:16 |
| → EvgenyK joined | 10:18 |
| ← EvgenyK left | 10:22 |
| → Gaboradon joined | 10:23 |
| → squirrel joined | 10:25 |
| → igemnace joined | 10:27 |
| ← hamburgler2 left | 10:28 |
| → hamburgler2 joined | 10:29 |
| → EvgenyK joined | 10:37 |
| ← Novi left | 10:37 |
| → Novi joined | 10:39 |
| ← rosco left | 10:39 |
| ← hinderaker left | 10:40 |
| ← EvgenyK left | 10:42 |
| → EvgenyK joined | 10:44 |
| ← dviola left | 10:44 |
| → derpydoo joined | 10:45 |
| → clarkh1 joined | 10:46 |
| ← user____ left | 10:47 |
| ← EvgenyK left | 10:50 |
| ← Albright left | 10:51 |
| → Albright joined | 10:51 |
| → nate1 joined | 10:52 |
| ← fspax left | 10:54 |
| ← nate1 left | 10:57 |
| → cdown joined | 10:58 |
| → coot joined | 10:58 |
| → user____ joined | 10:58 |
| ← user____ left | 11:01 |
| ← epicout_ left | 11:03 |
| → user____ joined | 11:03 |
| → fspax joined | 11:05 |
| → clime1 joined | 11:10 |
| ← gnulinuxuser left | 11:10 |
| ← fspax left | 11:12 |
| ← user____ left | 11:12 |
| → Sulky__ joined | 11:16 |
| → nyah joined | 11:18 |
| ← Sulky_ left | 11:18 |
| → eroux joined | 11:25 |
| → user____ joined | 11:25 |
| ← user____ left | 11:28 |
| → tmpm697 joined | 11:29 |
| ← clime1 left | 11:29 |
| ← vysn left | 11:35 |
| → C-dev joined | 11:38 |
| ← jfsimon1981 left | 11:39 |
| → jfsimon1981 joined | 11:39 |
| ← C-dev left | 11:41 |
| → user____ joined | 11:42 |
| ← hamburgler2 left | 11:44 |
| → hamburgler joined | 11:45 |
| ← Guest7474 left | 11:53 |
| ← hamburgler left | 11:55 |
| → Guest19 joined | 12:03 |
|
Guest19
| Hello | 12:03 |
| ← feriman left | 12:04 |
| → vqueiroz joined | 12:04 |
| → cweiss0765321241 joined | 12:06 |
| → KnoP joined | 12:07 |
| → aapost joined | 12:07 |
| ← bywaterloo left | 12:10 |
| → ThorMojito joined | 12:11 |
| ← igemnace left | 12:11 |
| ← gurkenglas left | 12:14 |
| → gurkenglas joined | 12:19 |
| ← aapost left | 12:24 |
| → skered joined | 12:24 |
| ← skered left | 12:24 |
| → skered joined | 12:26 |
| ← skered left | 12:26 |
| → karabaja4 joined | 12:26 |
| → skered joined | 12:27 |
| → wilz joined | 12:28 |
| → jaykelly450 joined | 12:38 |
| → clime1 joined | 12:38 |
| → Yruama joined | 12:46 |
| ← user____ left | 12:46 |
| → pepe_ joined | 12:49 |
| → duxsco joined | 12:51 |
| ← coot left | 12:52 |
| → coot joined | 12:53 |
| ← clime1 left | 12:57 |
| → user____ joined | 12:58 |
| ← pepe_ left | 13:00 |
| ← Sulky__ left | 13:02 |
| → Sulky__ joined | 13:02 |
| ← user____ left | 13:02 |
| ← ThorMojito left | 13:03 |
| → ThorMojito joined | 13:11 |
| ← Gaboradon left | 13:12 |
| → user____ joined | 13:16 |
| ← user____ left | 13:18 |
| → user____ joined | 13:33 |
| ← user____ left | 13:35 |
| ← m5zs7k left | 13:37 |
| ← myme left | 13:39 |
| → myme joined | 13:40 |
| → aapost joined | 13:41 |
| → m5zs7k joined | 13:43 |
| → user____ joined | 13:50 |
| → teut joined | 13:51 |
| ← gurkenglas left | 13:58 |
| → Rashad joined | 14:04 |
| → epicout_ joined | 14:04 |
| → gurkenglas joined | 14:05 |
| ← duxsco left | 14:06 |
| ← Rashad left | 14:07 |
| → rosco joined | 14:08 |
| → hinderaker joined | 14:10 |
| → Gaboradon joined | 14:22 |
| → epony joined | 14:24 |
| → Traneptora joined | 14:32 |
| ← ThorMojito left | 14:35 |
| ← jbg left | 14:36 |
| ← Linkandzelda left | 14:38 |
| ← hussein1 left | 14:38 |
| ← fling left | 14:38 |
| ← FinnElija left | 14:38 |
| ← traph left | 14:38 |
| → fling joined | 14:38 |
| → FinnElija joined | 14:38 |
| → traph joined | 14:38 |
| → hussein1 joined | 14:39 |
| → vdamewood joined | 14:39 |
| → duxsco joined | 14:48 |
| ← catman left | 14:51 |
| → michele_ joined | 14:52 |
| → catman joined | 14:52 |
| → nate1 joined | 14:54 |
| ← duxsco left | 14:54 |
| ← user____ left | 14:56 |
| ← nate1 left | 14:59 |
| → Linkandzelda joined | 15:01 |
| ← fflam left | 15:01 |
| → joakimk joined | 15:02 |
| → fflam joined | 15:03 |
|
joakimk
| I just `git init` in an existing folder (project) but made the decision to call the branch "master" -- not "main": `git init && git symbolic-ref HEAD refs/heads/master`. When I now push the initial commit to GitHub, I find the default branch (on GH) is expected to be "main"? | 15:03 |
|
bookworm
| GH doesn't care outside of repo creation | 15:04 |
|
joakimk
| Should I rename my branch locally to main, or should I change the default on GH? This is a private/toy project, so there are no specific requirements -- I just want to be able to push to GH without going through Pull Requests | 15:04 |
|
bookworm
| git doesn't care for that matter | 15:04 |
|
| you can name your main dev branch trunk, and can directly push to it | 15:05 |
|
| the name really doesn't matter | 15:05 |
|
joakimk
| but when I push my initial commit, I get a PR on GitHub. I (being the single developer etc) want to just push "directly" to <branchname> | 15:05 |
|
| whatever it might be :) | 15:05 |
|
bookworm
| no, pushing gives you a push, not a PR | 15:06 |
|
| at least if we talk about git push | 15:06 |
|
joakimk
| hmm... I did `git push -u origin main` but my local branch was master | 15:06 |
|
| that's what's doing it? | 15:06 |
|
bookworm
| I doubt it. | 15:07 |
|
joakimk
| ah no, wait -- I couldn't do `git push -u origin main`, I got error "error: src refspec main does not match any" | 15:07 |
|
| but, keeping it simple: should I rename my local branch to main? | 15:08 |
|
| and then `git push -u origin main` ? | 15:08 |
|
bookworm
| just push master up | 15:08 |
|
| why do you wanna keep main if you use master? | 15:08 |
| ← rosco left | 15:08 |
|
joakimk
| but I get a PR in github... | 15:08 |
| ← traph left | 15:08 |
|
bookworm
| when you do what? | 15:09 |
| → traph joined | 15:09 |
|
joakimk
| master had recent pushes 1 minute ago -- Compare & pull request | 15:09 |
|
| says GH | 15:09 |
| → user____ joined | 15:09 |
|
joakimk
| after doing `git push -u origin master` | 15:09 |
|
bookworm
| yeah, that isn't a PR. That means exactly what it says | 15:09 |
|
| that you *could* make a PR if you wanted | 15:09 |
|
joakimk
| ahhoooo | 15:09 |
|
| cough cough | 15:10 |
|
bookworm
| as GH considers main to be the default branch | 15:10 |
|
joakimk
| I knew that | 15:10 |
|
| P | 15:10 |
|
| hehe thanks... | 15:10 |
|
| I just changed the branch (in GH) and there were all my filez | 15:10 |
|
| sorry for the silly question :P | 15:11 |
|
bookworm
| just delete main if you don't use it | 15:11 |
|
| it's fine, we all start somewhere | 15:11 |
|
joakimk
| yeah | 15:11 |
|
| :) | 15:11 |
| ← user____ left | 15:14 |
| ← demonspork left | 15:17 |
| → feriman joined | 15:17 |
| → wootehfoot joined | 15:20 |
| → jacobk joined | 15:25 |
| → user____ joined | 15:25 |
| ← fling left | 15:26 |
| → Tlsx joined | 15:26 |
| → ThorMojito joined | 15:27 |
| → fling joined | 15:29 |
| ← traph left | 15:32 |
| → traph joined | 15:32 |
| → bgs joined | 15:33 |
| ← geosmile left | 15:33 |
| → Guest7474 joined | 15:37 |
| → nate1 joined | 15:42 |
| ← ThorMojito left | 15:45 |
| ← jacobk left | 15:47 |
| ← nate1 left | 15:47 |
| ← joakimk left | 15:51 |
| ← geirha left | 15:52 |
| ← jaykelly450 left | 15:55 |
| ← teut left | 15:55 |
| ← cdown left | 15:56 |
| ← ritsu[m] left | 15:56 |
| ← theobjectivedad left | 15:57 |
| → skapata joined | 15:59 |
| ← wootehfoot left | 16:00 |
| → theobjectivedad joined | 16:00 |
| → filePeter joined | 16:02 |
| → liefer396 joined | 16:05 |
| ← ___nick___ left | 16:05 |
| ← R2robot left | 16:07 |
| → R2robot joined | 16:07 |
| → duxsco joined | 16:08 |
| → wootehfoot joined | 16:08 |
| ← perrierjouet left | 16:11 |
| → joe9 joined | 16:12 |
|
joe9
| I have a patch file to a file llvm/CMakeLists.txt. I want to apply this patch to the file llvm-project/llvm/CMakeLists.txt. Is there a way to add a destination directory to git-add or git-am to do it automatically? | 16:13 |
|
| From the man pages, --directory does not do that. | 16:13 |
|
| Writing an awk or shell script to change the patch file, seems to be a pita. | 16:14 |
| → esc joined | 16:14 |
|
joe9
| just curious if there is a simpler way to migrate the patch files to the new repositiory format? | 16:14 |
| ← duxsco left | 16:15 |
| ← Guest7474 left | 16:15 |
| → duxsco joined | 16:15 |
| → ___nick___ joined | 16:16 |
| ← aapost left | 16:21 |
| ← Gaboradon left | 16:26 |
|
gsi
| add and am were built for different purposes, am taking commits not just patches | 16:28 |
|
| does man git-apply help? it accepts patches, and should mostly do what patch(1) does | 16:28 |
|
gitinfo
| the git-apply manpage is available at https://gitirc.eu/git-apply.html | 16:28 |
| ← user____ left | 16:29 |
| ← Suchiman left | 16:29 |
| → Suchiman joined | 16:31 |
| → epicout__ joined | 16:39 |
| → aapost joined | 16:39 |
| ← duxsco left | 16:41 |
| ← epicout_ left | 16:42 |
| → user____ joined | 16:42 |
| ← Tuor left | 16:42 |
| → Tuor joined | 16:43 |
| ← jfsimon1981 left | 16:44 |
| → jfsimon1981 joined | 16:45 |
| ← user____ left | 16:47 |
| → perrierjouet joined | 16:48 |
| ← stenno left | 16:48 |
| → ferdna joined | 16:52 |
| ← alexherbo2 left | 16:53 |
| ← perrierjouet left | 16:54 |
| → perrierjouet joined | 16:56 |
| → user____ joined | 16:58 |
| ← user____ left | 17:01 |
|
osse
| joe9: --directory=llvm-project -p2 | 17:04 |
|
joe9
| osse, I think you misundestand my question. | 17:04 |
| ← wlemuel left | 17:04 |
|
joe9
| I need it the other way. | 17:04 |
|
| a patch to llvm/file applied to llvm-project/llvm/file | 17:05 |
| ← fling left | 17:06 |
| → fling joined | 17:06 |
| → ThorMojito joined | 17:07 |
| ← wilz left | 17:07 |
|
osse
| joe9: Then --directory is all you need (should be at least) | 17:10 |
| → bloody joined | 17:10 |
|
osse
| joe9: To be clear, the patch file has this right? | 17:10 |
|
| --- a/llvm/blah | 17:11 |
|
joe9
| no, the patch file does not have it. | 17:11 |
|
| the patch file has --- a/blah | 17:11 |
|
| and b/blah | 17:11 |
|
| I want it to do /b/llvm/blah | 17:11 |
| → olddogbarks joined | 17:12 |
|
osse
| --directory=llvm then | 17:12 |
|
| But that sounds strange. Where did "-project" go? | 17:12 |
| → wlemuel joined | 17:12 |
|
joe9
| osse, the llvm project morphed into a mono repo format. | 17:13 |
|
| It moved the llvm project into llvm-project/llvm | 17:13 |
|
ch
| maybe you should be clearer with us. is llvm-project the git root? | 17:14 |
|
joe9
| yes, it is now. | 17:14 |
| → Guest7474 joined | 17:14 |
|
joe9
| I have the patch files from when llvm was the root. | 17:14 |
|
| I want to add llvm-project/ to the destination files. | 17:14 |
|
| when I import the patch | 17:15 |
|
ch
| so the top level directory name in the patch should not matter, can be a/ or b/ or llvm/ or llvm-project/ or whatever | 17:15 |
| → user____ joined | 17:15 |
|
osse
| -p removes path components from [ab]/foo/bar, --directory prepend. A combination of those will do the trick. The default is -p1 | 17:15 |
|
ch
| it seems like you want to add llvm/ | 17:15 |
|
joe9
| yes, I want the inverse of -p | 17:15 |
|
osse
| So, --directory | 17:16 |
|
joe9
| a/llvm/blah applied to b/llvm-project/llvm/blah | 17:16 |
|
osse
| --directory=llvm-project | 17:16 |
|
ch
| if llvm-project is the root dir, and you want b/llvm-project, you'll also need -p2!? | 17:17 |
|
| i mean sure, but why | 17:17 |
| ← olddogbarks left | 17:17 |
| ← user____ left | 17:20 |
|
osse
| Something is rotten in the state of Denmark | 17:20 |
| → duxsco joined | 17:22 |
| ← dsrt^ left | 17:25 |
| → user____ joined | 17:31 |
| → BUSY joined | 17:32 |
| ← KnoP left | 17:39 |
| ← alturmann1729 left | 17:45 |
| → ju joined | 17:46 |
| ← f_ left | 17:46 |
| ← vdamewood left | 17:47 |
| ← ThorMojito left | 17:48 |
| → vdamewood joined | 17:49 |
| → lucasta joined | 17:51 |
| ← Sulky__ left | 17:59 |
| → Sulky__ joined | 18:00 |
| → jaykelly450 joined | 18:06 |
| ← coot left | 18:08 |
| → delay joined | 18:08 |
| ← agd left | 18:09 |
| ← duxsco left | 18:14 |
| ← tmpm697 left | 18:16 |
| → alexherbo2 joined | 18:17 |
| → jacobk joined | 18:21 |
| ← delay left | 18:23 |
| → delay joined | 18:24 |
| ← gurkenglas left | 18:25 |
| ← hyperair left | 18:28 |
| → navi joined | 18:28 |
| ← delay left | 18:30 |
| ← shailangsa_ left | 18:32 |
| → gurkenglas joined | 18:33 |
| ← terminaldweller left | 18:34 |
| → delay joined | 18:34 |
| ← user____ left | 18:35 |
| → terminaldweller joined | 18:37 |
| ← shokohsc left | 18:38 |
| → user____ joined | 18:38 |
| ← delay left | 18:39 |
| ← han-solo left | 18:40 |
| ← user____ left | 18:43 |
| ← wootehfoot left | 18:43 |
| → hyperair joined | 18:44 |
| → shokohsc joined | 18:45 |
| ← Guest7474 left | 18:46 |
| → int3r3st3d joined | 18:54 |
| → user____ joined | 18:55 |
| ← user____ left | 18:57 |
| → delay joined | 18:57 |
| → money joined | 18:59 |
| → shailangsa joined | 19:00 |
| → coot joined | 19:01 |
| ← delay left | 19:03 |
| → peas joined | 19:04 |
| → otisolsen70 joined | 19:05 |
| → delay joined | 19:05 |
| ← BlessJah left | 19:06 |
| ← delay left | 19:08 |
| → user____ joined | 19:11 |
| ← duthils left | 19:12 |
| → BlessJah joined | 19:12 |
| ← vdamewood left | 19:15 |
| ← theobjectivedad left | 19:16 |
| → vdamewood joined | 19:17 |
| ← int3r3st3d left | 19:20 |
| ← lmat left | 19:21 |
| → ThorMojito joined | 19:25 |
| → gco joined | 19:28 |
| ← coot left | 19:33 |
| ← ThorMojito left | 19:38 |
| → nate1 joined | 19:44 |
| → ThorMojito joined | 19:47 |
| ← nate1 left | 19:49 |
| ← distant left | 19:51 |
| → distant joined | 19:51 |
| → delay joined | 19:54 |
| ← delay left | 19:55 |
| → shokohsc3 joined | 19:55 |
| ← shokohsc left | 19:56 |
| shokohsc3 → shokohsc | 19:56 |
| → weko_ joined | 19:58 |
| ← weko left | 20:01 |
| ← ___nick___ left | 20:04 |
| → mven4 joined | 20:08 |
| ← ThorMojito left | 20:08 |
| → coot joined | 20:10 |
| ← wlemuel left | 20:12 |
| ← mven left | 20:12 |
| mven4 → mven | 20:12 |
| ← PobodysNerfect left | 20:13 |
| ← feriman left | 20:13 |
| ← user____ left | 20:16 |
| → bywaterloo joined | 20:16 |
| → theoceaniscool joined | 20:16 |
| ← otisolsen70 left | 20:21 |
| → wlemuel joined | 20:24 |
| → user____ joined | 20:29 |
| → vysn joined | 20:30 |
| ← user____ left | 20:32 |
| → tirnanog joined | 20:34 |
| ← finalriposte left | 20:34 |
| → riposte joined | 20:35 |
| → geosmile joined | 20:43 |
| → a6a45081-2b83 joined | 20:44 |
| → user____ joined | 20:46 |
| ← user____ left | 20:48 |
| → theobjectivedad joined | 20:50 |
| → cdown joined | 20:50 |
| ← reset left | 20:51 |
| → DomenicoScoppett joined | 20:53 |
| → thiago joined | 20:54 |
| → teut joined | 20:56 |
| ← bret left | 21:00 |
| → PobodysNerfect joined | 21:01 |
| ← jacobk left | 21:03 |
| → user____ joined | 21:03 |
| ← alexherbo2 left | 21:05 |
| → aapost_ joined | 21:09 |
| ← filePeter left | 21:09 |
| ← aapost left | 21:09 |
| → reset joined | 21:13 |
| ← lucasta left | 21:13 |
| → geirha joined | 21:13 |
| ← theoceaniscool left | 21:14 |
| ← blaklistd1 left | 21:15 |
| → Gaboradon joined | 21:16 |
| ← traph left | 21:18 |
| → traph joined | 21:18 |
| ← roadie left | 21:20 |
| ← clime left | 21:23 |
| ← bgs left | 21:24 |
| ← traph left | 21:27 |
| → traph joined | 21:27 |
| ← xx left | 21:28 |
| → Jong joined | 21:28 |
| → zeenk joined | 21:32 |
| ← epicout__ left | 21:34 |
| → roadie joined | 21:47 |
| → pedregalux joined | 21:47 |
| ← Atque left | 21:48 |
| → jacobk joined | 21:52 |
| ← pedregalux left | 21:53 |
| → pedregalux joined | 21:56 |
| ← roadie left | 21:57 |
| ← pedregalux left | 22:02 |
| → pedregalux joined | 22:02 |
| → YuGiOhJCJ joined | 22:03 |
| ← teut left | 22:03 |
| ← pedregalux left | 22:04 |
| → pedregalux joined | 22:04 |
| ← Guest19 left | 22:05 |
| ← pedregalux left | 22:05 |
| → pedregalux joined | 22:06 |
| → pedregalux_ joined | 22:06 |
| ← user____ left | 22:08 |
| ← pedregalux_ left | 22:09 |
| ← pedregalux left | 22:10 |
| → pedregalux joined | 22:11 |
| ← HumanG33k left | 22:15 |
| → user____ joined | 22:16 |
| → HumanG33k joined | 22:16 |
| ← pedregalux left | 22:18 |
| → pedregalux joined | 22:18 |
| ← humanface left | 22:19 |
| ← user____ left | 22:20 |
| ← pedregalux left | 22:20 |
| → giu joined | 22:24 |
| ← skeer left | 22:25 |
| → EvgenyK joined | 22:26 |
| ← sa0 left | 22:27 |
| ← DynamiteDan left | 22:28 |
| → DynamiteDan joined | 22:29 |
| ← EvgenyK left | 22:30 |
| ← coot left | 22:31 |
| → user____ joined | 22:32 |
| ← user____ left | 22:35 |
| ← ferdna left | 22:37 |
| → clarkh2 joined | 22:41 |
| ← clarkh1 left | 22:42 |
| → EvgenyK joined | 22:43 |
| ← gurkenglas left | 22:46 |
| ← a6a45081-2b83 left | 22:46 |
| → gurkenglas joined | 22:48 |
| ← EvgenyK left | 22:48 |
| → ThorMojito joined | 22:49 |
| → user____ joined | 22:49 |
| ← Traneptora left | 22:49 |
| ← rustyshackleford left | 22:50 |
| KimK_ → KimK | 22:52 |
| ← skered left | 22:56 |
| → falafel joined | 23:01 |
| ← Noisytoot left | 23:02 |
| → Noisytoot joined | 23:03 |
| ← lolok left | 23:03 |
| ← Yruama left | 23:06 |
| → skered joined | 23:08 |
| ← Tlsx left | 23:09 |
| ← terrorjack left | 23:09 |
| ← ThorMojito left | 23:10 |
| → foul_owl joined | 23:12 |
| → roadie joined | 23:15 |
| ← jaykelly450 left | 23:16 |
| ← m0viefreak left | 23:24 |
| ← vysn left | 23:24 |
| ← nyah left | 23:26 |
| ← roadie left | 23:28 |
| ← wlemuel left | 23:29 |
| → wlemuel joined | 23:30 |
| ← zeenk left | 23:31 |
| → terrorjack joined | 23:31 |
| ← squirrel left | 23:35 |
| → jbg joined | 23:36 |
| ← aapost_ left | 23:38 |
| → agd joined | 23:40 |
| → nate1 joined | 23:45 |
| ← nate1 left | 23:50 |
| ← gurkenglas left | 23:53 |
| ← user____ left | 23:54 |
| → vysn joined | 23:55 |