| 2024-04-01 |
| → sys32 joined | 00:00 |
| ← toric left | 00:03 |
| → toric joined | 00:03 |
| ← toric left | 00:03 |
| ← larryv left | 00:04 |
| → larryv joined | 00:05 |
| ← beber_ left | 00:05 |
| → falafel_ joined | 00:05 |
| ← chandash left | 00:08 |
| ← bloody left | 00:10 |
| → beber_ joined | 00:12 |
| → bloody joined | 00:22 |
| ← Mooncairn left | 00:23 |
| → Mooncairn joined | 00:23 |
| ← Guru_DE left | 00:27 |
| ← xx left | 00:29 |
| → xx joined | 00:29 |
| ← Noisytoot left | 00:33 |
| → Noisytoot joined | 00:33 |
| ← henry40408 left | 00:34 |
| → henry40408 joined | 00:34 |
| ← beber_ left | 00:36 |
| → michael_mbp joined | 00:36 |
| ← henry40408 left | 00:37 |
| → henry40408 joined | 00:37 |
| ← akibageek left | 00:41 |
| → r5c4571lh01987 joined | 00:46 |
| ← henry40408 left | 00:46 |
| → henry40408 joined | 00:47 |
| ← zloi_user_ left | 00:48 |
| ← bloody left | 00:48 |
| ← r5c4571lh01987 left | 00:49 |
| ← ZLima12 left | 00:51 |
| → ZLima12 joined | 00:51 |
| ← falafel_ left | 00:54 |
| ← peepsalot left | 00:54 |
| → duxsco joined | 00:54 |
| ← fireonlive left | 00:56 |
| → fireonlive joined | 00:56 |
| → peepsalot joined | 00:56 |
| ← voker57 left | 00:56 |
| → voker57 joined | 00:58 |
| → beber_ joined | 00:59 |
| ← Riviera left | 01:00 |
| → JAA joined | 01:01 |
| ← astlep5504018066 left | 01:11 |
| → stenno joined | 01:14 |
| → toric joined | 01:20 |
| ← wurstwasser left | 01:26 |
| ← hritik left | 01:32 |
| → hritik joined | 01:32 |
| ← cdown left | 01:41 |
| ← rgrinberg left | 01:46 |
| ← duxsco left | 01:50 |
| → duxsco joined | 01:51 |
| ← twb left | 01:52 |
| Noisytoot → Noisymeow | 01:55 |
| → thesqueak joined | 01:57 |
| ← bin101 left | 02:03 |
| ← JanC left | 02:04 |
| ← jinsun left | 02:06 |
| → jinsun joined | 02:07 |
| ← thesqueak left | 02:09 |
| → astlep5504018066 joined | 02:09 |
| → JanC joined | 02:09 |
| → bin101 joined | 02:10 |
| → gast0n joined | 02:10 |
| → duxsco_ joined | 02:11 |
| ← duxsco left | 02:14 |
| ← astlep5504018066 left | 02:16 |
| → astlep5504018066 joined | 02:25 |
| → arch-angel joined | 02:25 |
| ← Vonter left | 02:28 |
| → Vonter joined | 02:28 |
| ← arch-angel left | 02:31 |
| ← blacknova left | 02:35 |
| ← Yruama left | 02:38 |
| → Guru_DE joined | 02:42 |
| ← drocan left | 02:57 |
| ← nitrix left | 03:01 |
| → nitrix joined | 03:01 |
| ← mrpops2ko left | 03:02 |
| ← yxt left | 03:04 |
| → yxt joined | 03:04 |
| ← lucasta left | 03:06 |
| → yangxt joined | 03:12 |
| ← henry40408 left | 03:13 |
| → henry40408 joined | 03:13 |
| → mrpops2ko joined | 03:15 |
| → igemnace joined | 03:16 |
| → drocan joined | 03:16 |
| ← Erisa left | 03:17 |
| → Erisa joined | 03:17 |
| ← henry40408 left | 03:35 |
| → henry40408 joined | 03:35 |
| → sahil_ joined | 03:36 |
| ← skapata left | 03:37 |
| ← fererrorocher left | 03:40 |
| → gsi_ joined | 03:42 |
| ← gsi left | 03:46 |
| → jacobk joined | 03:51 |
| ← mark_infinite left | 03:57 |
| ← Jaxef left | 03:57 |
| ← jacobk left | 03:57 |
| ← Betal left | 03:58 |
| ← llh left | 04:03 |
| → hbautista joined | 04:05 |
| ← qmzbux left | 04:10 |
| → llh joined | 04:13 |
| → qmzbux joined | 04:13 |
| ← hbautista left | 04:15 |
| ← ZachGibbens left | 04:27 |
| ← JanC left | 04:31 |
| → JanC joined | 04:32 |
| ← toric left | 04:37 |
| → JanC_ joined | 04:44 |
| JanC → Guest2589 | 04:44 |
| ← Guest2589 left | 04:44 |
| JanC_ → JanC | 04:44 |
| → Coop56 joined | 04:46 |
| ← Coop left | 04:50 |
| ← gast0n left | 05:00 |
| → akibageek joined | 05:01 |
| → YuGiOhJCJ joined | 05:05 |
| → zetef joined | 05:11 |
| ← sahil_ left | 05:19 |
| → sahil_ joined | 05:23 |
| ← sahil_ left | 05:25 |
| ← JanC left | 05:26 |
| ← stenno left | 05:27 |
| → Gary_Sinise joined | 05:31 |
| → sahil_ joined | 05:32 |
| ← larryv left | 05:34 |
| ← Mooncairn left | 05:37 |
| ← sahil_ left | 05:40 |
| ← bket left | 05:40 |
| → jacobk joined | 05:43 |
| → JanC joined | 05:43 |
| ← JanC left | 05:44 |
| → JanC joined | 05:44 |
| → bket joined | 05:47 |
| ← bket left | 05:47 |
| ← hamburgler left | 05:49 |
| → hamburgler joined | 05:50 |
| → bket joined | 05:50 |
| ← joako left | 05:51 |
| → joako joined | 05:53 |
| ← Gary_Sinise left | 05:53 |
| ← JanC left | 05:56 |
| ← Rhonda left | 05:59 |
| ← chuanshi left | 05:59 |
| ← yxt left | 05:59 |
| → JanC joined | 06:00 |
| → Rhonda joined | 06:02 |
| ← yangxt left | 06:02 |
| ← JanC left | 06:04 |
| ← jensen left | 06:05 |
| → JanC joined | 06:05 |
| ← JanC left | 06:06 |
| → JanC joined | 06:07 |
| ← henry40408 left | 06:07 |
| → henry40408 joined | 06:08 |
| ← JanC left | 06:12 |
| ← Zumo left | 06:13 |
| → JanC joined | 06:19 |
| ← sys32 left | 06:19 |
| ← JanC left | 06:21 |
| → JanC joined | 06:21 |
| → cixx joined | 06:26 |
| → sparseblame joined | 06:27 |
| → jinsun_ joined | 06:28 |
| jinsun → Guest9051 | 06:28 |
| ← Guest9051 left | 06:28 |
| jinsun_ → jinsun | 06:28 |
|
sparseblame
| Good day, how do i see git blame in sparse repo? If i clone with filtered blobs and checkout it gets stuck on loading lines while gcing every 10 seconds. | 06:31 |
| ← YuGiOhJCJ left | 06:35 |
| → YuGiOhJCJ joined | 06:36 |
| ← henry40408 left | 06:37 |
| → henry40408 joined | 06:38 |
| → zloi_user_ joined | 06:45 |
| → bagatur joined | 06:46 |
| ← duxsco_ left | 06:49 |
| ← sparseblame left | 06:53 |
| ← JanC left | 06:53 |
| ← henry40408 left | 06:55 |
| → duxsco joined | 06:55 |
| → henry40408 joined | 06:55 |
| ← jacobk left | 06:59 |
| ← FinnElija left | 06:59 |
| → FinnElija joined | 06:59 |
| ← leon left | 07:01 |
| → leon joined | 07:01 |
| ← Misotauros left | 07:07 |
| ← dav1d left | 07:07 |
| → dav1d joined | 07:07 |
| ← dav1d left | 07:08 |
| → dav1d joined | 07:09 |
| → jmd joined | 07:14 |
| → iNomad joined | 07:15 |
| → zloi_user__ joined | 07:15 |
| ← zloi_user_ left | 07:18 |
| → theoceaniscool joined | 07:19 |
| ← thiago left | 07:23 |
| → user1 joined | 07:24 |
| → Misotauros joined | 07:26 |
| ← karabaja4 left | 07:33 |
| → stenno joined | 07:56 |
| ← stenno left | 07:56 |
| ← duxsco left | 08:03 |
| ← Vonter left | 08:12 |
| → Vonter joined | 08:13 |
| → sparseblame joined | 08:14 |
| → wootehfoot joined | 08:15 |
|
sparseblame
| Hello, is there a way to get a blame in sparse repo? | 08:15 |
| ← user1 left | 08:15 |
| ← igemnace left | 08:15 |
| ← stagas left | 08:19 |
| → linux_dream joined | 08:21 |
|
linux_dream
| hi people I'm facing an annoying problem with bitbucket and git | 08:22 |
|
| I have done work on computer B, git pushed to bitbucket without problem | 08:22 |
|
| on computer A, I want to git pull to get my work on this computer... | 08:22 |
|
| but then I get this error: error: The following untracked working tree files would be overwritten by merge: (and shows a list of files, some of them deleted on computer B, and one of them is only on computer B) | 08:23 |
|
| how is that possible? untracked? but they are already comitted to the remote... wtf? | 08:24 |
|
| how can I git pull then? I already tried git stash on computer A, but this didn't fix anything | 08:24 |
|
| I am following chatGPT's tips, I did git clean -f. this said this removed a file. git pull still doesn't work | 08:30 |
| → stats4647 joined | 08:32 |
| ← gildasio left | 08:32 |
| → igemnace joined | 08:33 |
| → gildasio joined | 08:34 |
|
ikke
| Start with git status | 08:34 |
| ← gildasio left | 08:34 |
| → gildasio joined | 08:34 |
|
ikke
| It's perfectly possible to commit new files on one machine that already exist (but untracked) on the other | 08:34 |
|
linux_dream
| git status shows 2 folders untracked. those are deleted on machine B. I want them deleted here too, but git pull ain't able to do so | 08:36 |
|
| I have just manually deleted them here on machine A now. git pull now shows a permission error | 08:36 |
|
| Updating 3d2a820..ec59ce1 | 08:37 |
|
| error: unable to unlink old '.ipynb_checkpoints/goal_Bridgman-checkpoint.md': Permission denied | 08:37 |
| ← stats4647 left | 08:37 |
|
linux_dream
| I guess I have to chmod the directory. for some reason... never faced this problem before in the 20 to 30 previous commits | 08:37 |
|
| so strange.... doens't make any sense. I didn't do anything different than before | 08:37 |
| ← michael_mbp left | 08:38 |
|
linux_dream
| chmod: changing permissions of '2D_Bridgman_textbook_example/.ipynb_checkpoints': Operation not permitted | 08:40 |
|
| damn it. I added sudo. it worked, now I have the permissions. However now I get the same error as in the beginning | 08:41 |
|
| Updating 3d2a820..ec59ce1 error: Your local changes to the following files would be overwritten by merge: .ipynb_checkpoints/goal_Bridgman-checkpoint.md goal_Bridgman.md Please commit your changes or stash them before you merge. error: The following untracked working tree files would be overwritten by merge: (bunch | 08:42 |
|
| of files) Please move or remove them before you merge. Aborting | 08:42 |
|
| git status shows my whole repository now | 08:43 |
|
| because I changed the rights I suppose, it doesn't recognize my files as the files they were before I changed teh rights | 08:43 |
|
| git stash won't work. permission defined WTF | 08:44 |
|
| how do I force a simple git pull? | 08:44 |
|
| I want my computer A to be in line with computer B (and remote bitbucket). | 08:45 |
|
| I am 1 commit behind in computer A. that's all. the rest is BS from git | 08:45 |
|
| git pull -f ? | 08:45 |
| → jacobk joined | 08:46 |
|
ikke
| linux_dream: start by making sure all files are owned by your current user so that you don't need to use sudo | 08:47 |
| ← zetef left | 08:47 |
|
linux_dream
| I just did a sudo chmod -R ug+w .; | 08:47 |
|
| on stack overflow they say it will work, upvoted answer with over 100 votes | 08:48 |
|
ikke
| You need to use chown | 08:48 |
|
| chown -R $UID:$GID . | 08:49 |
| → duxsco joined | 08:49 |
|
linux_dream
| sudo chown -R $USER:$USER . ? | 08:49 |
|
| ok done | 08:50 |
|
| git status now: Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: .ipynb_checkpoints/Bridgman_Nye_example-checkpoint.ipynb modified: .ipynb_checkpoints/goal_Bridgman-checkpoint.md modified: | 08:50 |
|
| TE_simulation/.ipynb_checkpoints/BN_example-checkpoint.ipynb modified: TE_simulation/.ipynb_checkpoints/Bridgman_Nye_example-checkpoint.py Untracked files: (use "git add <file>..." to include in what will be committed) TE_simulation/meshes/test_meshes.py TE_simulation/normals.bp/ TE_simulation/tangents.bp/ | 08:51 |
|
| can I git stash now and then pull ? | 08:52 |
| → sys32 joined | 08:54 |
|
linux_dream
| git stash still yields: error: unable to unlink old 'TE_simulation/.ipynb_checkpoints/BN_example-checkpoint.ipynb': Permission denied | 08:54 |
|
| the hell??? | 08:54 |
| → humanface joined | 08:55 |
|
mjt0k
| a trivial unix permission issue. check ownership and permissions of the directory (TE_simulation/.ipynb_checkpoints in this case). | 08:56 |
|
linux_dream
| I have given the permission to read write to my user | 08:56 |
|
mjt0k
| There's No Magic (tm) | 08:57 |
|
linux_dream
| followed 3 stack overflow answers, one of them over 100 rated, the otehrs over 40 | 08:57 |
|
| I just did a sudo chmod -R g+w over the folder | 08:57 |
|
| all the commands worked, but I still can't git stash | 08:57 |
|
| mjt0k goes away from this | 08:57 |
|
linux_dream
| none of the stack overflow answers worked | 08:57 |
|
| I gotta git reset --hard I guess | 08:57 |
|
| I guess I won't be able though due to a mysterious error | 08:58 |
| → Zumo joined | 08:58 |
|
| mjt0k wonders if it's the new era when people use ratings on stackowerflow as a substitute for local /dev/brain | 08:58 |
| ← cixx left | 08:59 |
|
circuitbone
| linux_dream: make a testproject, keep the project when you are going to learn a new git commands. `git stash` is one you use frequently at the start when you forget to pull on a new machine before starting. | 09:01 |
|
linux_dream
| nevermind I fixed teh problem | 09:01 |
|
circuitbone
| good job | 09:01 |
|
linux_dream
| git stash wouldn't work | 09:01 |
|
| due to permission errors | 09:01 |
|
circuitbone
| fair enough | 09:01 |
|
mjt0k
| <mjt0k> a trivial unix permission issue. check ownership and permissions of the directory (TE_simulation/.ipynb_checkpoints in this case). | 09:02 |
|
circuitbone
| add/ commit/ push then pull on a new machine, finally status | 09:02 |
|
linux_dream
| mjt0k I added user rights to read and write to the whole folder TE_simulations recursively , and then to subfolders individually as I was still facing permission errors. that didn't work | 09:03 |
|
| so now I am in a non perfect situation, but at least I could git pull | 09:04 |
|
| in my history of commits, I had a commit that only removed some folders | 09:04 |
|
| now that commit is "undone". this caused these massive problems | 09:04 |
|
circuitbone
| good luck working through it | 09:04 |
|
linux_dream
| I thought I could delete the files, git add . , git commit -m 'blablah" and git push | 09:05 |
|
| seemed to have worked, until I did the git pull | 09:05 |
|
| drwxrwxr-x 6 user user 4096 Apr 1 11:01 TE_simulation | 09:06 |
|
| -rw-r--r-- 1 isaac isaac 2821 Apr 1 11:01 goal_Bridgman-checkpoint.md | 09:07 |
|
| so I should have gotten the rights, right? Why on Earth was I facing permission error? | 09:07 |
| ← Vonter left | 09:07 |
| → rgrinberg joined | 09:08 |
| → zetef joined | 09:08 |
| ← rgrinberg left | 09:08 |
|
linux_dream
| I will remove once again the folders and recommit. I don't understand why I can't git pull when I delete folders. | 09:08 |
|
circuitbone
| git add . can be problematic for some langauges/projects that may have large binaries you don't want to add to the mix. The .md file might have been you adjusting a readme after saving on computer A/ | 09:09 |
| ← ch left | 09:10 |
| → ch joined | 09:10 |
|
linux_dream
| yes exactly | 09:10 |
| ← jmd left | 09:11 |
|
circuitbone
| git status will show what needs to be added, painful to work through each file, but much more sane. | 09:11 |
|
linux_dream
| or removed, yes | 09:13 |
| ← cbreak left | 09:14 |
| → cbreak joined | 09:15 |
|
circuitbone
| anyway gotta dash | 09:15 |
| ← sparseblame left | 09:15 |
| ← sys32 left | 09:16 |
| → sys32 joined | 09:16 |
| ← linux_dream left | 09:20 |
| → rgrinberg joined | 09:29 |
| ← rgrinberg left | 09:37 |
| → jmd joined | 09:38 |
| ← weko left | 09:41 |
| ← rigid left | 09:44 |
| → rigid joined | 09:45 |
| → rgrinberg joined | 09:51 |
| ← zloi_user__ left | 09:56 |
| ← henry40408 left | 10:04 |
| ← jmd left | 10:12 |
| → squealingcode joined | 10:13 |
| ← squealingcode left | 10:14 |
| → tirnanog joined | 10:19 |
| ← xx left | 10:23 |
| ← rgrinberg left | 10:23 |
| → Lord_of_Life_ joined | 10:29 |
| ← Lord_of_Life left | 10:29 |
| → jmd joined | 10:30 |
| Lord_of_Life_ → Lord_of_Life | 10:30 |
| → squealingcode joined | 10:30 |
| → stagas joined | 10:30 |
| ← knolle left | 10:32 |
| → knolle joined | 10:32 |
| ← squealingcode left | 10:36 |
| → cjoke joined | 10:37 |
| → weko joined | 10:37 |
| → OverCoder joined | 10:39 |
| → Vonter joined | 10:41 |
| ← zetef left | 10:52 |
| ← DPA left | 10:56 |
| → DPA joined | 10:56 |
| → jinsun_ joined | 11:01 |
| jinsun → Guest2216 | 11:01 |
| jinsun_ → jinsun | 11:01 |
| ← Guest2216 left | 11:04 |
| ← jacobk left | 11:05 |
| → squealingcode joined | 11:11 |
| ← Celelibi left | 11:21 |
| → Celelibi joined | 11:21 |
| ← stagas left | 11:25 |
| → stagas joined | 11:27 |
| → cdown joined | 11:28 |
| ← dsimic left | 11:36 |
| → dsimic joined | 11:38 |
| ← pascal_blaze left | 11:47 |
| → navi joined | 11:58 |
| → xx joined | 11:59 |
| ← sys32 left | 12:01 |
| → szkl joined | 12:06 |
| → fererrorocher joined | 12:20 |
| ← YuGiOhJCJ left | 12:31 |
| → kus joined | 12:32 |
| → causasui joined | 12:59 |
| → davidsenk joined | 13:01 |
| → skapata joined | 13:02 |
| → sahil_ joined | 13:03 |
| ← akibageek left | 13:10 |
| ← beber_ left | 13:10 |
| ← sahil_ left | 13:17 |
| → sahil_1 joined | 13:18 |
| → beber_ joined | 13:18 |
| sahil_1 → sahil_ | 13:20 |
| → ferdna joined | 13:21 |
| ← dngray left | 13:30 |
| ← hritik left | 13:32 |
| → hritik joined | 13:32 |
| ← lv8pv left | 13:33 |
| → lv8pv joined | 13:37 |
| ← benaldo left | 13:38 |
| → benaldo joined | 13:39 |
| → cyber_heretic joined | 13:43 |
| ← cyber_heretic left | 13:47 |
| ← benaldo left | 13:58 |
| → benaldo joined | 13:59 |
| → raffaele joined | 14:02 |
| ← fling left | 14:03 |
| ← GNUmoon2 left | 14:03 |
| ← Lockesmith left | 14:03 |
| ← hussein1 left | 14:03 |
| ← FinnElija left | 14:03 |
| ← penne left | 14:03 |
| ← opal left | 14:03 |
| ← gildasio left | 14:03 |
| ← adanwan left | 14:04 |
| ← bindu left | 14:04 |
| ← raffaele__ left | 14:05 |
| ← hritik left | 14:05 |
| → hritik joined | 14:06 |
| ← fererrorocher left | 14:07 |
| → penne joined | 14:07 |
| → Lockesmith joined | 14:08 |
| → bindu joined | 14:08 |
| → gildasio joined | 14:08 |
| → hussein1 joined | 14:08 |
| → FinnElija joined | 14:08 |
| ← hussein1 left | 14:13 |
| → jerware joined | 14:13 |
|
jerware
| hello folks. | 14:14 |
| → hussein1 joined | 14:14 |
| ← Coop56 left | 14:15 |
| ← penne left | 14:16 |
| → penne joined | 14:16 |
|
jerware
| I want to disassociate a tracking local branch from the remote branch at origin, delete the remote branch, AND keep the local branch. | 14:17 |
|
| I'm worried about clobbering local. | 14:17 |
| → opal joined | 14:18 |
| → GNUmoon2 joined | 14:18 |
| → jensen joined | 14:20 |
|
j416
| jerware: git push origin :foo # where origin is your remote and foo is your branch, to delete the branch from the remote | 14:22 |
|
jerware
| the thing is I cant push it to origin, because I did a reset --soft and made some changes. | 14:23 |
|
quesker
| I put this in PS1 but if you aren't in a checkout it errors. is there a good way to check or should I just 2>/dev/null | 14:23 |
|
j416
| jerware: git branch --unset-upstream foo # where foo is your branch, to remove the tracking info | 14:23 |
|
quesker
| git branch --show-current | 14:23 |
|
hexology
| you can do `git push origin --delete foo` instead of the `:foo` incantation | 14:23 |
|
j416
| jerware: that doesn't push your local branch, it deletes the branch | 14:23 |
| ← humky left | 14:24 |
|
j416
| quesker: check the prompt contrib for inspiration | 14:25 |
|
quesker
| k | 14:26 |
| ← dostoyevsky2 left | 14:27 |
|
j416
| quesker: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh | 14:27 |
| → dostoyevsky2 joined | 14:27 |
|
quesker
| thanks | 14:28 |
|
j416
| for example, https://github.com/git/git/blob/d6fd04375f91/contrib/completion/git-prompt.sh#L409-L417 | 14:28 |
| ← remedan left | 14:29 |
| ← GNUmoon2 left | 14:30 |
| → GNUmoon2 joined | 14:30 |
|
quesker
| k. too bad there is no -q for this git rev-parse --is-inside-work-tree | 14:30 |
|
j416
| or just, use that contrib, it's not bad :) | 14:31 |
| → delay joined | 14:31 |
|
quesker
| I don't need 4000 things just the branch | 14:31 |
|
j416
| fair enough | 14:31 |
|
| it does get sluggish with huge repos indeed | 14:31 |
|
| not sure if reading just the branch info fixes that; maybe. | 14:32 |
| → adanwan joined | 14:34 |
| ← GNUmoon2 left | 14:35 |
| → rsx joined | 14:35 |
| → GNUmoon2 joined | 14:35 |
| ← Celelibi left | 14:36 |
| → remedan joined | 14:37 |
| ← penne left | 14:39 |
| → penne_ joined | 14:39 |
| → gast0n joined | 14:39 |
| ← penne_ left | 14:40 |
| → penne joined | 14:40 |
| → Celelibi joined | 14:40 |
| → thiago joined | 14:44 |
| → Jaxef joined | 14:44 |
| → bloody joined | 14:44 |
| ← adanwan left | 14:47 |
| → adanwan joined | 14:47 |
| ← adanwan left | 14:52 |
| → adanwan joined | 14:52 |
| → akibageek joined | 14:54 |
| ← myme1 left | 14:57 |
| → myme joined | 14:58 |
| → user1 joined | 15:00 |
| ← adanwan left | 15:00 |
| → adanwan joined | 15:01 |
| → qgnox joined | 15:04 |
| → fererrorocher joined | 15:05 |
| ← jensen left | 15:06 |
| → jensen joined | 15:08 |
| → Mooncairn joined | 15:10 |
| ← ferdna left | 15:14 |
|
kurahaupo
| hexology: when was « git push --delete » added? | 15:16 |
| ← adanwan left | 15:17 |
| → adanwan joined | 15:17 |
| ← duxsco left | 15:18 |
| → duxsco joined | 15:18 |
| ← jmd left | 15:18 |
|
j416
| hexology: ::f517f1f2e9c9 | 15:20 |
|
| what's that syntax again | 15:21 |
|
| :f517f1f2e9c9 | 15:21 |
|
| :f517f1f2e9c9: | 15:21 |
|
ikke
| needs to be {40} | 15:21 |
|
j416
| meh | 15:21 |
|
| ::f517f1f2e9c9e3abe0fde1b3c9a7bb20fdb5ba55 | 15:21 |
|
| ¯\_(ツ)_/¯ | 15:21 |
|
| that commit, anyway. 2009. | 15:21 |
| → f_ joined | 15:23 |
| ← f_ left | 15:24 |
| ← cdown left | 15:33 |
| ← theoceaniscool left | 15:33 |
| ← CovertDuck left | 15:35 |
| → CovertDuck joined | 15:36 |
| ← sahil_ left | 15:37 |
|
gsish
| so, it was only recently :-] | 15:45 |
| → theoceaniscool joined | 15:47 |
| → tennisanders joined | 15:53 |
| ← peirik left | 16:00 |
|
gsish
| so it was git:f517f1f2e9c9e3abe0fde1b3c9a7bb20fdb5ba55 (feature intro, 2009-12-30) and git:84d52cabe7044786b5cc448ffeb97b7c1e667156 (merge, 2010-01-10) | 16:03 |
|
| how does one find these? in this case git log ... --grep ' --delete' helped, but when the search pattern is not as obvious, what do you do? | 16:04 |
| → sahil_ joined | 16:04 |
|
gsish
| or when obvious patterns are too ambiguous and match too many places | 16:04 |
| → peirik joined | 16:04 |
|
ikke
| gsish: I usually start with the RelNotes | 16:05 |
|
gsish
| should a bot have provided links for the above? is the syntax still not right? or does it not like two of these on one line? | 16:07 |
|
| oh, double colon, yep syntax error on my side | 16:07 |
| → chair1 joined | 16:07 |
|
gsish
| so for the record it'd be git::f517f1f2e9c9e3abe0fde1b3c9a7bb20fdb5ba55 and git::84d52cabe7044786b5cc448ffeb97b7c1e667156 | 16:08 |
|
gitinfo
| Git web link: https://github.com/git/git/commit/f517f1f2e9c9e3abe0fde1b3c9a7bb20fdb5ba55 | 16:08 |
|
| Git web link: https://github.com/git/git/commit/84d52cabe7044786b5cc448ffeb97b7c1e667156 | 16:08 |
| ← igemnace left | 16:13 |
| ← navi left | 16:16 |
| → navi joined | 16:16 |
| → siak joined | 16:21 |
| → jacobk joined | 16:27 |
| ← tennisanders left | 16:37 |
| ← kurahaupo left | 16:39 |
|
hexology
| j416: i never saw that contrib script before, that's a nice example | 16:40 |
| ← skapata left | 16:43 |
| ← peirik left | 16:47 |
| → peirik joined | 16:49 |
| ← extor left | 16:50 |
| → extor joined | 16:50 |
| → mark_infinite joined | 16:54 |
| ← chair1 left | 17:04 |
|
jerware
| thanks j416 | 17:06 |
| → ursa joined | 17:09 |
|
ursa
| I want to use pgp keys to sign commits. I'm transferring the secret key from one machine to the signing machine, and need someone to explain the difference between clean and minimize operations in gnupg. Does anyone know? | 17:10 |
| → chair1 joined | 17:12 |
| → Wh0 joined | 17:17 |
| → baggy joined | 17:18 |
| ← baggy left | 17:18 |
| → pac1 joined | 17:23 |
| → Jck_true8 joined | 17:23 |
| ← Jck_true left | 17:23 |
| Jck_true8 → Jck_true | 17:23 |
| → larryv joined | 17:26 |
| → Apollyon joined | 17:26 |
| → filePeter joined | 17:30 |
| → Narrat joined | 17:32 |
| ← hritik left | 17:37 |
| → hritik joined | 17:37 |
| ← sahil_ left | 17:40 |
| → kurahaupo joined | 17:40 |
| → sahil_ joined | 17:41 |
| ← tirnanog left | 17:50 |
| ← rsx left | 17:52 |
| ← iNomad left | 17:53 |
| → jmd joined | 17:59 |
| ← michele left | 18:08 |
| ← delay left | 18:09 |
| → michele joined | 18:10 |
| → stef204 joined | 18:12 |
| → duxsco_ joined | 18:16 |
| ← hritik left | 18:17 |
| → hritik joined | 18:18 |
| ← qgnox left | 18:18 |
| ← duxsco left | 18:18 |
| ← denysonique left | 18:19 |
| ← stef204 left | 18:20 |
| → skapata joined | 18:21 |
| ← filePeter left | 18:21 |
| → qgnox joined | 18:23 |
| → PantelicGR joined | 18:23 |
| → toric joined | 18:26 |
| → denysonique joined | 18:26 |
| → pascal_blaze joined | 18:27 |
| ← pascal_blaze left | 18:27 |
| ← hritik left | 18:28 |
| → hritik joined | 18:28 |
| ← Wh0 left | 18:28 |
| → Wh0 joined | 18:29 |
| ← ju left | 18:29 |
| → ju joined | 18:29 |
| → pascal_blaze joined | 18:30 |
| ← jacobk left | 18:34 |
| ← pascal_blaze left | 18:35 |
| ← Wh0 left | 18:35 |
| ← jmd left | 18:42 |
| → cahoots joined | 18:45 |
|
cahoots
| hi, i have a colleague who wants to keep a long-running branch for their work that periodically gets merged into main (and main merged into it as well). i'm curious to understand, if i merge A into B and there are lots of conflicts i have to resolve, and then i merge B into A, will the latter merge be conflict-free? | 18:46 |
|
nullie
| there will be nothing to merge if there will be no commits in A after merging it into B, so no conflicts | 18:48 |
|
| be aware that reverts are problematic in this setup | 18:49 |
|
| well, merge reverts, otherwise it's ok | 18:49 |
| → kjartan joined | 18:56 |
|
cahoots
| nullie, ty | 18:57 |
| → pascal_blaze joined | 19:01 |
| ← squealingcode left | 19:04 |
| → jacobk joined | 19:05 |
| ← jensen left | 19:08 |
| → jensen joined | 19:09 |
| ← sahil1_ left | 19:11 |
| ← wootehfoot left | 19:13 |
| → cousteau joined | 19:20 |
| ← sahil_ left | 19:21 |
| → meator joined | 19:21 |
| ← meator left | 19:22 |
| ← jacobk left | 19:26 |
| ← jfsimon1981 left | 19:29 |
| → cpackham joined | 19:30 |
| → jacobk joined | 19:33 |
| ← pascal_blaze left | 19:41 |
| ← jacobk left | 19:43 |
| ← PocketKiller left | 19:55 |
| ← treefrob left | 20:02 |
| → squealingcode joined | 20:04 |
| ← Noisymeow left | 20:04 |
| → Noisytoot joined | 20:06 |
| → treefrob joined | 20:08 |
| ← bagatur left | 20:11 |
| → PocketKiller joined | 20:11 |
| → cdown joined | 20:12 |
| ← keypusher left | 20:13 |
| → rom4ik8 joined | 20:13 |
| ← duxsco_ left | 20:14 |
| ← dylanj left | 20:15 |
| → dylanj joined | 20:15 |
| ← rom4ik left | 20:15 |
| rom4ik8 → rom4ik | 20:15 |
| → keypusher joined | 20:15 |
| → fling joined | 20:19 |
| ← keypusher left | 20:20 |
| → keypusher joined | 20:22 |
| → sahil_ joined | 20:22 |
| Noisytoot → Noisymeow | 20:23 |
| ← keypusher left | 20:27 |
| → keypusher joined | 20:28 |
|
j416
| gsish: for this specific one I used git log --grep '--delete' | 20:32 |
|
| gsish: I usually --grep or -S | 20:32 |
|
| cahoots: in the latter case, git will simply move the branch pointer and make A == B | 20:34 |
| → humky joined | 20:34 |
| → duxsco joined | 20:34 |
| ← duxsco left | 20:38 |
| → sahil1_ joined | 20:38 |
| → aruncs joined | 20:48 |
| ← aruncs left | 20:48 |
| → aruncs joined | 20:54 |
| → jacobk joined | 20:55 |
| → tirnanog joined | 21:00 |
| ← kus left | 21:04 |
| → duxsco joined | 21:04 |
| → Yruama joined | 21:04 |
| ← jacobk left | 21:07 |
| → pascal_blaze joined | 21:11 |
| ← aruncs left | 21:13 |
| → pascal_blaze_ joined | 21:15 |
| → delay joined | 21:16 |
| → jacobk joined | 21:18 |
| ← pascal_blaze left | 21:18 |
| → stats4647 joined | 21:19 |
| ← Ishmael left | 21:20 |
| ← siak left | 21:21 |
| ← pascal_blaze_ left | 21:23 |
| ← Mooncairn left | 21:24 |
| ← stats4647 left | 21:24 |
| ← skapata left | 21:26 |
| → ZachGibbens joined | 21:27 |
| ← duxsco left | 21:29 |
| ← beber_ left | 21:30 |
| → hritik_ joined | 21:32 |
| ← hritik left | 21:32 |
| → keypushe- joined | 21:33 |
| → riposte joined | 21:33 |
| → beber_ joined | 21:33 |
| ← keypusher left | 21:35 |
| keypushe- → keypusher | 21:36 |
| ← keypusher left | 21:42 |
| → keypusher joined | 21:42 |
| → hritik joined | 21:47 |
| ← hritik_ left | 21:48 |
| ← hritik left | 21:49 |
| → hritik joined | 21:50 |
| ← theoceaniscool left | 21:56 |
| → Ishmael joined | 22:02 |
| → skapata joined | 22:04 |
| ← kjartan left | 22:10 |
| → Leonarbro joined | 22:15 |
| → pascal_blaze joined | 22:16 |
| → JanC joined | 22:18 |
| → dostoyev1ky2 joined | 22:25 |
| ← PantelicGR left | 22:26 |
| ← dostoyevsky2 left | 22:26 |
| ← dostoyev1ky2 left | 22:27 |
| → dostoyevsky2 joined | 22:27 |
| → nabaiste^ joined | 22:31 |
| ← keypusher left | 22:32 |
| ← JanC left | 22:32 |
| → keypusher joined | 22:32 |
| ← sahil_ left | 22:33 |
| → JanC joined | 22:35 |
| → Planet_EN joined | 22:35 |
| ← Planet_EN left | 22:36 |
| ← stagas left | 22:37 |
| ← toric left | 22:38 |
| ← keypusher left | 22:41 |
| → keypusher joined | 22:42 |
| ← ursa left | 22:44 |
| ← keypusher left | 22:45 |
| → keypusher joined | 22:46 |
| ← keypusher left | 22:51 |
| ← delay left | 22:57 |
| → Gary_Sinise joined | 22:57 |
|
jrm
| Is there a way to get something like `git log --branches="*"...` to also display the branch name? | 22:57 |
| → Planet_EN joined | 22:58 |
| ← Planet_EN left | 22:58 |
| ← Gary_Sinise left | 22:59 |
| → redlizard joined | 23:01 |
| ← humanface left | 23:04 |
| ← pascal_blaze left | 23:05 |
| ← sentriz left | 23:12 |
| ← JamesMowery left | 23:12 |
| → JamesMowery joined | 23:14 |
| → keypusher joined | 23:16 |
| ← Narrat left | 23:23 |
| ← xx left | 23:24 |
| → xx joined | 23:24 |
|
xx
| these are my current steps to investigate the differences between downloaded and generated .zip archives https://0x0.st/XzJt.txt | 23:24 |
|
| does anyone know the answer? | 23:24 |
| → sentriz joined | 23:26 |
| ← user1 left | 23:28 |
| ← cjoke left | 23:29 |
| ← xx left | 23:32 |
| → xx joined | 23:33 |
| ← sentriz left | 23:40 |
| → sentriz joined | 23:40 |
| → bluesm__ joined | 23:40 |
| ← jacobk left | 23:44 |
| → Gary_Sinise joined | 23:49 |
|
xx
| found the answer | 23:50 |
| → keypushe- joined | 23:52 |
| ← keypusher left | 23:55 |
| keypushe- → keypusher | 23:56 |
| → bx0 joined | 23:58 |
| ← bx0 left | 23:58 |