| 2021-07-03 |
| ← atharvaraykar left | 00:00 |
| ← Sasazuka left | 00:05 |
| ← Murr left | 00:10 |
| → Murr joined | 00:11 |
| → atharvaraykar joined | 00:12 |
| → qpdb_ joined | 00:13 |
| ← qpdb left | 00:15 |
| ← Lord_of_Life left | 00:17 |
| ← atharvaraykar left | 00:17 |
| → nate1 joined | 00:18 |
| → Lord_of_Life joined | 00:19 |
| ← arcatech left | 00:20 |
| → Dragoon joined | 00:21 |
| → arcatech joined | 00:21 |
| → atharvaraykar joined | 00:28 |
| → PaMeDa joined | 00:28 |
| → DevAntoine joined | 00:31 |
| ← apauli left | 00:32 |
| ← atharvaraykar left | 00:33 |
| ← nate1 left | 00:35 |
| ← DevAntoine left | 00:36 |
| ← jazzy left | 00:38 |
| ← shailangsa left | 00:40 |
| → nate1 joined | 00:41 |
|
AndroidDAW
| i got my pre builder working with sub modules (i hope) | 00:44 |
| ← Dragoon left | 00:45 |
| → Dragoon joined | 00:45 |
| → atharvaraykar joined | 00:46 |
|
AndroidDAW
| also as you can see from the number of commits, i have spent a lot of time of trail and error trying to get this to work :) | 00:48 |
| ← zeenk left | 00:48 |
|
imMute
| AndroidDAW: 'git submodule update' puts the submodule in a detached HEAD, that's just what submods do. | 00:49 |
|
| "git checkout origin" doesn't sound like something that would work unless you had a branch/tag called "origin" | 00:49 |
| ← atharvaraykar left | 00:50 |
|
AndroidDAW
| ok | 00:52 |
| → YuGiOhJCJ joined | 00:52 |
|
AndroidDAW
| forgot to post the repo lol https://github.com/mgood7123/prebuilder | 00:53 |
| → shailangsa joined | 00:54 |
| ← skapate left | 00:55 |
| → atharvaraykar joined | 01:02 |
| → Ranhir joined | 01:04 |
| ← ju left | 01:06 |
| ← atharvaraykar left | 01:07 |
| → ferdna joined | 01:19 |
| → atharvaraykar joined | 01:19 |
| → ph88_ joined | 01:19 |
|
ph88_
| how can i remove all tags that start with testtag- ? | 01:20 |
| → jmcantrell joined | 01:23 |
| → pete443 joined | 01:23 |
| ← atharvaraykar left | 01:24 |
| → __jmcantrell__ joined | 01:24 |
| ← pete443_ left | 01:25 |
| ← jmcantrell left | 01:28 |
| → jmcantrell joined | 01:34 |
| ← Torr left | 01:35 |
| → atharvaraykar joined | 01:36 |
| ← __jmcantrell__ left | 01:38 |
| ← Wuzzy left | 01:39 |
| ← atharvaraykar left | 01:41 |
| → AndroidD_ joined | 01:44 |
| ← AndroidDAW left | 01:48 |
| ← AndroidD_ left | 01:49 |
| ← hegstal left | 01:53 |
| → clf59 joined | 01:53 |
| → atharvaraykar joined | 01:55 |
| ← ghost43 left | 01:59 |
| ← nate1 left | 01:59 |
| → ghost43 joined | 01:59 |
| ← clf59 left | 02:01 |
| ← igemnace left | 02:10 |
| ← digup left | 02:11 |
| → digup joined | 02:12 |
| ← atharvaraykar left | 02:13 |
| → igemnace joined | 02:17 |
| ← igemnace left | 02:22 |
| → atharvaraykar joined | 02:26 |
| → finn_elija joined | 02:27 |
| ← FinnElija left | 02:27 |
| finn_elija → FinnElija | 02:27 |
| ← atharvaraykar left | 02:31 |
| ← ThorMojito left | 02:32 |
| → ThorMojito joined | 02:33 |
| ← pizdets left | 02:34 |
| → DevAntoine joined | 02:37 |
| → pizdets joined | 02:37 |
| → nyah joined | 02:38 |
| ← DevAntoine left | 02:41 |
| → atharvaraykar joined | 02:43 |
| ← atharvaraykar left | 02:48 |
| → Maxattax97 joined | 02:50 |
| ← ferdna left | 02:52 |
| → DevAntoine joined | 02:57 |
| → atharvaraykar joined | 03:02 |
| ← DevAntoine left | 03:02 |
| ← atharvaraykar left | 03:07 |
| ← beencubed left | 03:12 |
| ← digup left | 03:17 |
| → digup joined | 03:17 |
| → atharvaraykar joined | 03:17 |
| ← hbautista left | 03:18 |
| ← atharvaraykar left | 03:23 |
| → lgc joined | 03:30 |
| → lgc_ joined | 03:33 |
| ← lgc left | 03:35 |
| ← pulse left | 03:38 |
| → DevAntoine joined | 03:39 |
| ← DevAntoine left | 03:44 |
| → atharvaraykar joined | 03:50 |
| ← bket left | 03:50 |
| → nate1 joined | 04:04 |
| → fef joined | 04:04 |
| → Guest53 joined | 04:05 |
| ← atharvaraykar left | 04:08 |
| ← digup left | 04:15 |
| ← Guest53 left | 04:17 |
| → atharvaraykar joined | 04:21 |
| → DevAntoine joined | 04:21 |
| ← atharvaraykar left | 04:25 |
| ← DevAntoine left | 04:26 |
| → bket joined | 04:35 |
| → atharvaraykar joined | 04:38 |
| → Guest53 joined | 04:43 |
| ← Maxattax97 left | 04:48 |
| ← atharvaraykar left | 04:48 |
| ← keypusher left | 04:55 |
| ← Guest53 left | 04:56 |
| → Guest53 joined | 04:58 |
| → pizdets_ joined | 05:01 |
| → atharvaraykar joined | 05:01 |
| ← pizdets left | 05:01 |
| ← YuGiOhJCJ left | 05:01 |
| → YuGiOhJCJ joined | 05:02 |
| → DevAntoine joined | 05:03 |
| ← atharvaraykar left | 05:05 |
| ← arcatech left | 05:06 |
| ← DevAntoine left | 05:07 |
| ← Guest53 left | 05:08 |
| → arcatech joined | 05:08 |
| ← nate1 left | 05:12 |
| → atharvaraykar joined | 05:19 |
| → madewokherd` joined | 05:23 |
| ← atharvaraykar left | 05:24 |
| → Sasazuka joined | 05:25 |
| ← madewokherd left | 05:25 |
| ← arcatech left | 05:27 |
| → arcatech joined | 05:29 |
| ← arcatech left | 05:33 |
| → atharvaraykar joined | 05:35 |
| → nate1 joined | 05:37 |
| ← jmcantrell left | 05:39 |
| → arcatech joined | 05:39 |
| ← atharvaraykar left | 05:40 |
| ← nate1 left | 05:43 |
| → DevAntoine joined | 05:44 |
| → Vonter joined | 05:47 |
| ← DevAntoine left | 05:49 |
| ← arcatech left | 05:51 |
| → atharvaraykar joined | 05:52 |
| → nate1 joined | 05:57 |
| ← nate1 left | 06:02 |
| → computeiro joined | 06:02 |
| ← ThorMojito left | 06:05 |
| ← wender left | 06:05 |
| ← debsan_ left | 06:07 |
| ← gast0n left | 06:09 |
| ← atharvaraykar left | 06:10 |
| → nate1 joined | 06:15 |
| → atharvaraykar joined | 06:15 |
| ← nate1 left | 06:20 |
| → chexum joined | 06:24 |
| → Guest53 joined | 06:37 |
| → rsx joined | 06:50 |
| ← Guest53 left | 06:52 |
|
ikke
| ph88_: git for-each-ref --format="delete %(refname)" 'refs/tags/testtag-*' | git update-ref --stdin | 06:52 |
|
| something like that | 06:52 |
| → EvilDMP joined | 06:53 |
| ← thebombzen left | 06:56 |
| ← Vonter left | 06:58 |
| → Vonter joined | 06:59 |
| ← atharvaraykar left | 07:00 |
| → DevAntoine joined | 07:02 |
| → Guest53 joined | 07:02 |
| ← unluckyshrubbery left | 07:04 |
| → thebombzen joined | 07:05 |
| ← thebombzen left | 07:06 |
| → thebombzen joined | 07:08 |
| → atharvaraykar joined | 07:10 |
| → digup joined | 07:14 |
| ← Guest53 left | 07:19 |
| → dolor_avis joined | 07:20 |
| ← dolor_avis left | 07:23 |
| → beshr joined | 07:24 |
| ← DevAntoine left | 07:25 |
| ← discipulus left | 07:33 |
| → discipulus joined | 07:35 |
| ← AnAverageHuman left | 07:35 |
| → unixbhaskar joined | 07:36 |
| ← Betal left | 07:39 |
| → DevAntoine joined | 07:41 |
| → arash joined | 07:42 |
| → jazzy joined | 07:42 |
| ← discipulus left | 07:45 |
| → dolor_avis joined | 07:50 |
| ← milosz left | 07:56 |
| → supremekai2 joined | 07:57 |
| ← supremekai left | 08:01 |
| → discipulus joined | 08:01 |
| ← reset left | 08:01 |
| ← supremekai2 left | 08:02 |
| ← seand left | 08:02 |
| ← atharvaraykar left | 08:04 |
| → zeenk joined | 08:14 |
| → nate1 joined | 08:15 |
| → seand joined | 08:16 |
| → Lord_of_Life_ joined | 08:16 |
| ← dolor_avis left | 08:17 |
| ← hnOsmium0001 left | 08:17 |
| ← digup left | 08:17 |
| ← Lord_of_Life left | 08:20 |
| Lord_of_Life_ → Lord_of_Life | 08:20 |
| ← EvilDMP left | 08:20 |
| → AndroidDAW joined | 08:21 |
| ← nate1 left | 08:22 |
| ← arash left | 08:23 |
| ← DevAntoine left | 08:24 |
| → Guest9 joined | 08:29 |
| ← AbleBacon left | 08:34 |
| → arash joined | 08:35 |
| → currybullen joined | 08:38 |
| ← thebombzen left | 08:40 |
| → thebombzen joined | 08:44 |
| → igemnace joined | 08:47 |
| → Crassus joined | 08:49 |
| → offpics joined | 08:51 |
| → atharvaraykar joined | 08:54 |
| → blue_penquin joined | 08:54 |
| → DevAntoine joined | 08:57 |
| ← thunfisch left | 08:58 |
| ← Crassus left | 08:59 |
| → EvilDMP joined | 09:01 |
| ← DevAntoine left | 09:02 |
| → thunfisch joined | 09:05 |
| → unluckyshrubbery joined | 09:10 |
| ← EvilDMP left | 09:25 |
| ← Sasazuka left | 09:25 |
|
ph88_
| thanks ikke :) | 09:28 |
| → Sasazuka joined | 09:36 |
| → gas51627 joined | 09:38 |
| → DevAntoine joined | 09:39 |
| → nobody_ joined | 09:41 |
| → nate1 joined | 09:41 |
| ← DevAntoine left | 09:43 |
| ← nate1 left | 09:46 |
| ← Sasazuka left | 09:53 |
| ← currybullen left | 10:04 |
| → Crassus joined | 10:08 |
| ← yaymukund left | 10:09 |
| → yaymukund joined | 10:09 |
| → natrys joined | 10:15 |
| ← YuGiOhJCJ left | 10:16 |
| ← ph88_ left | 10:24 |
| ← nobody_ left | 10:25 |
| ← g2anj left | 10:33 |
| ← arash left | 10:37 |
| → g2anj joined | 10:38 |
| → EvilDMP joined | 10:39 |
| → arash joined | 11:05 |
| ← canton7 left | 11:10 |
| ← alip left | 11:10 |
| ← EvilDMP left | 11:10 |
| ← Guest37 left | 11:12 |
| → canton7 joined | 11:13 |
| ← blue_penquin left | 11:14 |
|
AndroidDAW
| https://github.com/mgood7123/prebuilder added readme | 11:14 |
|
ikke
| AndroidDAW: did you consider using deploy keys rather than PATs? | 11:15 |
|
| https://docs.github.com/en/developers/overview/managing-deploy-keys | 11:16 |
|
AndroidDAW
| deploy keys are per-repo, i dont like the idea of users generating a new deploy key for each repo they add to | 11:16 |
|
ikke
| so you ask access to their entire account? | 11:17 |
|
AndroidDAW
| however a PAT is not required specifically | 11:17 |
| → alfredb joined | 11:17 |
| ← jazzy left | 11:17 |
| ← arash left | 11:20 |
| → arash joined | 11:20 |
| → keypusher joined | 11:22 |
| ← emanuele6 left | 11:22 |
| → emanuele6 joined | 11:22 |
| → jwillikers joined | 11:27 |
| → pulse joined | 11:28 |
|
AndroidDAW
| re clarified in readme | 11:28 |
|
ikke
| I still don't get why you use a PAT for encrypting an ssh key | 11:30 |
|
| It can be any random secret | 11:30 |
| → EvilDMP joined | 11:30 |
|
ikke
| a PAT has no stronger security | 11:30 |
|
| in the sense that a PAT itself is not special | 11:30 |
|
| just the length | 11:30 |
|
| dd if=/dev/urandom count=24 bs=1 | base64 | 11:32 |
|
| That gives a 32 character password that has nothing to do with github (and thus cannot be used to compromise the user account) | 11:36 |
|
AndroidDAW
| https://github.com/mgood7123/prebuilder re-clarified readme | 11:37 |
| ← fef left | 11:38 |
|
ikke
| honestly, I would just ommit any mention of a PAT, and just say they should provide a strong random passphrase | 11:39 |
|
| This is a very bad recommendation | 11:40 |
|
| AndroidDAW: do you want to have the responsibility of people having their accounts compromised based on advise in this readme? | 11:41 |
|
AndroidDAW
| can a secret contain 133333 characters? | 11:41 |
|
ikke
| separate from limitations in the software, yes | 11:41 |
| → npoirot joined | 11:42 |
|
ikke
| I don't know github limitations | 11:42 |
| → nate1 joined | 11:42 |
|
ikke
| 64kb | 11:42 |
|
| https://docs.github.com/en/actions/reference/encrypted-secrets | 11:42 |
|
| should be plenty enough for most sane usecases | 11:43 |
| → DevAntoine joined | 11:44 |
|
ikke
| But I'll repeat what I said yesterday: why forcing people to add a private key to a repository | 11:45 |
|
| Just store the entire key as a secret in the first place | 11:45 |
|
| There are security scanners which will warn against private keys in repositories | 11:46 |
| ← nate1 left | 11:47 |
| ← DevAntoine left | 11:49 |
| → FH_thecat joined | 11:56 |
|
AndroidDAW
| https://github.com/mgood7123/prebuilder how is this now? | 11:58 |
|
ikke
| At least a lot better | 11:59 |
|
AndroidDAW
| yay | 12:00 |
| ← FH_thecat left | 12:00 |
| → ahunt joined | 12:02 |
| → kenanmarasli joined | 12:03 |
| ← Nalt left | 12:04 |
| → Nalt joined | 12:04 |
| → DevAntoine joined | 12:05 |
| ← ackyshake left | 12:06 |
| → absc joined | 12:07 |
| ← EvilDMP left | 12:07 |
| → otisolsen70 joined | 12:08 |
| ← DevAntoine left | 12:10 |
| ← arash left | 12:25 |
|
AndroidDAW
| fixed OS detection in split-files action | 12:26 |
| ← Guest9 left | 12:31 |
| ← fflam left | 12:36 |
| → Torr joined | 12:39 |
| queeries → Soni | 12:41 |
| ← adl_ left | 12:42 |
| → fef joined | 12:42 |
| → nate1 joined | 12:42 |
| ← absc left | 12:44 |
| → DevAntoine joined | 12:47 |
| ← nate1 left | 12:47 |
| Walex_ → Walex | 12:48 |
| ← DevAntoine left | 12:52 |
| → arash joined | 13:00 |
| → nate1 joined | 13:01 |
| ← shailangsa left | 13:01 |
| ← wodim left | 13:02 |
| ← nate1 left | 13:07 |
| ← gas51627 left | 13:08 |
| ← arash left | 13:12 |
| ← igemnace left | 13:15 |
| → arash joined | 13:16 |
| ← arash left | 13:24 |
| → gas51627 joined | 13:27 |
| → Guest9 joined | 13:30 |
| ← unixbhaskar left | 13:32 |
| → fstd joined | 13:34 |
| → alip joined | 13:35 |
| ← alip left | 13:35 |
| → alip joined | 13:36 |
| ← alip left | 13:37 |
| → alip joined | 13:37 |
| ← fef left | 13:39 |
| ← alip left | 13:39 |
| → alip joined | 13:39 |
| ← alip left | 13:40 |
| ← fstd left | 13:40 |
| → alip joined | 13:40 |
| → fstd joined | 13:40 |
| ← alip left | 13:40 |
| → alip joined | 13:41 |
| → AnAverageHuman joined | 13:41 |
| ← alip left | 13:42 |
| → alip joined | 13:43 |
| ← alip left | 13:43 |
| → fef joined | 13:45 |
| ← stkrdknmibalz left | 13:46 |
| ← rsx left | 13:48 |
| → nobody_ joined | 13:48 |
| ← jwillikers left | 13:52 |
| → debsan_ joined | 13:55 |
| → EvilDMP joined | 14:04 |
| → arash joined | 14:06 |
| → zebrag joined | 14:07 |
| ← Notgnoshi left | 14:09 |
| ← Murr left | 14:10 |
| → Murr joined | 14:10 |
| ← arash left | 14:12 |
| → mrig joined | 14:14 |
| → Adoi joined | 14:15 |
| → arash joined | 14:17 |
|
mrig
| Hello, im experiencing a slight difference in behavior between two different remote bare repos and would like to try to understand why it is that they are behaving differently. One is working fine, I have it set up so that when I push to the repo a post-update script is working just fine to get a local repository to checkout the new head. But in a second repo, the initial clone from the repo is found | 14:19 |
|
| in a headless state, fixed by checking out the master, however the same script run as a hook will not work. What is the difference between the two repositories? | 14:19 |
| ← Crassus left | 14:20 |
| → Crassus joined | 14:21 |
| ← Adoi left | 14:22 |
| → AbleBacon joined | 14:22 |
| → jmcantrell joined | 14:24 |
| ← arash left | 14:24 |
|
cbreak
| show the script | 14:28 |
|
dzho
| (in a pastebin) | 14:28 |
| → theoceaniscool joined | 14:28 |
|
dzho
| (or some other link) | 14:28 |
| → ThorMojito joined | 14:29 |
| ← jmcantrell left | 14:34 |
| → skapata joined | 14:34 |
|
dzho
| Not being that conversant with git hooks generally, I'm looking at the online version of the git book's page on git hooks (https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks). I see no mention of a 'post-update' anything. | 14:34 |
|
| The closest I find are the server-side hooks 'update' and 'post-receive'. I wonder if we're talking about either of these, and if so, which one? | 14:35 |
|
mrig
| This is the script : https://termbin.com/9s67 | 14:35 |
| → dhch6 joined | 14:35 |
| → arash joined | 14:36 |
|
dzho
| is it the checkout that fails or the exec of the additional script? | 14:36 |
| ← dhch left | 14:38 |
| dhch6 → dhch | 14:38 |
|
mrig
| the checkout, if I go into the remote, but local to that remote repo, the one linked in the script and perform git pull manually, then it contains the latest version. | 14:38 |
| → Pacific_ joined | 14:39 |
| → rewrit3 joined | 14:40 |
|
dzho
| I'm confused about this remote: I thought you said it was a bare repo? | 14:41 |
|
| maybe I don't understand what you mean by going into it | 14:41 |
|
| you're ssh'ing to a remote Unix-like host of some kind and then doing what? | 14:42 |
| ← arash left | 14:42 |
| ← Pacific_ left | 14:42 |
|
mrig
| I have a bare repo on my remote host and also a clone on the host that I use to build. | 14:43 |
|
dzho
| also there's a panoply of file and directory ownership and permissions things that could be wrong | 14:43 |
| → Pacific_ joined | 14:43 |
|
mrig
| so when I push to the remote repo the source code on the host that I use to build from is updated automatically. | 14:43 |
|
dzho
| ah | 14:44 |
| → DevAntoine joined | 14:44 |
|
mrig
| I checked the permissions are the same and they are, yes I'm aware that this is quite a complicated area of mixed concerns. I was wondering if there were something about the repo locally that I am missing or not understanding. | 14:44 |
|
dzho
| I'm afraid I haven't developed much in the way of intuition about this usage to be of help but maybe someone else has ideas as to where to go with this | 14:45 |
|
mrig
| why one would be received by a bare repo and when a clone made no questions asked, whereas the other is in a headless state. | 14:46 |
|
| dzho: Thank you for taking the time to have a look at it. | 14:46 |
| → dhch9 joined | 14:48 |
| ← dhch left | 14:48 |
| dhch9 → dhch | 14:48 |
| ← DevAntoine left | 14:48 |
| ← Guest9 left | 14:50 |
| ← dhch left | 14:51 |
| ← Trieste left | 14:53 |
| → dhch joined | 14:53 |
| → arash joined | 14:54 |
| ← Pacific_ left | 14:56 |
| → Guest53 joined | 14:57 |
| ← atharvaraykar left | 15:00 |
| → nate1 joined | 15:03 |
| ← AbleBacon left | 15:05 |
| ← Guest53 left | 15:07 |
| ← nate1 left | 15:12 |
| → atharvaraykar joined | 15:12 |
| → mokulus joined | 15:13 |
| ← arash left | 15:13 |
| → digup joined | 15:16 |
| ← atharvaraykar left | 15:17 |
| ← nobody_ left | 15:21 |
| → Guest53 joined | 15:23 |
| → DevAntoine joined | 15:25 |
| → nate1 joined | 15:26 |
| ← DevAntoine left | 15:30 |
| → atharvaraykar joined | 15:31 |
| ← theoceaniscool left | 15:32 |
| ← lgc_ left | 15:33 |
| → alip joined | 15:34 |
| ← StanleyChan[m] left | 15:41 |
| ← nate1 left | 15:43 |
| ← keypusher left | 15:45 |
| → DevAntoine joined | 15:46 |
| → arash joined | 15:47 |
| → nate1 joined | 15:47 |
| ← AndroidDAW left | 15:48 |
| → hbautista joined | 15:50 |
| ← DevAntoine left | 15:51 |
| → karab44 joined | 15:52 |
| ← offpics left | 15:52 |
| ← sunyibo left | 15:53 |
| → sunyibo joined | 15:53 |
| ← karab44 left | 15:58 |
| → _karab44 joined | 15:58 |
| ← atharvaraykar left | 15:59 |
| → arcatech joined | 16:04 |
| → absc joined | 16:09 |
| → atharvaraykar joined | 16:11 |
| ← AnAverageHuman left | 16:11 |
| ← atharvaraykar left | 16:15 |
| → stkrdknmibalz joined | 16:17 |
| ← gas51627 left | 16:18 |
| → AnAverageHuman joined | 16:23 |
| → hnOsmium0001 joined | 16:23 |
| ← r2p2 left | 16:25 |
| → r2p2 joined | 16:25 |
| → DevAntoine joined | 16:28 |
| → atharvaraykar joined | 16:28 |
| ← atharvaraykar left | 16:32 |
| ← DevAntoine left | 16:32 |
| ← fef left | 16:39 |
| → fef joined | 16:40 |
| ← alip left | 16:49 |
| → keypusher joined | 16:51 |
| ← m0viefreak left | 16:51 |
| → atharvaraykar joined | 16:54 |
| → sudomann joined | 17:08 |
|
sudomann
| do I need to push after merge? | 17:08 |
| → madewokherd joined | 17:13 |
| → alip joined | 17:14 |
| ← madewokherd` left | 17:16 |
| → Meh joined | 17:18 |
| Meh → Guest2930 | 17:19 |
| ← nate1 left | 17:23 |
| ← _karab44 left | 17:23 |
| ← Guest2930 left | 17:23 |
| → nate1 joined | 17:24 |
| ← digup left | 17:24 |
| → AndroidDAW joined | 17:27 |
| ← alip left | 17:29 |
| ← nate1 left | 17:29 |
| ← AndroidDAW left | 17:32 |
|
cbreak
| sudomann: only if you want the commit you created / the history you manipulated to end up somewhere else | 17:33 |
| → r2p24 joined | 17:34 |
| → shailangsa joined | 17:34 |
| ← r2p2 left | 17:34 |
| r2p24 → r2p2 | 17:34 |
| ← keypusher left | 17:35 |
| ← thunfisch left | 17:43 |
| → thunfisch joined | 17:43 |
| → nate1 joined | 17:48 |
| ← mokulus left | 17:50 |
| → Guest9 joined | 17:54 |
| → happy-dude joined | 17:56 |
| ← fef left | 17:56 |
| ← nate1 left | 18:01 |
| → AnapodoPsalidaki joined | 18:01 |
| → reset joined | 18:02 |
| ← EvilDMP left | 18:02 |
| ← shabius left | 18:08 |
| → EvilDMP joined | 18:09 |
| → alip joined | 18:09 |
| → Adoi joined | 18:10 |
| ← Guest9 left | 18:12 |
| ← EvilDMP left | 18:13 |
| → Pacific_ joined | 18:13 |
| ← arash left | 18:16 |
| → EvilDMP joined | 18:17 |
|
j416
| sudomann: everything is local until you decide it's not | 18:19 |
|
| sudomann: (by pushing something elsewhere, or fetching from elsewhere) | 18:20 |
| → karab44 joined | 18:24 |
| → nate1 joined | 18:27 |
| ← EvilDMP left | 18:28 |
| → keypusher joined | 18:30 |
| ← Adoi left | 18:31 |
| → mokulus joined | 18:31 |
| ← mokulus left | 18:33 |
| → DevAntoine joined | 18:33 |
| → mattf joined | 18:34 |
|
mattf
| when merging and I have conflics for a file, how can I tell it to automaticall keep the HEAD as it is | 18:35 |
|
| like just keep everything as in HEAD | 18:35 |
| ← nate1 left | 18:36 |
|
mattf
| oh i found it, -Xours | 18:36 |
|
bremner
| -s ours I think | 18:37 |
|
ikke
| -Xours chooses our version when conflicts arrise | 18:37 |
|
| -s ours just does not merge any files | 18:37 |
| → EvilDMP joined | 18:37 |
| ← DevAntoine left | 18:38 |
| ← rewrit3 left | 18:40 |
| → rewrit3 joined | 18:44 |
| → supremekai joined | 18:48 |
| ← supremekai left | 18:48 |
| → supremekai joined | 18:48 |
| ← supremekai left | 18:52 |
| → supremekai2 joined | 18:52 |
| → DevAntoine joined | 18:54 |
| → Mental_Inflation joined | 18:54 |
| → nate1 joined | 18:58 |
| ← DevAntoine left | 18:59 |
| ← happy-dude left | 19:01 |
| → vdamewood joined | 19:02 |
| ← nate1 left | 19:03 |
| ← hbautista left | 19:04 |
| ← zeenk left | 19:12 |
| → zeenk joined | 19:13 |
| → nate1 joined | 19:16 |
| → theoceaniscool joined | 19:16 |
| ← fnurkla left | 19:18 |
| → shabius joined | 19:18 |
| ← nate1 left | 19:21 |
| ← Mental_Inflation left | 19:31 |
| ← mattf left | 19:34 |
| → DevAntoine joined | 19:35 |
| → ackyshake joined | 19:36 |
| ← natechan left | 19:38 |
| ← DevAntoine left | 19:40 |
| ← ahunt left | 19:41 |
| ← rafspiny left | 19:43 |
| → jmcantrell joined | 19:49 |
| → tang^ joined | 19:50 |
|
jmcantrell
| When specifying commits, what does @{u} refer to and where can I find details about it in the docs? | 19:50 |
|
henk
| jmcantrell: upstream and man gitrevisions | 19:51 |
|
gitinfo
| jmcantrell: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html | 19:51 |
| ← Pacific_ left | 19:51 |
|
jmcantrell
| thanks | 19:51 |
| → chrysanthematic joined | 19:53 |
| → otisolsen70_ joined | 19:53 |
| ← otisolsen70_ left | 19:54 |
| → _karab44 joined | 19:58 |
| ← otisolsen70 left | 19:58 |
| ← _karab44 left | 19:59 |
| ← karab44 left | 19:59 |
| ← jimklimov1 left | 19:59 |
| → jimklimov joined | 20:01 |
| ← atharvaraykar left | 20:04 |
| → supremekai3 joined | 20:08 |
| ← supremekai2 left | 20:11 |
| ← theoceaniscool left | 20:12 |
| → GNUcifer joined | 20:14 |
| ← natrys left | 20:14 |
| ← cehteh left | 20:14 |
| GNUcifer → cehteh | 20:14 |
| ← Crassus left | 20:15 |
| ← alfredb left | 20:16 |
| → supremekai2 joined | 20:30 |
| ← supremekai3 left | 20:34 |
| ← Torr left | 20:36 |
| → natechan joined | 20:46 |
| ← Nalt left | 20:53 |
| ← chrysanthematic left | 21:00 |
| ← absc left | 21:01 |
| → gast0n joined | 21:04 |
| ← tang^ left | 21:05 |
| ← ghost43 left | 21:06 |
| → ghost43_ joined | 21:06 |
| ← thebombzen left | 21:07 |
| → jazzy joined | 21:10 |
| ← EvilDMP left | 21:11 |
| → m0viefreak joined | 21:15 |
| → nate1 joined | 21:16 |
| → atharvaraykar joined | 21:19 |
| ← nate1 left | 21:21 |
| → Sasazuka joined | 21:22 |
| ← dka left | 21:27 |
| → thebombzen joined | 21:27 |
| → absc joined | 21:27 |
| → Nalt joined | 21:28 |
| → AndroidDAW joined | 21:30 |
| ← AndroidDAW left | 21:30 |
| → AndroidDAW joined | 21:31 |
| ← keypusher left | 21:35 |
| ← AndroidDAW left | 21:36 |
| ← thebombzen left | 21:40 |
| → thebombzen joined | 21:40 |
| → DevAntoine joined | 21:41 |
| → thiago joined | 21:41 |
| → nate1 joined | 21:42 |
| → AndroidDAW joined | 21:42 |
| → dka joined | 21:43 |
| ← atharvaraykar left | 21:45 |
| ← DevAntoine left | 21:46 |
| ← nate1 left | 21:51 |
| → Torr joined | 21:51 |
| ← absc left | 21:56 |
| ← AnapodoPsalidaki left | 21:58 |
| → DevAntoine joined | 22:02 |
| ← srinidhi left | 22:05 |
| ← DevAntoine left | 22:07 |
| → atharvaraykar joined | 22:13 |
| ← mrig left | 22:17 |
| ← atharvaraykar left | 22:18 |
| → tang^ joined | 22:20 |
| → nattiestnate joined | 22:29 |
| → ZachGibbens joined | 22:29 |
| ← foureyes left | 22:33 |
| → AbleBacon joined | 22:36 |
| ← nattiestnate left | 22:38 |
| ← zeenk left | 22:42 |
| → DevAntoine joined | 22:43 |
| ← DevAntoine left | 22:48 |
| ← ZachGibbens left | 22:53 |
| → ZachGibbens joined | 22:53 |
| → Notgnoshi joined | 22:56 |
| → nots joined | 22:56 |
| ← nots left | 22:57 |
| ← jsrnop left | 23:00 |
| → jsrnop joined | 23:01 |
| ← Nalt left | 23:06 |
| Noisytoot → N7t | 23:06 |
| → foureyes joined | 23:07 |
| N7t → Noisytoot | 23:10 |
| ← tang^ left | 23:13 |
| ← supremekai2 left | 23:18 |
| ← thiago left | 23:19 |
| → Nalt joined | 23:23 |
| ← rewrit3 left | 23:24 |
| → DevAntoine joined | 23:25 |
| ← DevAntoine left | 23:30 |
| ← jmcantrell left | 23:40 |
| → jmcantrell joined | 23:41 |
| ← wootehfoot left | 23:42 |
| → nate1 joined | 23:46 |
| ← nate1 left | 23:52 |
| ← betelgeuse left | 23:52 |
| → mthall joined | 23:56 |
| ← jazzy left | 23:57 |
| ← wolfshappen left | 23:58 |
| ← thekingofbandit left | 23:58 |
| ← tejr left | 23:58 |
| → matthewcroughan_ joined | 23:58 |
| ← ghost43_ left | 23:59 |
| ← mthall left | 23:59 |
| → ghost43 joined | 23:59 |
| → tejr joined | 23:59 |
| ← matthewcroughan left | 23:59 |
| → wolfshappen joined | 23:59 |
| → mthall joined | 23:59 |