| 2023-07-03 |
| ← xandris_ left | 00:01 |
| → xandris joined | 00:01 |
| → jklfds joined | 00:08 |
| ← jklfds left | 00:12 |
| ← SuperLag left | 00:18 |
| → jklfds joined | 00:19 |
| → SuperLag joined | 00:19 |
| ← SuperLag left | 00:19 |
| → SuperLag joined | 00:19 |
| → very_sneaky joined | 00:20 |
| ← bloody left | 00:21 |
| ← very_sneaky left | 00:22 |
| ← jklfds left | 00:23 |
| ← Soni left | 00:25 |
| → joek joined | 00:25 |
| ← joek left | 00:27 |
| → Gary_Sinise joined | 00:32 |
| → ZacSharp joined | 00:34 |
| ← nyah left | 00:34 |
| → jklfds joined | 00:35 |
| ← countach202020 left | 00:37 |
| ← jklfds left | 00:40 |
| ← dtux left | 00:49 |
| ← ZacSharp left | 00:49 |
| → jklfds joined | 01:02 |
| ← firewyre left | 01:02 |
| → firewyre joined | 01:06 |
| ← firewyre left | 01:06 |
| ← jklfds left | 01:07 |
| ← Coop56 left | 01:12 |
| ← nvmd left | 01:13 |
| ← dmenz left | 01:14 |
| → Soni joined | 01:17 |
| → firewyre joined | 01:17 |
| ← firewyre left | 01:18 |
| → matteocavestri_ joined | 01:19 |
| → firewyre joined | 01:19 |
| ← thomasross left | 01:20 |
| → jklfds joined | 01:21 |
| ← jklfds left | 01:26 |
| ← cdown left | 01:26 |
| ← matteocavestri_ left | 01:28 |
| → roadie joined | 01:32 |
| ← roadie left | 01:36 |
| → fstd_ joined | 01:41 |
| → thiago joined | 01:44 |
| ← cafkafk left | 01:44 |
| ← fstd left | 01:44 |
| fstd_ → fstd | 01:44 |
| ← Darkfoe left | 01:47 |
| → Darkfoe joined | 01:48 |
| ← gvg left | 01:48 |
| → gvg joined | 01:50 |
| → cafkafk joined | 01:50 |
| ← gvg left | 01:52 |
| → jklfds joined | 01:52 |
| → gvg joined | 01:55 |
| ← jklfds left | 01:57 |
| ← phundrak left | 01:58 |
| ← tmz left | 02:00 |
| → phundrak joined | 02:01 |
| → dtux joined | 02:05 |
| → YuGiOhJCJ joined | 02:06 |
| ← deltab left | 02:07 |
| → jklfds joined | 02:08 |
| → cdown joined | 02:08 |
| → x64S_ joined | 02:11 |
| → node1 joined | 02:12 |
| → zombieface_ joined | 02:12 |
| ← jklfds left | 02:13 |
| ← cdown left | 02:14 |
| ← x64S_ left | 02:15 |
| → tmz joined | 02:15 |
| → nate2 joined | 02:15 |
| ← FinnElija left | 02:18 |
| → finn_elija joined | 02:18 |
| finn_elija → FinnElija | 02:18 |
| → deltab joined | 02:18 |
| → forgotmynick joined | 02:24 |
| → bipul_ joined | 02:25 |
| ← bipul_ left | 02:25 |
| → bipul_ joined | 02:26 |
| ← node1 left | 02:26 |
| bipul_ → node1 | 02:26 |
| ← node1 left | 02:26 |
| → node1 joined | 02:26 |
| ← bin101 left | 02:28 |
| → bin101 joined | 02:30 |
| → jklfds joined | 02:31 |
| → crb joined | 02:35 |
| ← jklfds left | 02:36 |
| ← [mct] left | 02:41 |
| ← bywaterloo left | 02:41 |
| → mjh4386 joined | 02:45 |
| ← node1 left | 02:45 |
| ← duderonomy left | 02:50 |
| → Woundheir joined | 02:57 |
| ← farzat left | 02:57 |
| → farzat joined | 03:00 |
| → yaverot joined | 03:03 |
| ← squirrel left | 03:04 |
| → jklfds joined | 03:06 |
| ← tejr left | 03:13 |
| → tejr joined | 03:13 |
| ← jklfds left | 03:14 |
| → roadie joined | 03:18 |
| ← nate2 left | 03:19 |
|
yaverot
| So I created a repository on computer A, I'd like to clone it to computer B. Both are linux systems, with the same username. User on B can ssh in to A with current ssh key. I must be missing some obvious step. | 03:19 |
| → jklfds joined | 03:20 |
| ← jklfds left | 03:25 |
|
gnoo
| yaverot: git clone username@ip-address:path/from/home | 03:26 |
| ← roadie left | 03:30 |
| ← cafkafk left | 03:32 |
| → cafkafk joined | 03:35 |
| → Exa joined | 03:36 |
| → jklfds joined | 03:37 |
| → hbautista joined | 03:39 |
| ← junyx left | 03:44 |
|
yaverot
| I've tried: git clone --verbose [email@hidden.address] git clone --verbose [email@hidden.address] git clone --verbose [email@hidden.address] git clone --verbose ssh://yaverot@192.168.50.230:/home/yaverot/source/kittens-helper.git and git clone --verbose ssh://yaverot@192.168.50.230:/source/kittens-helper.git | 03:44 |
| ← jklfds left | 03:44 |
|
yaverot
| all "give does not appear to be a git repository" except the ssh:// ones intermiteadly give Could not resolve hostname | 03:45 |
| ← defjam left | 03:47 |
|
gnoo
| yaverot: is your folder named kittens-helper.git or kittens-helper ? | 03:49 |
|
zombieface_
| git clone --verbose ssh://yaverot@192.168.50.230:source/kittens-helper.git | 03:50 |
|
| You have an extra slash. | 03:51 |
|
gnoo
| yaverot: also while using ssh:// you don't use : | 03:51 |
|
| (there it denotes a port) | 03:51 |
|
zombieface_
| git clone [email@hidden.address] | 03:51 |
| → bywaterloo joined | 03:52 |
|
zombieface_
| Syntax is like this. | 03:52 |
|
| The /source is looking for a folder called source in the root of the file system. | 03:53 |
|
yaverot
| " is your folder named kittens-helper.git or kittens-helper" that was it, I'm so used to them ending in .git that I assumed it was a required part of the clone command. | 03:55 |
| ← yaverot left | 03:58 |
| → gsi_ joined | 03:59 |
| ← actioninja left | 04:00 |
| → actioninja6 joined | 04:00 |
| → defjam joined | 04:01 |
| ← gsi left | 04:02 |
| → nickgaw joined | 04:03 |
| ← nickgaw left | 04:03 |
| ← dtux left | 04:04 |
| → jklfds joined | 04:05 |
| ← defjam left | 04:05 |
| ← drbeco left | 04:07 |
| ← jklfds left | 04:10 |
| → jklfds joined | 04:11 |
| → bgs joined | 04:15 |
| ← jklfds left | 04:16 |
| ← larryv left | 04:16 |
| → very_sneaky joined | 04:17 |
| → defjam joined | 04:18 |
| ← defjam left | 04:22 |
| → foul_owl joined | 04:30 |
| ← redbool left | 04:30 |
| → jklfds joined | 04:30 |
| → redbool joined | 04:30 |
| ← foul_owl left | 04:32 |
| ← jklfds left | 04:35 |
| → foul_owl joined | 04:38 |
| → jmd joined | 04:41 |
| ← forgotmynick left | 04:43 |
| → vanessa joined | 04:45 |
|
vanessa
| https://dpaste.com/AVJD8475J | 04:46 |
|
| Anyone knows how to fix this ^ error? | 04:46 |
| → jklfds joined | 04:49 |
| → defjam joined | 04:50 |
| → dtux joined | 04:51 |
|
gnoo
| vanessa: that means the remote is not a bare repo | 04:52 |
| ← ChmEarl left | 04:53 |
| → roadie joined | 04:56 |
| ← jklfds left | 04:57 |
|
vanessa
| what is a bare repo? | 04:57 |
|
rewt
| that paste answers your question | 04:58 |
| ← reset left | 04:58 |
|
rewt
| a bare repo is one that does not have a working tree (files checked out) | 04:59 |
| ← defjam left | 05:00 |
|
vanessa
| ok, this is what I did. I work from home and office. I init a git repo in '/path/to/dir' in my office computer. I 'git clone /path/to/dir' on a flash drive to take it home and work on it. I come back to office and try 'git push' from my flash drive and get this error. | 05:00 |
|
gnoo
| vanessa: make a bare repo in your flash drive, then git pull from you work dir | 05:01 |
|
| from inside your flash drive's directory, git clone --bare /path/to/work/dir | 05:01 |
|
| then you push to that bare repo from both ends, and *pull* from there | 05:02 |
|
rewt
| or git fetch in the office pc repo from the flash drive repo | 05:02 |
|
vanessa
| I already have some work on my flash drive repo that I want to pull to my office computer repo. | 05:02 |
|
| 'git pull' from office says that I have no remote or something like that | 05:03 |
|
rewt
| set the flash drive repo as a remote in the work repo | 05:03 |
|
gnoo
| vanessa: git remote add origin /path/to/flash/dir | 05:03 |
|
rewt
| !man git remote add | 05:03 |
|
gitinfo
| The git man pages are available online at https://gitirc.eu/git.html. Or were you looking for the "man git-foo" syntax (without the !)? | 05:03 |
|
| the git-remote manpage is available at https://gitirc.eu/git-remote.html | 05:03 |
|
gnoo
| then git pull | 05:04 |
| ← roadie left | 05:05 |
| → defjam joined | 05:08 |
| → mihael joined | 05:10 |
| ← defjam left | 05:12 |
| ← Leonarbro left | 05:13 |
| → nate2 joined | 05:15 |
| ← jmd left | 05:17 |
| ← sa0 left | 05:17 |
| → vdamewood joined | 05:18 |
| ← nate2 left | 05:20 |
| → psukys joined | 05:20 |
| → defjam joined | 05:23 |
| → jklfds joined | 05:24 |
| ← defjam left | 05:28 |
| ← cafkafk left | 05:28 |
| ← jklfds left | 05:30 |
| → gep joined | 05:33 |
| → cafkafk joined | 05:34 |
| ← Sazhen86 left | 05:36 |
|
vanessa
| rewt I created a remote like 'git remote add flash /run/media/vanessa/B972-50C3/repo' and pulled with 'git pull flash master' | 05:37 |
|
| what if the identifier for my flash drive 'B972-50C3' changes? and do I always have to 'git pull flash master'? can I not do 'git pull' like with other repos? | 05:38 |
| → han-solo joined | 05:40 |
| → defjam joined | 05:40 |
|
gnoo
| if you're in master then git pull should just pull master | 05:41 |
|
| if you had named it origin | 05:42 |
|
| but if you want to name it flash, set the upstream to be flash/master | 05:42 |
| → Sazhen86 joined | 05:42 |
| ← bywaterloo left | 05:45 |
| ← defjam left | 05:45 |
|
vanessa
| how to set upstream as flash/master? | 05:46 |
|
ikke
| git branch --set-upstream-to flash/master master | 05:49 |
|
| If the path changes, you'd have to update the remote as well | 05:49 |
| → weedmic joined | 05:50 |
| → RiFo joined | 05:51 |
|
vanessa
| ok. that worked | 05:51 |
|
vdamewood
| Where does 'B972-50C3' come from? | 05:52 |
| → node1 joined | 05:54 |
|
vanessa
| but in my flash drive repo, git status tells me that, `Your branch is ahead of 'origin/master' by 12 commits.` even if I have 'git pull' from my office computer. | 05:54 |
|
| vdamewood: that is the mount point directory that my OS assigned (don't know where) when I plug the flash drive. | 05:55 |
|
vdamewood
| vanessa: if you're worried about it changing, figure out how your OS determines it. One hint might be that it's the volume label of the file system on the drive. | 05:55 |
|
| It could also be a model number or serial number | 05:56 |
|
rewt
| that looks like the drive's serial number (assigned when formatting) | 05:56 |
|
vdamewood
| vanessa: "your branch is head" means your branch has commits the remote (here, origin) doesn't. You need to *push* to fix that. | 05:57 |
|
| is ahead* | 05:57 |
| → defjam joined | 05:58 |
| → jklfds joined | 06:01 |
| ← defjam left | 06:03 |
| → vysn joined | 06:04 |
| → feriman joined | 06:05 |
| ← jklfds left | 06:07 |
| → defjam joined | 06:08 |
|
weedmic
| vdamewood: ty - I thought that was the answer, but did not know for sure | 06:11 |
|
paperino42[m]
| From the documentation, I guess that following command should work: git lfs fetch <remote> <branchname> | 06:12 |
| ← defjam left | 06:12 |
|
paperino42[m]
| Unfortunately I get the error: Invalid ref argument: <branchname> | 06:13 |
|
| But the branchname and remote are valid, as git log <remote>/<branchname> shows the history | 06:13 |
|
| What could I be doing wrong? | 06:15 |
|
| git lfs fetch <remote> does something | 06:15 |
| ← x64S left | 06:15 |
| ← thiago left | 06:16 |
|
vanessa
| so, when I push from my flash drive I get this error: https://dpaste.com/AVJD8475J But then I pull from my office computer first and then run 'git push', the I get 'Everything up-to-date' | 06:16 |
| → joek joined | 06:17 |
| ← node1 left | 06:19 |
|
vanessa
| I have encountered git-lfs before and it seems like Microsoft is EEE-ing git. | 06:20 |
| ← joek left | 06:21 |
| → jklfds joined | 06:21 |
| ← Pikk3wyn left | 06:22 |
| → Pikk3wyn joined | 06:23 |
|
paperino42[m]
| yes.. maybe an important information, the repos was shallow, and has been unshallowed with "git fetch --unshallow <remote>" | 06:23 |
| ← jklfds left | 06:26 |
|
vdamewood
| vanessa: The error you got indicates that you're trying to push to a repository that has some uncommitted changes. It's avoidable if you use a bare repo to coordinate between repositories. | 06:27 |
| → jklfds joined | 06:27 |
|
vdamewood
| Or perhaps that the repo you're pushing to has the branch in question checked out | 06:29 |
| → x64S joined | 06:30 |
| → junyx joined | 06:30 |
| → mawk joined | 06:33 |
| ← jklfds left | 06:34 |
| → stenno joined | 06:34 |
| → scottg489 joined | 06:39 |
| → defjam joined | 06:40 |
| ← zombieface_ left | 06:48 |
| ← junyx left | 06:52 |
| → junyx joined | 06:53 |
| → node1 joined | 06:55 |
| → jklfds joined | 06:57 |
| ← hbautista left | 06:59 |
| → pybren joined | 06:59 |
| ← Gary_Sinise left | 07:00 |
| ← pybren left | 07:01 |
| ← jklfds left | 07:04 |
| → duxsco joined | 07:04 |
| ← hussein1_ left | 07:04 |
| → hussein1_ joined | 07:06 |
| → rfuentess joined | 07:15 |
| → clime1 joined | 07:16 |
| ← junyx left | 07:18 |
| → nyah joined | 07:18 |
| → Sasazuka joined | 07:19 |
| ← psukys left | 07:21 |
| → jklfds joined | 07:21 |
| → joachimo joined | 07:24 |
| ← OnkelTem left | 07:25 |
| → gareppa joined | 07:27 |
| → OnkelTem joined | 07:27 |
| ← jklfds left | 07:28 |
| → coot joined | 07:33 |
| → otisolsen70 joined | 07:36 |
| ← chrfle left | 07:37 |
| → chrfle joined | 07:40 |
| ← m5zs7k left | 07:42 |
| ← Sasazuka left | 07:42 |
| → m5zs7k joined | 07:43 |
| → gas51627 joined | 07:45 |
| ← duxsco left | 07:47 |
| ← skapate left | 07:55 |
| → jklfds joined | 07:55 |
| ← jklfds left | 08:00 |
| ← clime1 left | 08:06 |
| ← m0norail left | 08:11 |
| ← mihael left | 08:13 |
| → joek joined | 08:14 |
| → currenthandle joined | 08:17 |
| → EvgenyK joined | 08:18 |
| ← joek left | 08:19 |
| → gryffus joined | 08:20 |
| → m0norail joined | 08:20 |
| → housemate joined | 08:26 |
| → jklfds joined | 08:29 |
| ← vanessa left | 08:34 |
| ← jklfds left | 08:34 |
| → coot_ joined | 08:35 |
| ← coot left | 08:35 |
| coot_ → coot | 08:35 |
| → theoceaniscool joined | 08:36 |
| → kandinski joined | 08:37 |
| ← defjam left | 08:37 |
| ← currenthandle left | 08:39 |
| ← misskoe left | 08:42 |
| ← housemate left | 08:44 |
| → misskoe joined | 08:44 |
| → duxsco joined | 08:45 |
| → clime1 joined | 08:47 |
| → dob1_ joined | 08:48 |
| ← dob1 left | 08:49 |
| → defjam joined | 08:49 |
| → housemate joined | 08:49 |
| ← defjam left | 08:53 |
| → jklfds joined | 08:55 |
| ← feriman left | 08:57 |
| ← jklfds left | 09:00 |
| ← housemate left | 09:02 |
| → housemate joined | 09:05 |
| ← arand___ left | 09:07 |
| ← clime1 left | 09:08 |
| ← housemate left | 09:16 |
| → nate2 joined | 09:16 |
| → housemate joined | 09:17 |
| ← housemate left | 09:19 |
| → feriman joined | 09:21 |
| ← nate2 left | 09:21 |
| → defjam joined | 09:22 |
| → jklfds joined | 09:23 |
| ← duxsco left | 09:24 |
| → Lord_of_Life_ joined | 09:25 |
| ← Lord_of_Life left | 09:25 |
| ← defjam left | 09:27 |
| ← cafkafk left | 09:27 |
| Lord_of_Life_ → Lord_of_Life | 09:27 |
| ← jklfds left | 09:28 |
| → bywaterloo joined | 09:31 |
| → weedmic_ joined | 09:38 |
| ← weedmic left | 09:38 |
| ← vysn left | 09:40 |
| ← weedmic_ left | 09:40 |
| → rosco joined | 09:40 |
| → weedmic_ joined | 09:40 |
| weedmic_ → weedmic | 09:41 |
| → DrowningElysium joined | 09:41 |
| → jklfds joined | 09:43 |
| → cafkafk joined | 09:45 |
| ← FinnElija left | 09:46 |
| ← jklfds left | 09:47 |
| ← Sazhen86 left | 09:48 |
| ← vdamewood left | 09:52 |
| → defjam joined | 09:53 |
| → FinnElija joined | 09:54 |
| → housemate joined | 09:54 |
| → mobidrop joined | 09:55 |
| ← vancz left | 09:55 |
| → vancz joined | 09:56 |
| → konsolebox joined | 09:57 |
| ← defjam left | 09:57 |
| → f_ joined | 09:58 |
| → jklfds joined | 10:05 |
| → Peng joined | 10:07 |
| → reset joined | 10:11 |
| ← jklfds left | 10:11 |
| → defjam joined | 10:16 |
| ← defjam left | 10:20 |
| ← housemate left | 10:23 |
| → housemate joined | 10:25 |
| ← housemate left | 10:27 |
| ← node1 left | 10:29 |
| ← selckin left | 10:31 |
| → selckin joined | 10:31 |
| → jklfds joined | 10:34 |
| → igemnace joined | 10:37 |
| ← mobidrop left | 10:37 |
| → mobidrop joined | 10:37 |
| ← jklfds left | 10:43 |
| → defjam joined | 10:44 |
| ← vishal left | 10:44 |
| Disconsented → DisconSented | 10:45 |
| → cyber_heretic joined | 10:45 |
| → vishal joined | 10:46 |
| ← defjam left | 10:48 |
| ← rustyshackleford left | 10:49 |
| ← gep left | 10:50 |
| → arand___ joined | 10:51 |
| → jklfds joined | 10:53 |
| ← jottr_ left | 10:54 |
| → housemate joined | 10:57 |
| ← jklfds left | 10:58 |
| → ferdna joined | 11:01 |
| ← housemate left | 11:01 |
| → jklfds joined | 11:03 |
| → defjam joined | 11:03 |
| → housemate joined | 11:03 |
| → joek joined | 11:04 |
| ← chimbosonic11 left | 11:07 |
| ← jklfds left | 11:07 |
| ← defjam left | 11:08 |
| ← joek left | 11:08 |
| ← cafkafk left | 11:08 |
| → cafkafk joined | 11:08 |
| → szkl joined | 11:09 |
| → chimbosonic115 joined | 11:13 |
| ← cyber_heretic left | 11:14 |
| ← housemate left | 11:21 |
| → defjam joined | 11:21 |
| ← cafkafk left | 11:23 |
| ← defjam left | 11:26 |
| → qqq joined | 11:26 |
| → cousteau_ joined | 11:28 |
|
cousteau_
| Hi | 11:28 |
|
| I just encountered a 17 year old bug https://git.vger.kernel.narkive.com/wATd3MOq/apply-can-t-apply-patches-to-crlf-files | 11:28 |
| → cafkafk joined | 11:29 |
|
cousteau_
| (well, not "just encountered" it, I got problems with it some time ago but I hadn't reported it yet... seems that Salikh was already 17 years ahead of me) | 11:29 |
| ← qsx left | 11:29 |
| → housemate joined | 11:30 |
|
cousteau_
| I have reproduction instructions too (although the ones Junio wrote also work... or rather, fail successfully) | 11:30 |
| → qsx joined | 11:30 |
| ← qqq left | 11:30 |
|
cousteau_
| Craziest thing is, it fails due to CRLF line endings on BOTH Linux and Windows, not just in the platform that has trouble with LF/CRLF line endings | 11:31 |
| → qqq joined | 11:31 |
|
| cousteau_ feels like an archaeologist discovering ancient bugs | 11:32 |
|
selckin
| so what do you want from us | 11:33 |
| ← housemate left | 11:34 |
| ← rfuentess left | 11:35 |
| ← memset left | 11:36 |
| → memset joined | 11:37 |
| → jklfds joined | 11:37 |
| → rfuentess joined | 11:38 |
|
weedmic
| cousteau_: check virustotal.com to see when the virus disappeared or was last seen, you might be surprised. | 11:42 |
|
| nvm - it was a bug not a virus | 11:42 |
|
| i need more englishes | 11:42 |
| ← jklfds left | 11:42 |
| ← konsolebox left | 11:52 |
| → defjam joined | 11:53 |
| ← qqq left | 11:54 |
| → Leonarbro joined | 11:54 |
| → qqq joined | 11:55 |
| → jklfds joined | 11:56 |
| → housemate joined | 11:57 |
| ← housemate left | 11:57 |
| ← qqq left | 11:58 |
| → qqq joined | 11:58 |
| ← defjam left | 11:58 |
| ← antto left | 11:59 |
| → konsolebox joined | 11:59 |
| ← jklfds left | 12:01 |
| → cmn joined | 12:01 |
| → kjartan joined | 12:02 |
| ← bywaterloo left | 12:03 |
| → Natrick joined | 12:03 |
| ← Teacup left | 12:03 |
| → Teacup joined | 12:03 |
| → antto joined | 12:03 |
| ← qqq left | 12:04 |
| → qqq joined | 12:05 |
| → Kamilion joined | 12:06 |
| → jklfds joined | 12:10 |
| ← cafkafk left | 12:11 |
| ← tykling left | 12:11 |
| → tykling joined | 12:11 |
| → cafkafk joined | 12:11 |
| → defjam joined | 12:11 |
| ← konsolebox left | 12:12 |
| → realies joined | 12:13 |
| ← jklfds left | 12:15 |
| → aspirin joined | 12:16 |
| ← defjam left | 12:16 |
| → mobidrop_ joined | 12:18 |
| → jklfds joined | 12:18 |
| ← mobidrop left | 12:20 |
| → defjam joined | 12:25 |
| ← qqq left | 12:27 |
| ← jklfds left | 12:27 |
| → qqq joined | 12:28 |
| ← qqq left | 12:31 |
| ← defjam left | 12:31 |
| ← donofrio left | 12:32 |
| → defjam joined | 12:35 |
| → Coop joined | 12:40 |
| ← feriman left | 12:41 |
| → feriman joined | 12:42 |
| ← defjam left | 12:42 |
| → konsolebox joined | 12:42 |
| ← feriman left | 12:43 |
| → feriman joined | 12:44 |
| → jklfds joined | 12:46 |
| ← qsx left | 12:47 |
| → belsirk joined | 12:49 |
| ← weedmic left | 12:50 |
| ← jklfds left | 12:51 |
| ← rfuentess left | 12:52 |
| → defjam joined | 12:52 |
| → jklfds joined | 13:08 |
| → loulou joined | 13:10 |
| → qsx joined | 13:12 |
| ← jklfds left | 13:13 |
| ← szkl left | 13:13 |
| → nate2 joined | 13:18 |
| → EvgenyK_ joined | 13:20 |
| ← EvgenyK left | 13:21 |
| ← nate2 left | 13:23 |
| → housemate joined | 13:30 |
| → Rashad joined | 13:32 |
| ← housemate left | 13:38 |
| → jklfds joined | 13:38 |
| → housemate joined | 13:38 |
| ← housemate left | 13:38 |
| → housemate joined | 13:38 |
| → housemate_ joined | 13:41 |
| ← housemate left | 13:43 |
| ← RiFo left | 13:44 |
| ← housemate_ left | 13:44 |
| ← jklfds left | 13:44 |
| → housemate joined | 13:44 |
| → Guest675 joined | 13:52 |
| ← Guest675 left | 13:52 |
| → maret joined | 13:52 |
| → housemate_ joined | 13:54 |
| ← housemate_ left | 13:54 |
| ← housemate left | 13:57 |
| → warmana joined | 14:01 |
| → jklfds joined | 14:03 |
| ← igemnace left | 14:04 |
| → joek joined | 14:06 |
| ← jklfds left | 14:07 |
| ← riposte left | 14:08 |
| belsirk → rfuentess | 14:09 |
| ← joek left | 14:10 |
| ← haasn left | 14:11 |
| → haasn joined | 14:11 |
| → igemnace joined | 14:11 |
| → jklfds joined | 14:13 |
| → drbeco joined | 14:14 |
| → matteocavestri_ joined | 14:15 |
| ← fflam left | 14:15 |
| ← arand___ left | 14:17 |
| ← gryffus left | 14:17 |
| ← dfip^ left | 14:20 |
| → gryffus joined | 14:21 |
| ← jklfds left | 14:21 |
| → fflam joined | 14:22 |
| → navi joined | 14:24 |
| → feriman_ joined | 14:24 |
| ← memset left | 14:24 |
| → memset joined | 14:25 |
| → ceoltb^ joined | 14:25 |
| ← defjam left | 14:27 |
| ← feriman left | 14:27 |
| → jklfds joined | 14:28 |
| → riposte joined | 14:32 |
| ← jklfds left | 14:32 |
| → jklfds joined | 14:34 |
| → sa0 joined | 14:34 |
| ← gumnos left | 14:35 |
| → defjam joined | 14:35 |
| → gumnos joined | 14:35 |
| ← jklfds left | 14:39 |
| ← gryffus left | 14:40 |
| ← defjam left | 14:44 |
| → defjam joined | 14:48 |
| → vysn joined | 14:51 |
| ← defjam left | 14:53 |
| → defjam joined | 14:58 |
| → jklfds joined | 15:00 |
| ← geirha left | 15:00 |
| ← Rashad left | 15:00 |
| → geirha joined | 15:01 |
| → jennifer joined | 15:01 |
|
jennifer
| Hi, not sure if I can ask here but does anybody know how to add rss to GitHub page? Specifically I want to treat it as a reader, I tried: https://github.com/osmoscraft/osmosfeed | 15:02 |
|
| But it doesn't work | 15:02 |
|
| I'm not trying to turn my GitHub page into a rss, which is what most of the search turns up, how to create your site's rss | 15:02 |
| ← defjam left | 15:03 |
| ← jklfds left | 15:04 |
| → defjam joined | 15:10 |
| → Smashcat joined | 15:10 |
| → gasbag joined | 15:11 |
|
Smashcat
| Anyone know if it's possible to checkout an old commit from github? Tried doing a git clone ..., then git checkout <hash> but it doesn't download the older files. Are they lost? | 15:11 |
|
jennifer
| Smashcat, it can be, unless you have the id | 15:12 |
|
Smashcat
| Yeah that sucks. I can see the older files on github, so I'll need to see if I can download them one at a time I think. | 15:13 |
|
ikke
| Smashcat: That implies that that commit is no longer referenced | 15:14 |
| ← defjam left | 15:14 |
|
Smashcat
| I don't know what that means. I just noticed I can download the older commit as a zip file, so I can do that and just copy all the files across :) | 15:14 |
| → jklfds joined | 15:17 |
|
jennifer
| Maybe you don't have the correct ID or the branch is dead | 15:18 |
| ← cafkafk left | 15:18 |
|
Smashcat
| I copied the hash from github. It's cool, all the stuff is in the zip file. I need to remember to back up my versions separately to git! | 15:19 |
| → defjam joined | 15:20 |
|
jennifer
| Who knows then | 15:21 |
| ← jklfds left | 15:22 |
|
Smashcat
| <shrug> Yeah. I'm just going to backup before I do any commits so I can restore from my local server if needed in future. | 15:22 |
| ← defjam left | 15:24 |
| ← Smashcat left | 15:25 |
| → hbautista joined | 15:25 |
| → ChmEarl joined | 15:25 |
| → devmes joined | 15:27 |
| → jfsimon1981_b joined | 15:27 |
| → Sasazuka joined | 15:28 |
| ← devmes left | 15:28 |
| ← mobidrop_ left | 15:28 |
| → devmes joined | 15:29 |
| ← jfsimon1981 left | 15:29 |
| → XorMan joined | 15:31 |
| ← YuGiOhJCJ left | 15:33 |
| ← rosco left | 15:35 |
| → cafkafk joined | 15:36 |
| → rosco joined | 15:37 |
| → fflam_ joined | 15:38 |
| → gh34 joined | 15:38 |
| ← fflam left | 15:38 |
| → larryv joined | 15:39 |
| ← ferdna left | 15:40 |
| ← warmana left | 15:47 |
|
CrtxReavr
| Can different directory trees in a repo have their own .gitignore files? | 15:49 |
| → thiago joined | 15:49 |
| → jklfds joined | 15:50 |
| ← theoceaniscool left | 15:50 |
| → core joined | 15:52 |
| → jmd joined | 15:53 |
| ← rfuentess left | 15:56 |
| → bywaterloo joined | 15:56 |
| ← earthbreaker left | 15:57 |
| ← jklfds left | 15:57 |
| → earthbreaker joined | 15:57 |
| → bloody joined | 15:59 |
| ← mystique[m] left | 16:02 |
|
larryv
| CrtxReavr: yes | 16:05 |
|
CrtxReavr
| larryv, and the closest to "bottom" takes presidence, or are they cummlative? | 16:07 |
| ← realies left | 16:08 |
|
larryv
| patterns in lower files can override those in higher files but they are all taken into account. see man gitignore | 16:09 |
|
gitinfo
| the gitignore manpage is available at https://gitirc.eu/gitignore.html | 16:09 |
| ← XorMan left | 16:11 |
| → defjam joined | 16:12 |
| → realies joined | 16:15 |
| → roadie joined | 16:15 |
| ← realies left | 16:16 |
| ← Sasazuka left | 16:16 |
| ← defjam left | 16:17 |
| ← DrowningElysium left | 16:18 |
| → realies joined | 16:20 |
| → jklfds joined | 16:22 |
| → causasui joined | 16:22 |
| ← causasui left | 16:24 |
| → causasui joined | 16:25 |
| → housemate joined | 16:26 |
| ← jklfds left | 16:27 |
| ← IRChatter left | 16:27 |
| ← causasui left | 16:27 |
| → causasui joined | 16:28 |
| ← bf_ left | 16:28 |
| ← housemate left | 16:32 |
| → jklfds joined | 16:34 |
| → rustyshackleford joined | 16:34 |
| → superice joined | 16:35 |
| ← jklfds left | 16:38 |
| ← realies left | 16:39 |
| → duxsco joined | 16:40 |
| → realies joined | 16:41 |
| → devmes_ joined | 16:41 |
| ← devmes left | 16:43 |
| → node1 joined | 16:44 |
|
node1
| I would like to know how to implement versioning for project configurations when there are both client and server components involved. Instead of committing the entire client-server application, I would prefer to only commit the configuration files. For example, if I'm working with two databases, how can I accomplish this using Git? | 16:45 |
|
| Do .gitignore file do the magic? | 16:45 |
| ← BrianBlaze left | 16:46 |
| → defjam joined | 16:47 |
| → BrianBlaze joined | 16:49 |
| ← defjam left | 16:51 |
| → joek joined | 16:53 |
| → skapata joined | 16:54 |
| ← din0 left | 16:54 |
| → din0 joined | 16:54 |
| → housemate joined | 16:57 |
| ← joek left | 16:57 |
| dob1_ → dob12 | 16:58 |
| dob12 → dob1 | 16:58 |
| → jklfds joined | 16:59 |
| ← node1 left | 16:59 |
| ← bywaterloo left | 17:00 |
| ← ursa-major left | 17:01 |
| → qqq joined | 17:02 |
| ← causasui left | 17:02 |
| ← f_ left | 17:02 |
| ← jklfds left | 17:03 |
| → defjam joined | 17:04 |
| ← cafkafk left | 17:04 |
| ← hbautista left | 17:05 |
| ← devmes_ left | 17:05 |
| ← housemate left | 17:07 |
| → housemate_ joined | 17:07 |
| ← remedan left | 17:08 |
| → remedan_ joined | 17:08 |
| ← defjam left | 17:09 |
| ← realies left | 17:09 |
| ← grantbow left | 17:10 |
| → jklfds joined | 17:10 |
| → realies joined | 17:11 |
| → Sampersand joined | 17:11 |
| ← housemate_ left | 17:13 |
| → cafkafk joined | 17:13 |
| → ___nick___ joined | 17:14 |
| ← Sampersand left | 17:17 |
| ← jklfds left | 17:17 |
| → bywaterloo joined | 17:18 |
| → nate2 joined | 17:19 |
| → f_ joined | 17:20 |
| ← realies left | 17:21 |
| → rainn92675560720 joined | 17:21 |
| ← ___nick___ left | 17:22 |
| → ___nick___ joined | 17:24 |
| → jklfds joined | 17:24 |
| ← nate2 left | 17:24 |
| ← ___nick___ left | 17:25 |
| ← duxsco left | 17:26 |
| → ___nick___ joined | 17:27 |
| → gryffus joined | 17:27 |
| ← jklfds left | 17:28 |
| → realies joined | 17:32 |
| → jklfds joined | 17:32 |
| ← f_ left | 17:33 |
| ← et09 left | 17:34 |
| ← defec7ed left | 17:34 |
| ← jklfds left | 17:37 |
| → defjam joined | 17:38 |
| ← defjam left | 17:43 |
| → Sampersand joined | 17:44 |
| ← realies left | 17:44 |
| → alexherbo2 joined | 17:49 |
| → defjam joined | 17:49 |
| → jklfds joined | 17:51 |
| ← jklfds left | 17:56 |
| ← jennifer left | 17:57 |
| → money joined | 17:59 |
| ← farzat left | 18:05 |
| → farzat joined | 18:06 |
| → azr4e1 joined | 18:09 |
| ← raffaele left | 18:11 |
| → raffaele joined | 18:11 |
| → tirnanog joined | 18:14 |
| ← coot left | 18:14 |
| → duxsco joined | 18:15 |
| → coot joined | 18:21 |
| ← alexherbo2 left | 18:21 |
| ← coot left | 18:22 |
| ← duxsco left | 18:24 |
| ← igemnace left | 18:25 |
| ← Sampersand left | 18:26 |
| ← han-solo left | 18:27 |
| → zwron joined | 18:31 |
| → dfip^ joined | 18:32 |
| ← defjam left | 18:33 |
| → defjam joined | 18:34 |
| → jklfds joined | 18:35 |
| ← defjam left | 18:38 |
| → Betal joined | 18:39 |
| ← jklfds left | 18:39 |
| → defjam joined | 18:51 |
| ← cafkafk left | 18:52 |
| → bf_ joined | 18:56 |
| ← defjam left | 18:56 |
| → XorMan joined | 19:00 |
| → cafkafk joined | 19:00 |
| → Narrat joined | 19:00 |
| → zwron56 joined | 19:01 |
| → alexherbo2 joined | 19:01 |
| ← zwron left | 19:01 |
| ← zwron56 left | 19:02 |
| → jklfds joined | 19:02 |
| → coot joined | 19:05 |
| ← coot left | 19:05 |
| → forgotmynick joined | 19:06 |
| ← bywaterloo left | 19:06 |
| → defjam joined | 19:06 |
| ← jklfds left | 19:07 |
| → coot joined | 19:07 |
| ← azr4e1 left | 19:09 |
| → wootehfoot joined | 19:10 |
| ← coot left | 19:11 |
| → realies joined | 19:12 |
| → coot joined | 19:14 |
| ← coot left | 19:23 |
| → jklfds joined | 19:25 |
| → coot joined | 19:26 |
| ← vysn left | 19:26 |
| ← jklfds left | 19:29 |
| ← cycoder left | 19:33 |
| → MrC joined | 19:34 |
| ← ghost43 left | 19:34 |
| ← coot left | 19:34 |
| → ghost43 joined | 19:35 |
| ← konsolebox left | 19:35 |
| → HiccupJul joined | 19:36 |
| → cycoder joined | 19:37 |
|
HiccupJul
| With git for windows, i disabled the github "manager" credential helper, as i wanted to enter credentials via the command line, but now it asks each time if i want to use cache--daemon, cache, store or wincred. which one will store the credentials for the session, but still ask via the command line for the credentials in the first place? | 19:38 |
|
BtbN
| ssh with an agent | 19:38 |
| → bywaterloo joined | 19:38 |
| → coot joined | 19:39 |
| ← alexherbo2 left | 19:40 |
| ← bket left | 19:48 |
| → ss4 joined | 19:50 |
| → Rashad joined | 19:50 |
| ← realies left | 19:51 |
| ← wootehfoot left | 19:53 |
| → bket joined | 19:53 |
| → m0viefreak joined | 19:55 |
| ← coot left | 19:59 |
| → housemate joined | 20:00 |
| ← HiccupJul left | 20:00 |
| → jklfds joined | 20:00 |
| ← memset left | 20:01 |
| → memset joined | 20:01 |
| ← housemate left | 20:03 |
| ← ___nick___ left | 20:03 |
| → HiccupJul joined | 20:08 |
| ← matteocavestri_ left | 20:08 |
| ← money left | 20:08 |
| ← CAT_S left | 20:08 |
| ← defjam left | 20:09 |
| ← jklfds left | 20:09 |
|
HiccupJul
| BtbN: i mean with https | 20:09 |
| ← gasbag left | 20:09 |
| → jklfds joined | 20:10 |
|
BtbN
| You will need some kind of credential helper then. I'd recommend just using ssh | 20:12 |
| → vysn joined | 20:14 |
| ← ss4 left | 20:15 |
| ← jklfds left | 20:17 |
| → Sazhen86 joined | 20:17 |
| → jklfds joined | 20:21 |
| → defjam joined | 20:21 |
| → asio joined | 20:25 |
| ← jklfds left | 20:25 |
| ← defjam left | 20:26 |
| → jklfds joined | 20:33 |
| → z4kz joined | 20:34 |
|
Celmor[m]
| I've cloned a repo without checkout to then only checkout specific files (those needed by my container). I've created a file that's also within the repo. a subsequent git pull to update only those files I've checked out earlier errors with 'error: Your local changes to the following files would be overwritten by merge:'. I don't want to merge nor do I ever want to commit. can this be ignored and followed with those specific file checkout commands | 20:35 |
|
| again to overwrite those earlier versions? I've also tried adding the "duplicate" file to .gitignore but that's apparently ignored. | 20:35 |
| ← drbeco left | 20:35 |
|
samiamsam
| Celmor[m]: pull is equivalent to fetch then merge. if you don't want to merge, then just fetch. | 20:36 |
|
Celmor[m]
| ah, I've mistaken the command | 20:36 |
| ← jklfds left | 20:37 |
|
Celmor[m]
| thanks | 20:37 |
|
samiamsam
| np | 20:38 |
| ← bgs left | 20:38 |
| ← cafkafk left | 20:50 |
| ← otisolsen70 left | 20:52 |
| ← Rashad left | 20:56 |
| ← gareppa left | 20:57 |
| ← gh34 left | 20:57 |
| → defjam joined | 20:57 |
| → roryrjb joined | 21:02 |
| → node1 joined | 21:02 |
| ← jmd left | 21:05 |
| → jklfds joined | 21:05 |
| → cafkafk joined | 21:08 |
| → squirrel joined | 21:09 |
| ← jklfds left | 21:10 |
| ← kjartan left | 21:12 |
| ← clime left | 21:13 |
| ← forgotmynick left | 21:16 |
| ← node1 left | 21:17 |
| → bipul_ joined | 21:17 |
| ← XorMan left | 21:17 |
| ← Xenguy left | 21:18 |
| → ferdna joined | 21:18 |
| ← roadie left | 21:19 |
| → nate2 joined | 21:21 |
| ← defjam left | 21:24 |
| ← feriman_ left | 21:26 |
| ← nate2 left | 21:26 |
| → jklfds joined | 21:28 |
| → so-offish joined | 21:28 |
| → defjam joined | 21:29 |
| ← jklfds left | 21:32 |
| → jklfds joined | 21:34 |
| ← jklfds left | 21:39 |
| → roadie joined | 21:46 |
| → realies joined | 21:48 |
| → jklfds joined | 21:48 |
| → joek joined | 21:52 |
| ← jklfds left | 21:53 |
| ← gas51627 left | 21:55 |
| ← joek left | 21:56 |
| ← rosco left | 22:02 |
| ← bipul_ left | 22:02 |
| → rosco joined | 22:04 |
| → jklfds joined | 22:05 |
| ← ferdna left | 22:05 |
| ← memset left | 22:08 |
| ← aspirin left | 22:08 |
| ← gryffus left | 22:09 |
| ← jklfds left | 22:09 |
| → gryffus joined | 22:10 |
| ← HiccupJul left | 22:12 |
| → jklfds joined | 22:12 |
| ← jklfds left | 22:17 |
| → Albright joined | 22:18 |
| ← EvgenyK_ left | 22:20 |
| ← roadie left | 22:22 |
| ← loulou left | 22:25 |
| ← reset left | 22:26 |
| → jklfds joined | 22:29 |
| ← jklfds left | 22:34 |
| → Yruama joined | 22:43 |
| → jklfds joined | 22:47 |
| ← cafkafk left | 22:48 |
| → vdamewood joined | 22:49 |
| ← jklfds left | 22:52 |
| → sword_smith joined | 22:53 |
| → jklfds joined | 22:55 |
| → loulou joined | 22:56 |
| ← loulou left | 22:56 |
| → loulou joined | 22:56 |
| ← jklfds left | 23:00 |
| → ZacSharp joined | 23:01 |
| → cousteau` joined | 23:03 |
| → jklfds joined | 23:03 |
| ← cousteau_ left | 23:05 |
| → ferdna joined | 23:08 |
| ← sa0 left | 23:09 |
| → sa0 joined | 23:10 |
| → masber joined | 23:10 |
| ← jklfds left | 23:13 |
| → azr4e1 joined | 23:15 |
| ← sa0 left | 23:15 |
| → travisghansen7 joined | 23:16 |
| ← masber left | 23:16 |
| ← travisghansen left | 23:17 |
| travisghansen7 → travisghansen | 23:17 |
|
skered
| With `git log --diff-filter=DR --summary` delete files are include in the log with --diff-filter. Is there a --pretty=format: such that I can only show the files with out commit, date, author etc... | 23:21 |
|
| Otherwise... pipe the output to something to filter? | 23:22 |
| ← loulou left | 23:22 |
|
skered
| --name-status seems to make it more machine readable. | 23:22 |
| ← rosco left | 23:25 |
| → Auctus joined | 23:25 |
| → jklfds joined | 23:27 |
|
Auctus
| i have a merge conflict in one specific file and want to keep my version and discard all changes *only to that file* from the branch im merging | 23:29 |
|
| i tried reading about it, i can find "--ours" but that would ignore all changes to all files from the other branch, and not just the file i care about? | 23:29 |
|
ZacSharp
| you can just checkout the version you want | 23:30 |
|
Auctus
| i tried that, "git checkout --ours file.ext" but i still have merge error on the same file, something's not clicking in my head | 23:31 |
| ← kilobyte_ch left | 23:31 |
| ← jklfds left | 23:31 |
|
ZacSharp
| oh, I thought you meant `git merge --ours` not `git checkout --ours` (didn't even know the latter existed) | 23:32 |
|
Auctus
| ah, i figured it out. I have to git add file.ext and then commit it before i can finish the merge | 23:32 |
|
ZacSharp
| ? | 23:33 |
|
Auctus
| my brain isnt working today. I spent 5 minutes trying to put my email into a username field and wonder why it wouldnt log in. | 23:33 |
|
ZacSharp
| if you commit during a merge that commit becomes the merge commit, so what you said is impossible | 23:33 |
|
| the checkout part looks right though | 23:34 |
| ← Narrat left | 23:35 |
| → ilogger2 joined | 23:36 |
|
Auctus
| ZacSharp: this is what i did https://pastebin.com/SdEaKDjM | 23:38 |
|
| does that make sense? It seems to have worked. | 23:38 |
|
| maybe i broke it. | 23:38 |
|
ZacSharp
| it contains everything I expected, plus a few harmless NOPs | 23:39 |
|
| after you did the `git add` the commit finished the merge and the rest is not needed | 23:39 |
|
| oh, and the `git merge` between adding and committing is also not needed | 23:40 |
|
| if that file was the only thing you needed to fix before finishing the merge everything should be fine now | 23:41 |
|
Auctus
| cool, thanks | 23:41 |
| → jklfds joined | 23:44 |
| → kilobyte_ch joined | 23:45 |
| → roadie joined | 23:46 |
| ← jklfds left | 23:48 |
| ← roadie left | 23:52 |
| → defec7ed joined | 23:55 |