| 2018-12-30 |
| ← danielj_co left | 00:00 |
| → dreiss joined | 00:03 |
| ← finalbeta left | 00:04 |
| ← AtumT left | 00:05 |
| ← donofrio left | 00:06 |
| → snowgoggles joined | 00:08 |
| → donofrio joined | 00:08 |
| ← oojacoboo left | 00:11 |
| → oojacoboo joined | 00:13 |
| → armyriad joined | 00:15 |
| → th3m1s joined | 00:16 |
| ← Regon left | 00:16 |
| → dansan_ joined | 00:19 |
| ← donofrio left | 00:21 |
| ← thiago left | 00:23 |
| ← reactormonk left | 00:24 |
| → orbyt_ joined | 00:28 |
| → thiago joined | 00:28 |
| → iam730 joined | 00:29 |
| ← n3wborn left | 00:33 |
| ← thiago left | 00:36 |
| ← TheRuckus left | 00:36 |
| ← boombatower left | 00:38 |
| ← dreiss left | 00:38 |
| → donofrio joined | 00:41 |
| → danielj_co joined | 00:51 |
| ← danielj44 left | 00:53 |
| → im0nde joined | 00:55 |
| → life23 joined | 00:58 |
| → yyy joined | 00:58 |
| ← donofrio left | 01:00 |
| ← snowgoggles left | 01:07 |
| ← mobile_c_ left | 01:08 |
| → thomasross_ joined | 01:10 |
| ← thomasross left | 01:10 |
| thomasross_ → thomasross | 01:10 |
| ← thomasross left | 01:11 |
| → dreiss joined | 01:11 |
| → thomasross joined | 01:11 |
| ← thomasross left | 01:13 |
| ← yyy left | 01:13 |
| → thomasross joined | 01:13 |
| ← netj left | 01:20 |
| → netj joined | 01:20 |
| ← acidjnk left | 01:20 |
| ← dreiss left | 01:21 |
| → shiva__ joined | 01:23 |
| ← dege left | 01:31 |
| → KnoP joined | 01:39 |
| ← th3m1s left | 01:40 |
| ← KnoP left | 01:44 |
| ← iam730 left | 01:46 |
| ← plexigras left | 01:54 |
| ← Cabanossi left | 01:56 |
| → Cabanossi joined | 01:57 |
| ← cfoch left | 01:57 |
| ← xcm left | 01:58 |
| → xcm joined | 01:58 |
| → finalbeta joined | 02:02 |
| → DolphinDream joined | 02:03 |
| ← ph88 left | 02:03 |
| ← thomasross left | 02:05 |
| → thomasross joined | 02:05 |
| ← jhammons left | 02:06 |
| ← thomasross left | 02:06 |
| → ph88 joined | 02:07 |
| → thomasross joined | 02:08 |
| ← dviola left | 02:15 |
| ← gxt left | 02:24 |
| ← YuGiOhJCJ left | 02:26 |
| → YuGiOhJCJ joined | 02:27 |
| ← DolphinDream left | 02:38 |
| ← noboruma left | 02:41 |
| lagothrix → Guest6738 | 03:09 |
| ← Guest6738 left | 03:09 |
| → lagothrix joined | 03:09 |
| ← YuGiOhJCJ left | 03:13 |
| → YuGiOhJCJ2 joined | 03:13 |
| → justanotheruser joined | 03:14 |
| ← ph88 left | 03:16 |
| ← aw1 left | 03:18 |
| ← mitchell left | 03:19 |
| → DolphinDream joined | 03:20 |
| ← YuGiOhJCJ2 left | 03:29 |
| → SwiftMatt joined | 03:34 |
| ← SwiftMatt left | 03:35 |
| ← shiva__ left | 03:35 |
| → in1t3r joined | 03:36 |
| → heroux joined | 03:40 |
| ← liefer left | 03:47 |
| → liefer joined | 03:47 |
| → SwiftMatt joined | 03:47 |
| ← SwiftMatt left | 03:49 |
| → mat001 joined | 03:51 |
| → snowgoggles joined | 03:55 |
| → chrisml joined | 03:57 |
| → libertyprime joined | 04:04 |
| ← libertyprime left | 04:04 |
| → libertyprime joined | 04:05 |
| → dreiss joined | 04:14 |
| ← manuelschneid3r left | 04:27 |
| ← orbyt_ left | 04:45 |
| ← dreiss left | 04:45 |
| ← inkbottle left | 04:54 |
| → Cabanoss- joined | 04:54 |
| ← Cabanossi left | 04:55 |
| ← Mattiaslndstrm left | 04:56 |
| → inkbottle joined | 04:56 |
| ← kerframil left | 04:59 |
| → kerframil joined | 04:59 |
| ← netj left | 05:00 |
| → netj joined | 05:00 |
| → pks_ joined | 05:02 |
| ← snowgoggles left | 05:03 |
| ← pks left | 05:04 |
| pks_ → pks | 05:04 |
| ← Essadon left | 05:04 |
| → kapil____ joined | 05:07 |
| → mobile_c joined | 05:11 |
| → dreiss joined | 05:17 |
| → DrillTherapy joined | 05:20 |
| → KeyJoo joined | 05:22 |
| ← mowcat left | 05:33 |
| ← Envil left | 05:49 |
| → shaarad joined | 05:58 |
| ← dreiss left | 05:59 |
| → TrentonDAdams joined | 06:02 |
| → downer06 joined | 06:11 |
| ← DolphinDream left | 06:16 |
| → SwiftMatt joined | 06:19 |
| → DolphinDream joined | 06:21 |
| ← bneo99 left | 06:25 |
| ← armyriad left | 06:26 |
| ← shaarad left | 06:34 |
| ← SwiftMatt left | 06:38 |
| ← xcm left | 06:39 |
| → xcm joined | 06:39 |
| ← DolphinDream left | 06:47 |
| → DolphinDream joined | 06:48 |
| → geekodour08 joined | 06:48 |
| → sourcream joined | 06:56 |
| → moei joined | 07:05 |
| ← PioneerAxon_ left | 07:07 |
| → PioneerAxon joined | 07:08 |
| ← sourcream left | 07:11 |
| → dreiss joined | 07:11 |
| → fatalhalt joined | 07:14 |
| → stitched_unicorn joined | 07:14 |
| → SwiftMatt joined | 07:17 |
| ← SwiftMatt left | 07:17 |
| → crimastergogo joined | 07:22 |
| ← libertyprime left | 07:23 |
| ← crimastergogo left | 07:37 |
| → reactormonk joined | 07:37 |
| → shaarad joined | 07:39 |
| → danielj81 joined | 07:41 |
| ← danielj_co left | 07:44 |
| ← TrentonDAdams left | 07:45 |
| → TrentonDAdams joined | 07:46 |
| → strugee joined | 07:49 |
| ← stitched_unicorn left | 07:56 |
| → crimastergogo joined | 07:58 |
| ← crimastergogo left | 08:00 |
| ← reactormonk left | 08:02 |
| ← DolphinDream left | 08:03 |
| → reactormonk joined | 08:04 |
| ← KeyJoo left | 08:08 |
| → cafx joined | 08:11 |
| → stitched_unicorn joined | 08:12 |
| → czart joined | 08:12 |
| ← dreiss left | 08:15 |
| → dreiss joined | 08:16 |
| ← stitched_unicorn left | 08:22 |
| ← reactormonk left | 08:28 |
| ← silverfall left | 08:29 |
| ← shaarad left | 08:36 |
| → reactormonk joined | 08:40 |
| ← mat001 left | 08:40 |
| → silverfall joined | 08:42 |
| → ferdna joined | 08:49 |
| ← dansan_ left | 08:51 |
| → keepLearning512 joined | 08:53 |
| ← mooasaurus left | 09:04 |
| → mooasaurus joined | 09:05 |
| ← GreenJello left | 09:09 |
| ← dreiss left | 09:10 |
| ← geekodour08 left | 09:13 |
| → geekodour08 joined | 09:15 |
| → agowa338 joined | 09:16 |
| ← ferdna left | 09:17 |
| ← strugee left | 09:17 |
| → n3wborn joined | 09:18 |
| → strugee joined | 09:20 |
| ← geekodour08 left | 09:20 |
| ← dermoth left | 09:20 |
| ← Goplat left | 09:24 |
| ← kerframil left | 09:26 |
| → stitched_unicorn joined | 09:45 |
| ← strugee left | 09:52 |
| → strugee joined | 09:54 |
| ← stitched_unicorn left | 10:02 |
| → dre_ joined | 10:05 |
| → Milos joined | 10:08 |
| → plexigras joined | 10:12 |
| → Envil joined | 10:14 |
| → mbalmer joined | 10:15 |
|
mbalmer
| howdy. is this the right channel to ask questions about git problems? (git subtree split in my case) | 10:16 |
| ← catsup left | 10:17 |
| ← kadoban left | 10:17 |
| → catsup joined | 10:17 |
|
bremner
| mbalmer: this is the git user support channel, yes. You may have to be a bit patient, depending on the time of day. | 10:18 |
| ← catsup left | 10:18 |
| → catsup joined | 10:19 |
|
mbalmer
| ok fine then. git version 2.20.1 on Fedora 29, x86_64. git subtree split suddenly stops counting up the first number in its output, hangs forever, seems to consume memory, then segfaults, error messages hints at process_split_commit. | 10:20 |
|
| git fsck shown no anomalies, same thing happens when I freshly clone the repo. on macOS (git version 2.7.1) the same repo works wo issues. | 10:21 |
| ← agowa338 left | 10:23 |
|
bremner
| have you noticed the problem in other repos? | 10:24 |
|
| just tried 2.20 on a random repo here and split completed ok | 10:25 |
|
mbalmer
| No, only on this particular repo and only on fedora. | 10:26 |
|
| CentOS 7 is ok, macOS is ok. | 10:26 |
|
| (with the same repo) | 10:26 |
| ← kapil____ left | 10:27 |
|
bremner
| CentOS probably has a different git version | 10:27 |
| → agowa338 joined | 10:28 |
|
mbalmer
| when I do split -d, I see tons of "Processing commit: ...", "parents: ...", "incorrect order: ..." until it segfaults | 10:28 |
|
| CentOS 7 has 1.8.3.1 | 10:28 |
|
bremner
| sounds like it could be a regression in 2.20, but hard to debug if it's only that one repo | 10:29 |
|
mbalmer
| yes, indeed... otoh /usr/libexec/git-core/git-subtree is "only" a shell script. | 10:30 |
|
bremner
| if you are motivated you could try building git from source and running git-bisect on git.git | 10:33 |
|
mbalmer
| I never used git bisect, but maybe it's time to learn it. whats the url of the git repo? and, can I install a "home made" version alongside with the one from fedora? | 10:34 |
|
bremner
| https://github.com/git/git.git | 10:35 |
|
| and sure, just install it in /usr/local. Or your homedir. | 10:35 |
|
mbalmer
| ok, cloning it. | 10:36 |
| → SwiftMatt joined | 10:37 |
|
mbalmer
| so the correct tags are v2.20.1 and so on? I would now first try if the last version of v2.19 has the issue and then got back to 18 etc. | 10:38 |
|
bremner
| sounds right, although I don't have a clone of git.git here | 10:38 |
|
mbalmer
| bah, how to build that biest.....? | 10:39 |
|
bremner
| I suppose there's probably README and / or INSTALL | 10:39 |
| → libertyprime joined | 10:42 |
|
mbalmer
| there is... building it now. | 10:42 |
|
bremner
| hopefully you can run it from the build dir, not sure, but that would make debugging faster | 10:45 |
| → hussam joined | 10:47 |
|
mbalmer
| for now it says: git: 'subtree' is not a git command. See 'git --help'. | 10:47 |
|
| git-subtree seems not to be part of git proper... | 10:49 |
| ← SwiftMatt left | 10:50 |
| → jpf137 joined | 10:51 |
| → yyy joined | 10:53 |
|
bremner
| yeah, look in contrib/subtree | 10:53 |
| ← agowa338 left | 10:56 |
|
mbalmer
| so it's a regression. git-subtree from v2.19.2 works. | 11:00 |
|
bremner
| !list | 11:00 |
|
gitinfo
| [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git | 11:00 |
|
bremner
| you can report the regression ^. If you can share the data that will increase the chance of someone fixing it. | 11:01 |
|
mbalmer
| v2.20.0 shows the bug | 11:01 |
|
bremner
| you can also run git bisect to find the exact commit that broke things for you | 11:01 |
| ← dre_ left | 11:01 |
|
bremner
| e.g. git bisect good v2.19.2 | 11:02 |
|
mbalmer
| I think I alread found it. | 11:03 |
| → kapil____ joined | 11:05 |
|
mbalmer
| yep. found it. reverting 315a84f9aa0e2e629b0680068646b0032518ebed seems to fix it (actually reverted the last three commits) | 11:06 |
| → AtumT joined | 11:14 |
| → arch-1980 joined | 11:15 |
| → [Brain] joined | 11:16 |
| → dolphy joined | 11:17 |
| → Madmanden joined | 11:27 |
| ← netj left | 11:32 |
| → netj joined | 11:33 |
| → Fernando-Basso joined | 11:38 |
| ← dpyro left | 12:02 |
| → Regon joined | 12:05 |
| → KeyJoo joined | 12:08 |
| → RoriconKnight joined | 12:11 |
| → CodeSlingerPaul joined | 12:12 |
| ← RoriconKnight left | 12:14 |
| → SwiftMatt joined | 12:16 |
| → noboruma joined | 12:18 |
| → RoriconKnight joined | 12:19 |
| ← SwiftMatt left | 12:19 |
| → SwiftMatt joined | 12:25 |
| ← RoriconKnight left | 12:25 |
| ← yyy left | 12:27 |
| ← SwiftMatt left | 12:27 |
| → stitched_unicorn joined | 12:35 |
| ← liefer left | 12:45 |
| ← strugee left | 12:46 |
| → liefer joined | 12:46 |
| ← liefer left | 12:49 |
| → liefer joined | 12:49 |
| → strugee joined | 12:49 |
| ← liefer left | 12:55 |
| → liefer joined | 12:56 |
| ← liefer left | 12:59 |
| ← CodeSlingerPaul left | 13:03 |
| → liefer joined | 13:04 |
| ← liefer left | 13:07 |
| → Noti joined | 13:08 |
| ← arch-1980 left | 13:08 |
| → liefer joined | 13:09 |
| → SwiftMatt joined | 13:16 |
| ← dolphy left | 13:18 |
| ← SwiftMatt left | 13:19 |
| → yyy joined | 13:19 |
| → gitinfo joined | 13:20 |
| ChanServ set mode: +o | 13:20 |
| → YuGiOhJCJ joined | 13:28 |
| → manuelschneid3r joined | 13:29 |
| ← Noti left | 13:38 |
| ← Regon left | 13:44 |
| ← YuGiOhJCJ left | 13:51 |
| ← xcm left | 13:54 |
| → xcm joined | 13:54 |
| ← xcm left | 13:55 |
| → xcm joined | 13:56 |
| ← Fusl left | 14:03 |
| → YuGiOhJCJ joined | 14:03 |
| → Fusl joined | 14:03 |
| ← n3wborn left | 14:04 |
| ← inkbottle left | 14:06 |
| → Essadon joined | 14:06 |
| → inkbottle joined | 14:07 |
| ← Essadon left | 14:08 |
| → Essadon joined | 14:08 |
| → bebbet joined | 14:11 |
| ← czart left | 14:11 |
| ← Madmanden left | 14:14 |
| → shaarad joined | 14:23 |
| → mintux joined | 14:24 |
|
mintux
| my last commit is not master . how can i put master lable on last commit? http://upload.ericomgroup.com/uploads/47130.jpeg | 14:24 |
| → _kk22kk_ joined | 14:26 |
|
_ikke_
| mintux: In this case, git merge master should work | 14:30 |
| → mat001 joined | 14:38 |
| ← sauvin left | 14:44 |
| → ph88 joined | 14:46 |
| ← reactormonk left | 14:46 |
| → mobile_c_ joined | 14:46 |
| ← mobile_c left | 14:48 |
| → fahadash joined | 14:49 |
| → Regon joined | 14:50 |
| → czart joined | 14:56 |
|
jim
| can I get a hash to one of my commits, then get the next commit that happened? | 14:56 |
| ← czart left | 14:56 |
|
_ikke_
| jim: You can easily get the previous commit, but not the next one | 15:02 |
|
jim
| that's what I was afraid of | 15:02 |
|
| so the only real way to do that is have a program get the whole list of commits and put them in an array or something like that | 15:05 |
|
furrymcgee
| a branch | 15:05 |
|
jim
| that's kinda what I was thinking, only something that I can move either way with | 15:06 |
|
| this gitkraken thing, it's closed-source? | 15:06 |
|
_ikke_
| yes | 15:08 |
|
jim
| anything close that's open | 15:08 |
|
| ?? | 15:08 |
|
| -? | 15:09 |
| ← Copenhagen_Bram left | 15:10 |
| ← shaarad left | 15:10 |
| → sauvin joined | 15:17 |
| → gxt joined | 15:17 |
| → reactormonk joined | 15:17 |
| → yohnnyjoe joined | 15:26 |
| → Copenhagen_Bram joined | 15:30 |
|
_ikke_
| git cola perhaps | 15:31 |
| ← jpf137 left | 15:33 |
| ← kapil____ left | 15:35 |
|
jim
| I'll look at that | 15:37 |
| → thiago joined | 15:39 |
| ← liefer left | 15:45 |
| → liefer joined | 15:45 |
|
mintux
| _ikke_: if i don't want mereg and i want the current coomit be master | 15:46 |
| → davidfetter joined | 15:46 |
| → Mattiaslndstrm joined | 15:46 |
|
_ikke_
| mintux: git merge should fast-forward, so no merge commit is created | 15:47 |
|
mintux
| _ikke_: i did your command and some files from master commit add to this commit and make conflict | 15:48 |
|
| i mean: git merge master | 15:48 |
|
| i just want master lable come to current commit | 15:48 |
| ← strugee left | 15:49 |
| → skered joined | 15:50 |
| ← oojacoboo left | 15:54 |
| → strugee joined | 15:54 |
| ← thiago left | 16:02 |
| ← Copenhagen_Bram left | 16:03 |
| → mowcat joined | 16:04 |
| ← KeyJoo left | 16:07 |
| ← Mattiaslndstrm left | 16:08 |
| → edman007 joined | 16:10 |
| ← skered left | 16:11 |
| ← _kk22kk_ left | 16:14 |
|
edman007
| Hi, so I'm trying to figure out how to do this right, I have a (rather large) kernel patch from an old kernel, and I want to port it to a newer kernel, so I got the mainline stable git repository and I applied to patch into a new branch against the original, old kernel (3.4.113, I applied it against the commit tagged v3.4.113), anyways, I want to see if I can merge in all the changes after 3.4.113 on top of my patched branch, but I seem | 16:14 |
|
| to be getting conflicts doing this that are unrelated to my patch, how do I merge in these changes with git? | 16:14 |
| ← yohnnyjoe left | 16:17 |
| → Copenhagen_Bram joined | 16:17 |
| → czart joined | 16:19 |
| → jottr joined | 16:20 |
| → skered joined | 16:21 |
|
jim
| hmm. git cola doesn't seem to do anything when I try to open the repo | 16:24 |
| → dreiss joined | 16:30 |
|
jim
| yeah, git cola shows a window and the file->open command displays a file view (of my home dir, not the dir I'm cd-ed to), and, I navigate to projects, and it doesn't display anything | 16:30 |
| → tarkus joined | 16:32 |
| ← tarkus left | 16:33 |
|
jim
| err, ...navigate to projects, and I select one I know is under git, and it doesn't display anythying | 16:33 |
|
| sometimes I get: KSambaShare: Could not find smb.conf!, but I don't have any samba running | 16:34 |
| → dfee joined | 16:41 |
| → marataziat joined | 16:45 |
| ← jottr left | 16:50 |
| → dpyro joined | 16:56 |
| → TJ- joined | 16:59 |
| → dfaught joined | 17:00 |
| → iam730 joined | 17:00 |
| ← dfaught left | 17:01 |
| → dfaught joined | 17:02 |
| → jottr joined | 17:03 |
| ← dfaught left | 17:04 |
| → tarkus joined | 17:04 |
| → yyy- joined | 17:04 |
| → dfaught joined | 17:04 |
| ← Essadon left | 17:06 |
| ← yyy left | 17:06 |
| ← jottr left | 17:08 |
| ← yyy- left | 17:09 |
| → yyy joined | 17:10 |
| → Essadon joined | 17:12 |
| ← cbrt64 left | 17:12 |
| ← Essadon left | 17:12 |
| → Essadon joined | 17:13 |
| → cbrt64 joined | 17:13 |
| → Geminizer joined | 17:14 |
| ← cbrt64 left | 17:19 |
| ← strugee left | 17:21 |
| → jottr joined | 17:22 |
| → armyriad joined | 17:24 |
| → cbrt64 joined | 17:26 |
| ← jottr left | 17:27 |
| → strugee joined | 17:27 |
| ← dfee left | 17:34 |
| ← dreiss left | 17:34 |
| khisanth_ → Khisanth | 17:35 |
| ← Anthaas left | 17:37 |
| → Anthaas joined | 17:37 |
| ← mintux left | 17:38 |
| → Mattiaslndstrm joined | 17:39 |
| ← YuGiOhJCJ left | 17:39 |
| ← dpyro left | 17:44 |
| → estodiMania joined | 17:49 |
| → dpyro joined | 17:52 |
| → jottr joined | 17:58 |
| → orbyt_ joined | 18:00 |
| → dege joined | 18:00 |
| ← tarkus left | 18:00 |
| → GreenJello joined | 18:01 |
| ← jottr left | 18:09 |
| ← iam730 left | 18:10 |
| → Phylock joined | 18:11 |
| → iam730 joined | 18:13 |
| → blackmesa joined | 18:18 |
| → kadoban joined | 18:23 |
| ← iam730 left | 18:27 |
| → leeN joined | 18:28 |
| ← Geminizer left | 18:30 |
|
mingdao
| I don't want someone to hold my hand, but I would like a suggested reference. | 18:32 |
|
| I want to setup my own git repo for storing files. | 18:32 |
|
| Preferably on my own domain; if git is available for me to install there. | 18:32 |
|
bremner
| I guess this is discussed in !book | 18:32 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 18:32 |
|
bremner
| well, some of the the generic sysadmin stuff will not be there. | 18:33 |
|
mingdao
| If not, I can set it up on my LAN. I have 4 spare public IPs and intend to put another server online using one of them soon. | 18:33 |
|
bremner
| I don't understand the question "Preferably on my own domain; if git is available for me to | 18:34 |
|
| install there." | 18:34 |
|
| You'd have to get some kind of (virtual) server and install git on it. | 18:34 |
|
| probably a linux server unless you are a masochist. | 18:35 |
|
mingdao
| I only use Linux. | 18:35 |
|
| I have a domain hosted at 1and1.com | 18:35 |
|
| But the command `git` is not available there. | 18:35 |
| → regiontog joined | 18:36 |
|
mingdao
| I would like to store the repo on that domain ( http://www.happypenguincomputers.com/) | 18:36 |
|
| But maybe I can't, so I can just store in on a server here on my LAN. | 18:36 |
|
bremner
| that's a question you'd have sort out with whoever provides the hosting | 18:37 |
| → ferdna joined | 18:39 |
| → Goplat joined | 18:40 |
| ← nowhere_man left | 18:41 |
| ← cbrt64 left | 18:45 |
| ← czart left | 18:47 |
| → cbrt64 joined | 18:47 |
|
mingdao
| Looking in the online stuff it states "No, Git is pre-installed in the Web Hosting already. You can use Git immediately." | 18:49 |
|
| And To use Git, you need a Web Hosting Linux package. Git is not available on Web HostingWindows packages. | 18:49 |
|
| Which I do. | 18:49 |
|
| So, off to learning for me. | 18:49 |
| ← estodiMania left | 18:49 |
| → mostlybadfly joined | 18:51 |
| → Makaveli7 joined | 18:53 |
| ← Makaveli7 left | 18:54 |
| ← marataziat left | 18:55 |
| ← Khisanth left | 19:02 |
| → jstimm joined | 19:07 |
| → nowhere_man joined | 19:14 |
| → Khisanth joined | 19:16 |
| → Narrat joined | 19:17 |
| ← sauvin left | 19:19 |
| → sauvin joined | 19:20 |
| ← nowhere_man left | 19:26 |
| → shicks2525 joined | 19:27 |
| → jottr joined | 19:30 |
| ← orbyt_ left | 19:32 |
| → nowhere_man joined | 19:33 |
| → jayjo joined | 19:34 |
|
jayjo
| I have a git repo on my workstation in my small home network... how do I run a daemon on my workstation so I can push/pull from my laptop on the same network? | 19:34 |
|
| Do I need to treat it as a full server? Do the --bare from the working git repo etc ? | 19:35 |
| ← nowhere_man left | 19:35 |
| ← jottr left | 19:36 |
| → nowhere_man joined | 19:36 |
| ← nowhere_man left | 19:41 |
| → troyt joined | 19:42 |
| → discopatrick joined | 19:46 |
| ← keepLearning512 left | 19:46 |
| ← strugee left | 19:47 |
| → keepLearning512 joined | 19:47 |
| → strugee joined | 19:47 |
| ← ph88 left | 19:49 |
| ← libertyprime left | 19:50 |
| ← keepLearning512 left | 19:52 |
| → ph88 joined | 19:52 |
| ← noboruma left | 19:53 |
| ← troyt left | 19:53 |
| mobile_c_ → mobile_c | 20:00 |
| → libertyprime joined | 20:06 |
| → jottr joined | 20:08 |
| → nowhere_man joined | 20:10 |
| ← jottr left | 20:12 |
| → ijash joined | 20:15 |
| ← Fernando-Basso left | 20:16 |
| ← nowhere_man left | 20:17 |
| → sanscoeur joined | 20:21 |
| → AtumT_ joined | 20:25 |
| → orbyt_ joined | 20:25 |
| ← stitched_unicorn left | 20:26 |
| → egc joined | 20:26 |
| ← ph88 left | 20:28 |
| ← AtumT left | 20:28 |
| → ph88 joined | 20:28 |
| → troyt joined | 20:30 |
| ← thebope left | 20:32 |
| → AtumT joined | 20:39 |
| → jottr joined | 20:39 |
| ← AtumT_ left | 20:39 |
| → Makaveli7 joined | 20:40 |
| → nowhere_man joined | 20:42 |
| ← jottr left | 20:44 |
| ← sanscoeur left | 20:44 |
|
grawity
| jayjo: yes | 20:44 |
|
| the transport can be just regular SSH, for simplicity | 20:45 |
| → fstd_ joined | 20:46 |
|
grawity
| there's an option to allow pushes into the working tree (receive.denyCurrentBranch=updateInstead), but imho, if you want a central server, then make it a --bare repo | 20:46 |
| ← gitinfo left | 20:47 |
| → jsatk joined | 20:47 |
| ← Makaveli7 left | 20:47 |
| ← nowhere_man left | 20:49 |
| ← ijash left | 20:49 |
| ← fstd left | 20:49 |
| fstd_ → fstd | 20:49 |
| → gitinfo joined | 20:51 |
| ChanServ set mode: +o | 20:51 |
| ← translucentCode left | 21:02 |
| → spacesuitdiver joined | 21:05 |
| → noboruma joined | 21:10 |
| ← diogenese left | 21:13 |
| → diogenese joined | 21:13 |
| → jottr joined | 21:15 |
| → nowhere_man joined | 21:17 |
| ← jottr left | 21:19 |
| → jottr joined | 21:20 |
| ← mostlybadfly left | 21:21 |
| → thebope joined | 21:31 |
| ← Phylock left | 21:31 |
| ← strugee left | 21:32 |
| → lucasb joined | 21:32 |
| → irc_viewer_test joined | 21:36 |
| → strugee joined | 21:36 |
| ← Mattiaslndstrm left | 21:36 |
| cafx → raindrop | 21:38 |
| → supernovah joined | 21:39 |
| → rewt joined | 21:42 |
| ← irc_viewer_test left | 21:44 |
| ← netj left | 21:47 |
| → netj joined | 21:47 |
| ← rewt left | 21:49 |
| → rewt`` joined | 21:49 |
| rewt`` → rewt | 21:50 |
| ← libertyprime left | 21:53 |
| ← shabius left | 21:54 |
| → hahuang65 joined | 21:54 |
| → shabius joined | 21:54 |
| → settermjd joined | 21:54 |
| ← discopatrick left | 21:55 |
| ← settermjd left | 21:56 |
| → adfeno joined | 21:56 |
|
adfeno
| Hi there | 21:57 |
| ← Cabanoss- left | 21:57 |
| → Cabanossi joined | 21:57 |
| ← rewt left | 21:58 |
|
adfeno
| `git format-patch HEAD~1` is including some base64-encoded data for files that are actually removed in HEAD (they were removed using `git rm` and the commit with such information was made) | 21:58 |
| ← thebope left | 21:59 |
|
adfeno
| Is that base64 inclusion normal for git format-patch? I expected it to just say that it had zero size or was removed. | 21:59 |
| → thebope joined | 21:59 |
|
osse
| adfeno: Not really sure, but my intuition says yes. Otherwise it could potentially remove a completely different version of the file | 22:00 |
|
adfeno
| Oh... so there goes my attempt to send the patch by email without having to subscribe to GitHub | 22:03 |
| → thebope_ joined | 22:03 |
|
adfeno
| Actually, no I still have another way :D | 22:03 |
| ← thebope left | 22:03 |
| → grawity joined | 22:04 |
| → rewt joined | 22:05 |
| ← Anthaas left | 22:06 |
| ← heroux left | 22:07 |
| → heroux joined | 22:08 |
| → Anthaas joined | 22:10 |
| → arminhajrovic joined | 22:11 |
| ← arminhajrovic left | 22:13 |
| → ProbabilityMoon joined | 22:16 |
| → arminhajrovic joined | 22:21 |
| ← shabius left | 22:22 |
|
adfeno
| Are information regarding remotes saved/pushed to the repository host for other contributors to get those when getting updates through clone/pull ? | 22:25 |
| ← arminhajrovic left | 22:27 |
| → ketas- joined | 22:27 |
| → shabius joined | 22:27 |
| → Mattiaslndstrm joined | 22:30 |
|
adfeno
| For example, if I add a remote such as "upstream", push to my project which already has an origin, will people, when cloning my project, automatically get the "upstream" remote added? | 22:31 |
|
grawity
| adfeno: no | 22:37 |
|
adfeno
| Oh, OK, I see | 22:38 |
| → blackmesa1 joined | 22:38 |
| → dfee joined | 22:38 |
| ← blackmesa left | 22:39 |
|
adfeno
| grawity: is there a way to make Git do that? | 22:39 |
|
grawity
| also no | 22:39 |
|
adfeno
| Hm, OK | 22:39 |
|
| Thanks for the information | 22:39 |
|
grawity
| you can include a shellscript and tell people to run it – there's nothing in a repository that could automatically affect clones' configuration | 22:40 |
|
adfeno
| Hm, I see, thanks :D | 22:40 |
|
plexigras
| is there something like `git add --patch` but instead of hunks i get to choose which files to add? | 22:42 |
|
_ikke_
| plexigras: git add -i | 22:43 |
| ← blackmesa1 left | 22:43 |
|
_ikke_
| plexigras: git add -p is basically a subset of git add -i (--interactive) | 22:43 |
|
plexigras
| thanks i will take a look at that | 22:43 |
| → venmx joined | 22:44 |
|
plexigras
| any other cool alternatives to go about doing these kinds of things? | 22:45 |
| ← ProbabilityMoon left | 22:46 |
| → ProbabilityMoon joined | 22:46 |
| ← Mattiaslndstrm left | 22:49 |
| → dansan_ joined | 22:51 |
| ← nowhere_man left | 22:51 |
| → dviola joined | 22:51 |
| ← ProbabilityMoon left | 22:52 |
| ← rewt left | 22:54 |
| → rewt`` joined | 22:54 |
| rewt`` → rewt | 22:55 |
| ← inkbottle left | 22:56 |
| → arminhajrovic joined | 22:57 |
| ← arminhajrovic left | 22:59 |
| → arminhajrovic joined | 23:00 |
| ← arminhajrovic left | 23:01 |
| → arminhajrovic joined | 23:01 |
| ← TJ- left | 23:03 |
| ← strugee left | 23:06 |
| → strugee joined | 23:10 |
| ← noboruma left | 23:10 |
| → nowhere_man joined | 23:12 |
| ← arminhajrovic left | 23:12 |
| → arminhajrovic joined | 23:13 |
| ← arminhajrovic left | 23:14 |
| → arminhajrovic joined | 23:15 |
| → boombatower joined | 23:15 |
| → yohnnyjoe joined | 23:19 |
| → tomfarr joined | 23:19 |
| ← xcm left | 23:24 |
| ← arminhajrovic left | 23:24 |
| ← adfeno left | 23:24 |
| → atrus joined | 23:25 |
| ← Envil left | 23:25 |
| → libertyprime joined | 23:26 |
| → arminhajrovic joined | 23:26 |
| → xcm joined | 23:26 |
| → ProbabilityMoon joined | 23:28 |
| → Makaveli7 joined | 23:28 |
| ← spacesuitdiver left | 23:28 |
| ← nowhere_man left | 23:29 |
| ← arminhajrovic left | 23:29 |
| → arminhajrovic joined | 23:29 |
| ← diogenese left | 23:31 |
| ← ferdna left | 23:33 |
| ← Narrat left | 23:33 |
| ← Makaveli7 left | 23:34 |
| ← xcm left | 23:34 |
| ← thebope_ left | 23:35 |
| → thebope joined | 23:36 |
| → xcm joined | 23:38 |
| ← thebope left | 23:40 |
| → diogenese joined | 23:41 |
| ← arminhajrovic left | 23:41 |
| ← lucasb left | 23:42 |
| → kfoonamalik joined | 23:43 |
| ← rewt left | 23:44 |
| → rewt`` joined | 23:44 |
| rewt`` → rewt | 23:44 |
| ← reactormonk left | 23:51 |
| → q6AA4FD joined | 23:52 |
| → nowhere_man joined | 23:53 |
| → reactormonk joined | 23:57 |
| ← rewt left | 23:57 |
| → rewt`` joined | 23:58 |
| rewt`` → rewt | 23:58 |