| 2019-09-24 |
| ← xcm left | 00:01 |
| ← squirrel left | 00:01 |
| ← justanotheruser left | 00:01 |
| ← FernandoBasso left | 00:02 |
| → xcm joined | 00:02 |
| → squirrel joined | 00:03 |
| ← localhorse left | 00:05 |
| ← nuala left | 00:07 |
| ← daurnimator left | 00:08 |
| → wreed joined | 00:08 |
| ← gordonfish left | 00:11 |
| ← shabius left | 00:14 |
| → daurnimator joined | 00:15 |
| ← blackmesa left | 00:15 |
| → shabius joined | 00:17 |
| ← lucasb left | 00:17 |
| → justanotheruser joined | 00:22 |
| ← igemnace left | 00:22 |
| ← dartmouthed left | 00:24 |
| ← xall_ left | 00:25 |
| → kotisky joined | 00:25 |
| → omnireq joined | 00:29 |
| ← m0viefreak left | 00:30 |
| ← kotisky left | 00:30 |
| → vdamewood joined | 00:34 |
| ← budonyc left | 00:42 |
| ← amcclure left | 00:43 |
| ← is_null left | 00:44 |
| → amcclure joined | 00:49 |
| → jottr_ joined | 00:49 |
| → kotisky joined | 00:57 |
| ← jottr_ left | 01:01 |
| ← boombatower left | 01:01 |
| ← thomasross left | 01:01 |
| ← bitwinery left | 01:04 |
| ← Sasazuka left | 01:05 |
| → bitwinery joined | 01:05 |
| → nabil__ joined | 01:09 |
| → stitched_unicorn joined | 01:11 |
| → jottr_ joined | 01:11 |
| ← nabil_ left | 01:12 |
| → jackkall joined | 01:13 |
| → macaronus joined | 01:15 |
| ← jottr_ left | 01:16 |
| → a0s510 joined | 01:25 |
| ← xcm left | 01:30 |
| → xcm joined | 01:31 |
| ← ferdna left | 01:33 |
| ← jackkall left | 01:33 |
| ← protektwar left | 01:34 |
| → protektwar joined | 01:36 |
| ← Guest79846 left | 01:37 |
| → Guest79846 joined | 01:37 |
| ← tgunr left | 01:44 |
| → learningc joined | 01:44 |
| ← wreed left | 01:45 |
| ← F0rTex left | 01:46 |
| → wreed joined | 01:46 |
| ← cbreak left | 01:47 |
| → F0rTex joined | 01:47 |
| → cbreak joined | 01:48 |
| ← a0s510 left | 01:59 |
| → fphilipe_ joined | 02:00 |
| ← Envil left | 02:03 |
| ← fphilipe_ left | 02:04 |
| → jguddas-tr2 joined | 02:04 |
| → atrigent joined | 02:05 |
| ← jguddas-tr2 left | 02:08 |
| → Envil joined | 02:10 |
| ← Cabanossi left | 02:10 |
| ← wreed left | 02:13 |
| → computeiro joined | 02:14 |
| ← lagothrix left | 02:15 |
| → lagothrix joined | 02:15 |
|
computeiro
| I deleted a file. `git status` -> deleted: article/s0144.pdf | 02:15 |
|
| How to revert this delete? | 02:15 |
| → mns_ joined | 02:16 |
|
rewt
| git checkout -- article/s0144.pdf | 02:17 |
|
| (with that -- before the file) | 02:17 |
| → Cabanossi joined | 02:18 |
|
computeiro
| ty rewt | 02:18 |
|
rewt
| np | 02:18 |
| → wreed joined | 02:18 |
| ← mns left | 02:19 |
| ← computeiro left | 02:21 |
| ← bambanx left | 02:22 |
| ← pR0Ps left | 02:27 |
| → a0s510 joined | 02:29 |
| → SkarmoutsosV joined | 02:31 |
| → pR0Ps joined | 02:32 |
| ← a0s510 left | 02:40 |
| ← edwardly left | 02:45 |
| → b1tninja joined | 02:47 |
|
b1tninja
| Is there a way to find the commit that closest resembles my working directory | 02:47 |
|
| Number of matching files would be good enough metric, don't need diff distance of similar files | 02:49 |
| → edwardly joined | 02:50 |
| → rople joined | 02:52 |
|
b1tninja
| Basically trying to match a fork initial commit to it's parent | 02:56 |
| ← G left | 03:01 |
| ← nic-hartley left | 03:03 |
| ← Guest79846 left | 03:04 |
| → Guest79846 joined | 03:05 |
| ← crose left | 03:05 |
| → glosoli joined | 03:09 |
|
rwp
| b1tninja, I had to do something similar in an svn repository not that long ago. I found a file that had comment changes and used it to bracket the versions from earliest to latest. That narrowed it down. | 03:11 |
|
b1tninja
| I know it's near Android kernel 3.10.62 but so many commits | 03:11 |
| ← glosoli left | 03:17 |
| → a0s510 joined | 03:17 |
| ← jnewt left | 03:20 |
|
SJr
| If I look at a git diff between two branches I see a perfect PR, however if I try and merge or rebase I get a ton of conflicts I don't care about. It seems like I can just make a new branch off master and apply the diff, however it seems there shoulld be a way of doing this more naturally. | 03:27 |
| ← atrigent left | 03:29 |
| ← a0s510 left | 03:31 |
| → nic-hartley joined | 03:32 |
| → igemnace joined | 03:33 |
| → howaboutsynergy joined | 03:34 |
|
howaboutsynergy
| I'm trying to get the diff of a specific file which is inside a submodule. How could I do that without chdir-ing to the submodule dir first? ie. this works: `cd third_party/perfetto/ && git diff gn/BUILD.gn` but this doesn't: `git --git-dir=third_party/perfetto/.git diff --submodule=diff third_party/perfetto/gn/BUILD.gn` especially without the --git-dir | 03:34 |
| ← igemnace left | 03:35 |
| ← yonder left | 03:36 |
| ← pie__ left | 03:37 |
| → g00s joined | 03:41 |
| → yonder joined | 03:41 |
|
b1tninja
| Try without specifying submodule | 03:43 |
|
| You also have eq diff | 03:43 |
|
| Don't think that's what you meant | 03:43 |
|
howaboutsynergy
| eq diff? | 03:44 |
|
| no effect(ie. no diff) with just `git diff third_party/perfetto/gn/BUILD.gn` | 03:44 |
|
b1tninja
| With git dir | 03:44 |
|
| Or use -C | 03:45 |
|
howaboutsynergy
| no effect like: $ git --git-dir=third_party/perfetto/.git diff -C third_party/perfetto/gn/BUILD.gn | 03:46 |
|
| though, even if it worked, would the diff show like: | 03:47 |
|
| --- a/gn/BUILD.gn | 03:47 |
|
| or: | 03:47 |
|
| --- a/third_party/perfetto/gn/BUILD.gn | 03:47 |
|
| the latter I'd prefer, but i don't see how it would do that | 03:48 |
|
| I guess I'm stuck having to sed the diff, after I get the former output by first chdir-ing to where the BUILD.gn file is | 03:48 |
|
| though it's kinda odd that --git-dir= doesn't seem to have effect, oh waitttttt it's the path | 03:51 |
|
| with git-dir, the path to the file isn't third_party/perfetto/ anymore | 03:51 |
|
| ok this doesn't work: $ git --git-dir=third_party/perfetto/.git diff gn/BUILD.gn | 03:51 |
|
| fatal: ambiguous argument 'gn/BUILD.gn': unknown revision or path not in the working tree. | 03:52 |
|
| this sort of works but it compares it to /dev/null : $ git --git-dir=third_party/perfetto/.git diff -- gn/BUILD.gn | 03:52 |
| → e^1 joined | 03:53 |
|
howaboutsynergy
| This $ git --git-dir=third_party/perfetto/.git diff .clang-format | 03:55 |
|
| Actually compares third_party/perfetto/.clang-format with ./.clang-format oh boy | 03:55 |
| → motoko-chan joined | 03:55 |
| ← libertyprime left | 03:56 |
|
howaboutsynergy
| I guess I'd need a --git-dir arg for the file to compare with too | 03:56 |
| ← SCHAPiE left | 03:57 |
| → SCHAPiE joined | 03:59 |
| → pie_ joined | 04:01 |
| ← lankanmon left | 04:02 |
| → gavlee joined | 04:03 |
| → lankanmon joined | 04:06 |
| ← nic-hartley left | 04:06 |
| ← publio left | 04:08 |
| → bambanx joined | 04:10 |
| ← SkarmoutsosV left | 04:11 |
| → igemnace joined | 04:13 |
| → snappy joined | 04:14 |
|
e^1
| is it a good practise to source gitignore and gitattributes files from gitconfig ? | 04:14 |
|
snappy
| how do i import a git repository and history to another git repo? i have a separate origin setup for the repo i want to merge in, but i don't know what to do to bring it in | 04:14 |
|
e^1
| I am version controling my git files, current structure is, gitconfig ( file ), git-conf (dir) where i have kept all the other necesary git* related files | 04:15 |
|
snappy
| i'm thinking maybe (1) create branch with the new repo, put it in the right directory, then try to rebase it on the mainline repo? | 04:16 |
| ← donofrio left | 04:16 |
| ← howaboutsynergy left | 04:17 |
| → dartmouthed joined | 04:21 |
| ← Cabanossi left | 04:25 |
| ← shored left | 04:26 |
| → shored joined | 04:26 |
| ← igemnace left | 04:29 |
| → igemnace joined | 04:30 |
| ← neunon left | 04:30 |
| ← wreed left | 04:32 |
| → Cabanossi joined | 04:38 |
| ← tryte left | 04:45 |
| → tryte joined | 04:45 |
| → a0s510 joined | 04:47 |
| ← dustinm left | 04:53 |
| → hojang joined | 04:54 |
| → dustinm joined | 04:56 |
| ← g00s left | 04:57 |
| ← igemnace left | 04:58 |
| → dustinm` joined | 04:59 |
| ← SmashingX left | 05:00 |
| ← dustinm left | 05:00 |
| → igemnace joined | 05:01 |
| → dijitol joined | 05:01 |
| → pks_ joined | 05:02 |
| → yokisuci joined | 05:03 |
| ← comptroller left | 05:04 |
| ← pks left | 05:04 |
| pks_ → pks | 05:04 |
| → glosoli joined | 05:07 |
| ← hojang left | 05:10 |
| ← Wetmelon left | 05:13 |
| ← Inline left | 05:14 |
| ← vdamewood left | 05:15 |
| → comptroller joined | 05:16 |
| ← pie_ left | 05:19 |
| ← igemnace left | 05:19 |
| → SkarmoutsosV joined | 05:22 |
| → igemnace joined | 05:25 |
| → jackkall joined | 05:28 |
| ← yonder left | 05:29 |
| ← comptroller left | 05:31 |
| ← SkarmoutsosV left | 05:31 |
| ← dijitol left | 05:31 |
| ← a0s510 left | 05:32 |
| → blackmesa joined | 05:34 |
| ← steven left | 05:35 |
| → steven joined | 05:38 |
| → libertyprime joined | 05:38 |
| → omnireq_ joined | 05:41 |
| ← omnireq left | 05:43 |
| ← igemnace left | 05:44 |
| → comptroller joined | 05:49 |
| ← roadie left | 05:50 |
| → n3wborn joined | 05:53 |
| → feriman joined | 05:56 |
| → fphilipe_ joined | 06:00 |
| ← comptroller left | 06:01 |
| → comptroller joined | 06:03 |
| ← fphilipe_ left | 06:04 |
| → g00s joined | 06:07 |
| → sQVe joined | 06:08 |
| → rfuentess joined | 06:08 |
| → roadie joined | 06:10 |
| → TomTom joined | 06:11 |
| → feep[work] joined | 06:13 |
|
feep[work]
| yo | 06:13 |
|
| does anyone have a script to show the disk use of each commit in a git history? by this I mean the amount of space used by objects first referenced in the commit | 06:14 |
|
| I have a repo that has a big file *somewhere* in its history that I want to rebase out, but I don't know where. | 06:14 |
| markzen_ → markzen | 06:19 |
|
feep[work]
| updated question: I just found rebase --exec, is there an env var that contains the id of the commit? | 06:19 |
| ← yokisuci left | 06:20 |
|
j416
| feep[work]: you might want to look into filter-branch instead | 06:20 |
|
feep[work]
| nm just found $GIT_COMMIT | 06:20 |
|
| j416: yeah that's what I'll do once I've found what file it is | 06:20 |
|
j416
| yeah you said rebase, that's why I suggested it. | 06:20 |
|
feep[work]
| hm I suppose I can just not make any changes in filter-branch | 06:21 |
|
j416
| you could probably script something around something like git ls-tree -l <commit> | sort -k 4 | 06:22 |
|
feep[work]
| hm, if I could get a list of all commits | 06:22 |
|
j416
| man git-rev-list | 06:22 |
|
gitinfo
| the git-rev-list manpage is available at https://gitirc.eu/git-rev-list.html | 06:22 |
| ← bitwinery left | 06:22 |
| → Noti joined | 06:22 |
|
feep[work]
| thanks | 06:23 |
|
j416
| a start: git rev-list --all | while read commit; do git ls-tree -rl $commit | sort -k 4; sleep 1; done | 06:24 |
| → clime joined | 06:24 |
| ← cd left | 06:26 |
|
feep[work]
| found the commit | 06:26 |
|
j416
| o/ | 06:26 |
| ← blackmesa left | 06:27 |
| → thefatma joined | 06:27 |
|
feep[work]
| j416: spoiler: 865357824 Sep 24 08:26 core | 06:27 |
|
| think that might be contributing, lol | 06:28 |
|
j416
| I don't have that commit so I don't know what you mean, sorry | 06:31 |
|
feep[work]
| it's a corefile | 06:31 |
|
j416
| oh it's the size | 06:31 |
|
feep[work]
| somebody committed a corefile | 06:31 |
|
| >.< | 06:31 |
|
j416
| haha. | 06:31 |
|
feep[work]
| tbf it's mostly sparse.. still. why. | 06:31 |
| → cdown joined | 06:34 |
| ← motoko-chan left | 06:35 |
| ← comptroller left | 06:36 |
| ← clime left | 06:37 |
| ← mojisun_ left | 06:45 |
| → mojisun_ joined | 06:46 |
| → gloomy joined | 06:51 |
| ← gloomy left | 06:52 |
| nabil__ → nabil | 06:52 |
| ← jackkall left | 06:53 |
| → comptroller joined | 06:53 |
| → TomyWork joined | 06:54 |
| → chele joined | 06:56 |
| → gloomy joined | 06:56 |
| ← lankanmon left | 06:56 |
| ← gloomy left | 06:56 |
| → lankanmon joined | 06:59 |
| → yokisuci joined | 07:01 |
| → SteffanW joined | 07:02 |
| ← Noti left | 07:02 |
|
feep[work]
| hm. new question: I have a commit in my repo, and I cannot for the life of me get rid of it no matter what arcane flags I pass to git gc. it's not in the log of master, and there's no other branches | 07:03 |
|
| how do I find what gc root keeps it alive? | 07:03 |
|
| (it's not in git log --reflog) | 07:04 |
|
| (or in git fsck) | 07:05 |
| → Mattiaslndstrm joined | 07:06 |
|
cbreak
| feep[work]: git clone | 07:06 |
|
| and throw away the original :) | 07:07 |
| → oxymoron93 joined | 07:07 |
|
feep[work]
| ... huh | 07:07 |
|
cbreak
| (be sure to fetch all tags / branches you want to keep, for example using --mirror ( read the fine print )) | 07:07 |
|
feep[work]
| that actually worked. | 07:07 |
|
| repo size before: 66M | 07:08 |
|
| repo size after: 1.6M lol | 07:08 |
|
cbreak
| for a local clone, you might have to do a file:// url clone in some situations | 07:08 |
| ← yokisuci left | 07:09 |
| ← Heirlung- left | 07:10 |
| ← thiago left | 07:11 |
| → jguddas-tr2 joined | 07:11 |
| ← bambanx left | 07:12 |
| → arunkumar413 joined | 07:14 |
| → yokisuci joined | 07:15 |
|
feep[work]
| cbreak: thanks for that hack :D | 07:18 |
|
| it's a lot easier than messing with gc | 07:18 |
|
cbreak
| you'll be sure to lose everything local though | 07:19 |
|
feep[work]
| meh | 07:19 |
|
| :D | 07:19 |
|
cbreak
| including local config, local ignores, hooks, ... | 07:19 |
|
feep[work]
| thanks for the warning, but I am trying to clean up this repo so.. | 07:20 |
|
| alright, now I'm finally at a point where the biggest blob is actual source code | 07:20 |
| ← Luyin left | 07:20 |
|
feep[work]
| also the repo is ~20 times smaller :D | 07:20 |
| → emanuelvirca joined | 07:21 |
| → mobidrop joined | 07:21 |
| ← cdown left | 07:23 |
| → blackmesa joined | 07:23 |
| → abraxxas joined | 07:23 |
| ← kotisky left | 07:24 |
| ← abraxxas left | 07:24 |
| → abraxxas joined | 07:24 |
| → gloomy joined | 07:25 |
| → cdown joined | 07:26 |
| ← mobidrop left | 07:27 |
| ← kent\n left | 07:27 |
| → nerosnm joined | 07:27 |
| → mobidrop joined | 07:27 |
|
emanuelvirca
| Hi everybody, I have a situation I would like to get some directions. I have the main master branch and i came upon the situation that can be seen in this picture: https://imgur.com/MX68UOP . I do not know exactly how it happend and I am interested in moving commits from red master. Both of the branches are master, trancking the remote master. The | 07:27 |
|
| changes have been pushed to remote. | 07:28 |
|
| I would appreciate any direction or starting point for this. Thanks a lot ;) | 07:28 |
| → kent\n joined | 07:29 |
|
rfuentess
| emanuelvirca: that history happened after a `git pull origin master` ? | 07:30 |
| → fphilipe_ joined | 07:31 |
| → pie_ joined | 07:31 |
| ← nerosnm left | 07:31 |
|
emanuelvirca
| I am not pretty sure about this. It was one of my colleague that initiated this. | 07:32 |
|
| I have updated the picture | 07:32 |
| → emanuelvirca74 joined | 07:35 |
| ← emanuelvirca74 left | 07:36 |
| → is_null joined | 07:36 |
| ← emanuelvirca left | 07:37 |
| → tufteddeer joined | 07:38 |
| ← feep[work] left | 07:41 |
| → emanuelvirca joined | 07:46 |
| ← emanuelvirca left | 07:48 |
| → emanuelvirca joined | 07:49 |
| ← nabil left | 07:50 |
|
emanuelvirca
| sorry guys, my connection went off | 07:50 |
| ← yokisuci left | 07:52 |
|
rfuentess
| emanuelvirca: the thing is that is master. Normally the suggestion is let it go as rewriting master is unwise | 07:52 |
|
| (or complex if there are many contributors) | 07:52 |
| ← cdown left | 07:52 |
|
rfuentess
| !rewrite history | 07:53 |
|
gitinfo
| Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 07:53 |
| ← blackmesa left | 07:57 |
|
mobidrop
| hey I have a question about the git! | 07:57 |
|
| I did a git pull and noticed a 26.76 MiB, now I want to know which clown decided to put a file that big in the git! | 07:57 |
|
bookworm
| git log / git show | 07:58 |
| → gxt joined | 07:58 |
| → nabil joined | 07:59 |
|
mobidrop
| the file could be on any branch though | 07:59 |
|
| ah whatever I've forgiven them | 08:00 |
| → jottr_ joined | 08:00 |
| ← brethil left | 08:01 |
| ← jguddas-tr2 left | 08:06 |
| → c0c0 joined | 08:11 |
| → pengpengxp joined | 08:14 |
| → brethil joined | 08:15 |
| → Noti joined | 08:17 |
| ← SteffanW left | 08:17 |
| ← pengpengxp left | 08:18 |
| → jguddas-tr2 joined | 08:21 |
| → nabil_ joined | 08:24 |
|
heftig
| did git 2.23 stop applying diff.interHunkContext to format-patch output? | 08:25 |
| ← jguddas-tr2 left | 08:26 |
| → Makaveli7 joined | 08:26 |
| ← nabil left | 08:27 |
| ← g00s left | 08:27 |
| → hojang joined | 08:37 |
| ← n3wborn left | 08:39 |
| → tsdh joined | 08:41 |
| ← geek1011 left | 08:42 |
| ← mrCyborg left | 08:42 |
| ← Kronuz left | 08:42 |
| ← uebera|| left | 08:43 |
| → geek1011 joined | 08:43 |
| → mrCyborg joined | 08:43 |
| → uebera|| joined | 08:43 |
| → brethil_ joined | 08:44 |
| ← topdownjimmy left | 08:44 |
| ← Envil left | 08:44 |
| ← brethil left | 08:44 |
| ← F0rTex left | 08:44 |
| ← squirrel left | 08:44 |
| ← cjohnson left | 08:44 |
| ← irrgit left | 08:44 |
| ← jstimm left | 08:44 |
| ← eb0t_ left | 08:44 |
| ← wgrant left | 08:45 |
| → topdownjimmy joined | 08:45 |
| → cjohnson joined | 08:45 |
| → clime joined | 08:45 |
| ← zulutango left | 08:45 |
| → irrgit joined | 08:45 |
| → squirrel joined | 08:45 |
| → zulutango joined | 08:45 |
| → Envil joined | 08:45 |
| → laerte joined | 08:46 |
| → F0rTex joined | 08:46 |
| ← teward left | 08:46 |
| → wgrant joined | 08:46 |
| → eb0t_ joined | 08:47 |
| ← emanuelvirca left | 08:48 |
| → Kronuz joined | 08:48 |
| ← hojang left | 08:49 |
| → teward joined | 08:51 |
| → jguddas-tr2 joined | 08:56 |
| ← stitched_unicorn left | 08:57 |
| → mimajof joined | 08:58 |
| ← tufteddeer left | 08:59 |
| → nerosnm joined | 09:01 |
| → javashin joined | 09:02 |
| → tufteddeer joined | 09:03 |
| ← jottr_ left | 09:05 |
| ← gloomy left | 09:05 |
| → enoq joined | 09:05 |
| ← Joel left | 09:05 |
| ← e^1 left | 09:06 |
| → Joel joined | 09:07 |
| ← cbreak left | 09:08 |
| → cbreak joined | 09:09 |
| → hojang joined | 09:09 |
| → nabil__ joined | 09:10 |
| ← glosoli left | 09:11 |
| → jstimm joined | 09:11 |
| → rossome joined | 09:12 |
| ← nabil_ left | 09:13 |
| ← mSSM left | 09:15 |
| → stitched_unicorn joined | 09:17 |
| ← zamba left | 09:20 |
| → gschwind joined | 09:21 |
| → T_UNIX joined | 09:22 |
|
gschwind
| Hello, I did git submodule add, then git reset HEAD, how can I recover my submodule, I still having .gitmodules, and .git/config look to hava submodule initialized, but git submodule does not list my submodule | 09:23 |
| ← hojang left | 09:25 |
| → yokisuci joined | 09:25 |
| ← Makaveli7 left | 09:26 |
| → figuinhas joined | 09:27 |
| ← figuinhas left | 09:28 |
| → zamba joined | 09:28 |
|
pi-
| gschwind: I'm a (perennial) git-noob, but don't you need something like `git submodule update --init --recursive`? (https://stackoverflow.com/questions/3796927/how-to-git-clone-including-submodules) | 09:28 |
| → Makaveli7 joined | 09:28 |
| → figuinhas joined | 09:28 |
| ← figuinhas left | 09:28 |
| → figuinhas joined | 09:29 |
|
gschwind
| pi-, this has no effect I do not know why | 09:31 |
|
pi-
| oh, maybe resetting HEAD removed the submodule-add, because you never pushed the submodule-add upstream | 09:32 |
| ← catsup left | 09:33 |
|
gschwind
| I do not know what happened but for sure I did not commited submodule add, it was the intend :D | 09:33 |
| → catsup joined | 09:34 |
|
gschwind
| but I still having config file set up, thus I hope I can re-add my submodules easily | 09:34 |
|
| other wise I have to do it manualy, but I have about ~50 sub module :D | 09:35 |
|
pi-
| ouf | 09:35 |
| ← yokisuci left | 09:37 |
| ← Cabanossi left | 09:37 |
| → cfoch joined | 09:41 |
| → Cabanossi joined | 09:42 |
| → hojang joined | 09:42 |
|
gschwind
| if that happen that I have no easy way to readd them, I will write a script that read .gitmodules ;) | 09:43 |
|
| that will be faster than re-adding them manually | 09:44 |
| → yokisuci joined | 09:44 |
| → pSouper joined | 09:44 |
|
pSouper
| hey all o/ | 09:44 |
| ← stitched_unicorn left | 09:45 |
|
pSouper
| not entirly understanding git I've got myself in a pickle... I have 2 branches: master & develop. my develop branch has 26ahead and 15behind and i'd like to just replace all of devlop with master to make then the same again. (I've not done anything i need to keep) | 09:46 |
|
| any thoughts/help please? | 09:46 |
|
vlt
| pSouper: In other words you want to delete develop and re-create it on master? | 09:47 |
|
pSouper
| yup. recrease it with files from master | 09:47 |
|
vlt
| pSouper: I don't understand "with files from master". | 09:48 |
|
pSouper
| i tihnk it;s the same as you said but i would still like to branches (master & develop). it's just they should be the same (both the same as master) | 09:49 |
|
| but thanks for checking with me as i know getting git wrong can be very dagerous thing | 09:49 |
| → fstd_ joined | 09:50 |
|
vlt
| pSouper: A bit shorter than what I suggested earlier could be: `git reset --hard master` | 09:50 |
|
oxymoron93
| if you are currently on `develop` ^ | 09:51 |
|
pSouper
| which branch should i be on before i run that? | 09:52 |
|
oxymoron93
| on develop | 09:52 |
|
pSouper
| ah, i get it | 09:52 |
|
| thanks. doin now | 09:52 |
|
| 2mins | 09:52 |
| → blackmesa joined | 09:53 |
|
oxymoron93
| branches are just pointers, if you want to develop points to same revision as master does, you can recreate it there. | 09:54 |
| ← fstd left | 09:54 |
| fstd_ → fstd | 09:54 |
| ← hojang left | 09:56 |
|
vlt
| That's what I suggested first to make it more clear what actually happens. | 09:58 |
|
| pSouper: ^ | 09:58 |
|
gschwind
| if you really want lost your develop branch you can : git checkout -f -b develop master | 09:58 |
|
oxymoron93
| There are many ways to accomplish this. | 09:58 |
|
gschwind
| this command also switch to develop branch | 09:58 |
| ← javashin left | 09:59 |
| → glosoli joined | 09:59 |
|
pSouper
| thanks guys. I;ve notice there are so many way to achieve similar/same things which only adds to my confusion :D | 09:59 |
| ← blackmesa left | 09:59 |
|
pSouper
| I've just tried: git reset --hard master | 10:00 |
|
| it's still saying I have 25ahed and 15behind | 10:01 |
|
| @gschanuel59 "git checkout -f -b develop master" errors with a fatal: A branch named 'develop' already exists. I guess i need to delete this branch first for it to work? | 10:02 |
|
oxymoron93
| `git checkout -B develop master` would work | 10:03 |
| → agowa338 joined | 10:04 |
| ← nerosnm left | 10:04 |
|
pSouper
| on a related not. it would be the same as deleteing the project then cloning it from git right? | 10:04 |
|
| on a related note* | 10:04 |
|
oxymoron93
| again this is the problem? Message you have has to do with remote counterpart. | 10:04 |
|
| practically yes pSouper | 10:05 |
|
pSouper
| coolio. | 10:05 |
|
oxymoron93
| you should grab a !book :) | 10:05 |
|
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 | 10:05 |
|
pSouper
| i definately will grab a book. I'm quite a fan of o'reilly book. | 10:06 |
| → gloomy joined | 10:10 |
| ← fphilipe_ left | 10:11 |
| → kerframil joined | 10:12 |
|
steven
| is there a ref pointing to the commit of which I've branched off? | 10:12 |
| → florekm joined | 10:14 |
| ← sinhue left | 10:15 |
| → liberiga joined | 10:17 |
| → localhorse joined | 10:17 |
| → AtumT joined | 10:19 |
|
oxymoron93
| steven you can probably find it in `git reflog <branch>` | 10:19 |
| ← Hello71 left | 10:19 |
|
oxymoron93
| but yeah, I have nothing better than searching. Maybe `git merge-base --fork-point ...` | 10:20 |
| ← Makaveli7 left | 10:21 |
|
oxymoron93
| you can probably formulate your question more widely as to what you want. There might be other ways for you to do it. | 10:21 |
| → amerigo joined | 10:22 |
| ← abraxxas left | 10:23 |
| ← yokisuci left | 10:25 |
| → Hello71 joined | 10:25 |
| kjartan_ → Kjartan | 10:26 |
|
steven
| I honestly don't know how to formulate it more "widely" :D | 10:31 |
|
| I want the commit from which I did "git checkout -b new-branch" | 10:32 |
| → igemnace joined | 10:32 |
|
cdunklau
| steven: there's no ref, no | 10:32 |
|
pandem
| you can use git merge-base | 10:32 |
| → cdown joined | 10:33 |
|
cdunklau
| steven: a git branch is just a (moveable) reference to a particular commit, nothing else | 10:33 |
|
pandem
| https://git-scm.com/docs/git-merge-base#_discussion | 10:34 |
|
cdunklau
| so the branch doesn't know where it was forked from... but the commit's *history* can be used to find that out | 10:34 |
|
gschwind
| I did a python script that re-add my submodule from .gitmodule | 10:34 |
|
cdunklau
| it's just not an explicit thing | 10:35 |
|
steven
| I konw what it is cdunklau .. thanks pandem that's what I was looking for | 10:35 |
|
cdunklau
| steven: k, sorry, that's just a really common misconception :) | 10:36 |
|
steven
| I get it, always imply the person asking is a complete idiot | 10:38 |
|
| its freenode, chances are quite high for it to be true ;) | 10:38 |
| → yokisuci joined | 10:42 |
| → blackmesa joined | 10:46 |
| → SteffanW joined | 10:49 |
| ← Noti left | 10:50 |
| ← igemnace left | 10:52 |
| ← learningc left | 10:53 |
| ← escherial left | 11:01 |
| ← blackmesa left | 11:02 |
| → blackmesa joined | 11:03 |
| → emsjessec joined | 11:05 |
| mns_ → mns | 11:06 |
| ← rople left | 11:06 |
| → Stoot97 joined | 11:12 |
| → Raging_Hog joined | 11:12 |
| ← Stoot left | 11:13 |
| ← b1tninja left | 11:17 |
| ← xcm left | 11:20 |
| → xcm joined | 11:20 |
| ← gloomy left | 11:22 |
| → zxcat joined | 11:26 |
|
zxcat
| hi all, I wish to kow if is possible and howto, include external directories / files ( that are not in the same dir of .git ) | 11:26 |
|
osse
| zxcat: no it's not possible | 11:28 |
| ← yokisuci left | 11:28 |
|
osse
| zxcat: if you need that maybe you can keep the actual files in git and then have symlinks where the files are supposed to be | 11:28 |
|
zxcat
| hmm.. so for my needs, maybe is better if I simple exclude what I don't need and git will syncronize everything else. | 11:30 |
|
bremner
| you can also use something like !vcsh | 11:30 |
|
gitinfo
| https://github.com/RichiH/vcsh - Version Control System for $HOME - multiple Git repositories in $HOME -- abusing fake bare Git repositories for fun and profit | 11:30 |
|
zxcat
| the propose in fact is to update all files that had some change of a linux system. Is a "bad" idea to setup a git repository at / and exclude what I don't wish to "monitorize" ? | 11:32 |
| → nerosnm joined | 11:32 |
| → computer2000 joined | 11:32 |
|
gschwind
| zxcat, can you describe your use case ? | 11:37 |
| → kotisky joined | 11:37 |
|
gschwind
| zxcat, if you git init / by default all file are excluded | 11:37 |
|
| you need to add then manually | 11:37 |
| → rodorgas joined | 11:38 |
| ← ASDX left | 11:39 |
|
rodorgas
| Hi! Where can I find the changelog of the new Git version? It's hard to google it because "git changelog" doesn't return what I want :p | 11:40 |
| ← c0c0 left | 11:41 |
| → yokisuci joined | 11:41 |
|
zxcat
| gschwind: I guess excluding directories would be simpler. Therefor I can simply 'git add . ' and it will work fine as well. Ok cool! Thnk | 11:41 |
|
rodorgas
| Found it! https://github.com/git/git/blob/master/Documentation/RelNotes/2.23.0.txt | 11:42 |
| ← random_yanek left | 11:44 |
| ← cdown left | 11:44 |
| ← yokisuci left | 11:47 |
| → yokisuci joined | 11:47 |
| → random_yanek joined | 11:51 |
| → jottr_ joined | 11:51 |
| → fphilipe_ joined | 11:53 |
| → azwieg103 joined | 11:58 |
| ← macaronus left | 11:59 |
|
cdunklau
| steven: i know you're joking, but it's really astonishing how long one can use git without knowing relatively basic things about it | 11:59 |
|
| like, i didn't realize that bit about a branch just being a commit for, i dunno, five years? | 12:00 |
|
vlt
| cdunklau: Coming from another VCS? | 12:05 |
|
cdunklau
| vlt: nope! | 12:07 |
| ← fphilipe_ left | 12:07 |
|
cdunklau
| coming from "i wish i could go back in time before i screwed this all up" | 12:08 |
| → fphilipe_ joined | 12:09 |
| ← cfoch left | 12:10 |
| ← blackmesa left | 12:11 |
| → blackmesa joined | 12:13 |
| ← azwieg103 left | 12:16 |
| Stoot97 → Stoot | 12:16 |
| → mowcat joined | 12:17 |
| → cdown joined | 12:22 |
| → CodeSlingerPaul joined | 12:22 |
| ← yokisuci left | 12:24 |
|
vlt
| :D | 12:25 |
| → boombatower joined | 12:26 |
| → cfxd joined | 12:30 |
| ← amerigo left | 12:31 |
| ← nerosnm left | 12:33 |
| → Ranhir joined | 12:33 |
| → igemnace joined | 12:34 |
| → nurdie joined | 12:35 |
| → Dave-Ins joined | 12:39 |
| ← cdown left | 12:41 |
| ← jottr_ left | 12:41 |
| ← Dave-Ins left | 12:42 |
| ← gxt left | 12:43 |
| → Atlenohen joined | 12:46 |
| ← rodorgas left | 12:48 |
| → rodorgas joined | 12:48 |
| → jottr_ joined | 12:49 |
| → lucasb joined | 12:49 |
| ← glosoli left | 12:51 |
|
gschwind
| cdunklau, branch also avoid gd to drop commit dependancy :D | 12:51 |
|
| gc* | 12:51 |
| ← rodorgas left | 12:53 |
| ← fphilipe_ left | 13:00 |
| → javashin joined | 13:00 |
| → learningc joined | 13:01 |
| → tmager joined | 13:01 |
| ← blackmesa left | 13:03 |
| → Heirlung joined | 13:03 |
| ← pSouper left | 13:03 |
| ← xcm left | 13:04 |
| → xcm joined | 13:05 |
| ← iNs left | 13:05 |
| → iNs joined | 13:06 |
| → rodorgas joined | 13:08 |
| → ExeciN joined | 13:08 |
| ← sQVe left | 13:09 |
| → sQVe joined | 13:09 |
| ← sQVe left | 13:09 |
| ← comptroller left | 13:10 |
| ← Mattiaslndstrm left | 13:10 |
| → sQVe joined | 13:10 |
| ← jottr_ left | 13:10 |
| → nerosnm joined | 13:11 |
| → hojang joined | 13:11 |
| ← ExeciN left | 13:11 |
|
henrebotha[m]
| What's the intended way to obtain the shell completion scripts from the contrib dir in the Git source? | 13:12 |
| → ExeciN joined | 13:12 |
|
henrebotha[m]
| Like… I assume installing Git through e.g. apt doesn't also save those scripts somewhere | 13:12 |
|
bremner
| dpkg -L git | grep complet | 13:13 |
|
Hello71
| apt search git complet | 13:14 |
| ← nerosnm left | 13:15 |
| → nerosnm joined | 13:15 |
|
henrebotha[m]
| Thanks | 13:16 |
|
| I pretend to know computers but secretly I'm just fooling everyone | 13:16 |
| → yokisuci joined | 13:16 |
| ← xcm left | 13:16 |
| → xcm joined | 13:17 |
|
anddam
| while doing some test on rebasing I got https://gist.github.com/anddam/6fb02fd58a53168f36a53b18f93606ee | 13:17 |
|
| I expected to have a linear history with feature-Y coming after feature-X, should I have "carried" master at the same commit of feature-X ? | 13:18 |
|
| this was git checkout feature-Y; git rebase master | 13:18 |
| → SuperL4g joined | 13:19 |
| → comptroller joined | 13:19 |
| ← SuperLag left | 13:21 |
| → fphilipe_ joined | 13:22 |
|
henrebotha[m]
| Weird, dpkg says there's only Bash completions? Nothing for Zsh? | 13:22 |
| → howdoi joined | 13:22 |
| → Mattiaslndstrm joined | 13:24 |
|
bremner
| iirc, git completions for zsh ship with zsh | 13:24 |
|
cdunklau
| anddam: that looks kinda strange, could you do `git log --graph --oneline --decorate` ? | 13:25 |
|
bremner
| dpkg -L zsh-common| grep git | 13:25 |
|
henrebotha[m]
| Yeah that's true, but I want to use the script from git.git | 13:27 |
| ← steven__ left | 13:29 |
| → steven__ joined | 13:29 |
| → z8z joined | 13:29 |
| ← nurdie left | 13:31 |
| → imigunov joined | 13:32 |
| ← xcm left | 13:34 |
| → xcm joined | 13:34 |
| → scrote joined | 13:35 |
|
scrote
| hello | 13:35 |
| ← Cabanossi left | 13:37 |
|
scrote
| suppose master updates by several commits while in the middle of your branch, and then decide to merge that branch into master, will it work (other than conflicts)? | 13:38 |
| ← apetresc left | 13:42 |
|
osse
| scrote: yes | 13:42 |
| → malina joined | 13:42 |
|
scrote
| do I have to rebase ? | 13:43 |
| ← xcm left | 13:43 |
|
osse
| no | 13:44 |
| → xcm joined | 13:44 |
| → crose joined | 13:44 |
| → apetresc joined | 13:45 |
| ← arunkumar413 left | 13:46 |
| ← malina left | 13:46 |
| → br4z joined | 13:48 |
| ← learningc left | 13:49 |
|
scrote
| if my branch consists of more than 1 commit, must I squash them all into 1 commit before merging into master in order for all changes go in to master | 13:50 |
| → tgunr joined | 13:50 |
|
scrote
| no, if you merge a branch, you'll merge all of its commits. | 13:50 |
| → Cabanossi joined | 13:51 |
| ← dgw left | 13:52 |
| → czart joined | 13:52 |
| ← oxymoron93 left | 13:53 |
| → nic-hartley joined | 13:53 |
| ← xcm left | 13:53 |
| ← imigunov left | 13:53 |
| → xcm joined | 13:54 |
| → Dougie187 joined | 13:54 |
| → f3r70rr35f joined | 13:54 |
| → onmeac joined | 13:58 |
| → malmalmal joined | 14:00 |
|
gschwind
| scrote, your are right | 14:01 |
|
anddam
| cdunklau: yep, but I progressed further already squashing feature-Y to a single commit with a rebase --interactive | 14:03 |
|
| cdunklau: do you still want the git log output? | 14:03 |
| ← onmeac left | 14:04 |
| ← br4z left | 14:04 |
| ← hojang left | 14:05 |
| ← mobidrop left | 14:05 |
| → cdleonard joined | 14:06 |
| → mobidrop joined | 14:06 |
|
anddam
| cdunklau: update the gist | 14:07 |
| → ericfreese joined | 14:08 |
| ← thefatma left | 14:09 |
| ← sQVe left | 14:12 |
| ← nerosnm left | 14:14 |
| → thefatma joined | 14:16 |
| → jottr_ joined | 14:16 |
| SuperL4g → SuperLag | 14:17 |
| ← cdleonard left | 14:20 |
| ← Mattiaslndstrm left | 14:23 |
| ← omnireq_ left | 14:25 |
| → greggerz joined | 14:25 |
| → SkarmoutsosV joined | 14:26 |
| ← gschwind left | 14:26 |
| → zumba_addict joined | 14:27 |
|
zumba_addict
| Hi all. Is it possible to retrieve info about the committer on a remote non-master branch? | 14:27 |
| ← clime left | 14:28 |
|
zumba_addict
| like seeing commits on the remote branch | 14:28 |
| → magic_ninja_work joined | 14:28 |
| → gloomy joined | 14:28 |
| → planetcall|work joined | 14:29 |
| → Newami joined | 14:29 |
| ← ExeciN left | 14:29 |
|
zumba_addict
| or list committer's name of remote branches | 14:29 |
|
cdunklau
| anddam: oooh i see, it's because of --all | 14:29 |
|
| anddam: you rebased feature-Y, but you didn't touch feature-X | 14:31 |
|
anddam
| well I did, feature-X itself was rebased onto master | 14:31 |
|
| both feature-X and feature-Y were branched at first commit | 14:31 |
|
cdunklau
| anddam: right? | 14:32 |
|
| anddam: you didn't merge feature-X | 14:32 |
| → donofrio joined | 14:32 |
|
anddam
| I should have kept a list of the commands I ran, basically "init, first commit, branch X, branch Y, commit on master, commit on X, commit on Y, rebase X on master, rebase Y on master" | 14:33 |
|
| I have not merged anything yet | 14:33 |
|
cdunklau
| anddam: run `history` in your terminal? | 14:34 |
|
anddam
| now I should merge if feature X is complete, right? | 14:34 |
|
| cdunklau: I am not on bash | 14:34 |
|
cdunklau
| :/ | 14:34 |
| ← gloomy left | 14:34 |
| → royal_screwup21 joined | 14:34 |
|
anddam
| once I complete X I checkout master, and merge feature-X. Then I am not sure if I should delete branch feature-X or not | 14:34 |
| → nurdie joined | 14:36 |
|
cdunklau
| anddam: erm, did you branch Y off of X? or off of master? | 14:36 |
|
moldy
| anddam: git branch --merged will will show you the branches that are merged into your current branch | 14:36 |
|
henrebotha[m]
| zumba_addict: you can use `git fetch` to retrieve information about remote branches | 14:36 |
|
cdunklau
| anddam: because it looks like you branched Y from master | 14:37 |
| → usbguy1 joined | 14:38 |
| ← ericfreese left | 14:38 |
| → ericfreese joined | 14:39 |
| ← ericfreese left | 14:40 |
| → imigunov joined | 14:40 |
| → ericfreese joined | 14:40 |
|
anddam
| cdunklau: Y off of master | 14:41 |
|
cdunklau
| okay, and you didn't merge or rebase feature-X | 14:41 |
| ← ericfreese left | 14:41 |
|
anddam
| I did rebase feature-X | 14:41 |
|
| I was exactly doing this as rebasing exercise | 14:42 |
| → ericfreese joined | 14:42 |
|
anddam
| this is a gimmick repo | 14:42 |
|
cdunklau
| apparently not, otherwise 6c7260b wouldn't show up as a fork there | 14:42 |
| → nuala joined | 14:43 |
|
anddam
| why not? I branched X off of 73a1221 then rebased on ed2968e squashing a couple commits into what became 6c7260b | 14:43 |
|
| when I rebased master stayed at ed2968e and feature-X at 6c7260b | 14:44 |
|
| that part seems quite linear to me, I mean it's what I expected | 14:44 |
| ← nic-hartley left | 14:44 |
| ← malmalmal left | 14:44 |
|
cdunklau
| anddam: okay, well, that doesn't agree with what's showing up | 14:44 |
|
anddam
| should I try and reproduce? | 14:45 |
|
cdunklau
| anddam: master is currently at ed2968e, feature-Y is at 0c5ed7a (parent being ed2968e), and feature-X is at 6c7260b (also parent being ed2968e) | 14:45 |
|
| oh okay, i think i see what your confused about | 14:46 |
| → gloomy joined | 14:46 |
|
cdunklau
| so you separately rebased X and Y against master | 14:46 |
|
| but you haven't merged anything. all three branches have a linear history, but X and Y diverge from one another | 14:47 |
|
| so if you want master to have that linear history, you need to merge one of the branches into master, then rebase the other branch again, and then merge that into master | 14:48 |
| ← gloomy left | 14:50 |
| ← royal_screwup21 left | 14:50 |
|
anddam
| yes, I think I get that, I am not confused (atm) | 14:50 |
|
cdunklau
| maybe i was confused :) | 14:50 |
|
anddam
| with the rebase I only incorporated additional changes into master into both features that at this moment are still separate feature branches | 14:50 |
|
| once I complete each of them I will merge into master | 14:51 |
|
| what I do not know is if I should then delete the merged branch or not | 14:51 |
|
cdunklau
| you don't have a merged branch | 14:51 |
|
| or do you mean after you do your merging | 14:51 |
|
anddam
| yes, that was an hypothetical sentence | 14:52 |
|
cdunklau
| ok | 14:52 |
|
| i mean, you can, if you want | 14:52 |
|
anddam
| but should I? | 14:52 |
|
cdunklau
| i usually delete those | 14:52 |
|
anddam
| ok, the "short lived" or "light" branch approach of git | 14:53 |
|
| (I'm used to mercurial) | 14:53 |
|
cdunklau
| isn't it the same kind of thing in hg? | 14:53 |
| ← fphilipe_ left | 14:53 |
|
anddam
| cdunklau: I think I am all set for now | 14:53 |
|
| different topic, given the last log in second-test.txt in my gist, is there a way to tell git "set master tip to e3ce91f"? | 14:55 |
| ← lmariscal8 left | 14:55 |
| ← mimajof left | 14:55 |
| → lmariscal joined | 14:55 |
|
cdunklau
| anddam: sure, merge feature-X | 14:56 |
|
| it'll be a FF merge | 14:56 |
|
| (so there shouldn't be a merge commit) | 14:56 |
| → nika_ joined | 14:57 |
|
cdunklau
| anddam: and to be sure about that, --ff-only | 14:57 |
| → malmalmal joined | 14:58 |
| ← justanotheruser left | 14:58 |
|
anddam
| cdunklau: the 'merge-commit' would be the newly created one for the merge, that is absent in a fast-forward operation, right? | 14:59 |
| ← rodorgas left | 15:00 |
|
anddam
| this is somehow starting to make sense | 15:00 |
|
cdunklau
| anddam: right. | 15:00 |
| ← im0nde1 left | 15:00 |
|
cdunklau
| anddam: say you merged feature-X as it is now, you'd get an FF merge | 15:01 |
|
| so master would just be updated to point at the tip of feature-X, no commit | 15:01 |
| → im0nde_ joined | 15:01 |
|
cdunklau
| anddam: but then you merged feature-Y, without rebasing. that wouldn't be a FF merge since feature-X's commit isn't in feature-Y | 15:01 |
|
| so then you'd get a merge commit | 15:02 |
|
| (and it would show up in the graph) | 15:02 |
| ← shored left | 15:02 |
| → shored joined | 15:02 |
| ← Atlenohen left | 15:04 |
|
anddam
| unless I merge -ff-only then rebase Y on master (that now has X in it) | 15:04 |
| ← SkarmoutsosV left | 15:04 |
|
anddam
| for the --ff-only should I be on master and merge feature-X or be on feature-X and merge master? | 15:05 |
| → oatmealraisin joined | 15:05 |
| ← SteffanW left | 15:06 |
| → omnireq joined | 15:06 |
| → thiago joined | 15:07 |
| ← yokisuci left | 15:07 |
| → yokisuci joined | 15:07 |
|
anddam
| TIAS, I had to be on master and merge the feature branch | 15:08 |
|
| cdunklau: and apropos that double fast-forward without rebasing Y on master I get "fatal: Not possible to fast-forward, aborting" | 15:09 |
|
| this is brilliant, makes even more sense | 15:09 |
| ← cfxd left | 15:10 |
| → malina joined | 15:10 |
| → achen_ joined | 15:14 |
|
anddam
| cdunklau: thanks so much | 15:14 |
| ← usbguy1 left | 15:14 |
|
cdunklau
| anddam: \o/ np | 15:14 |
| ← achen_ left | 15:15 |
|
Celmor[m]
| is there a way to copy a file I want to adapt for a new "component" and keep it's git history so I can differentiate between edited changes and copied stuff via git blame (or IDE highlights)? | 15:15 |
| ← thefatma left | 15:16 |
| → gloomy joined | 15:16 |
| ← enoq left | 15:17 |
|
moldy
| Celmor[m]: afaik, no | 15:18 |
|
| Celmor[m]: in such cases i make a copy, commit it with an appropriate commit message, than start editing from there | 15:18 |
|
anddam
| cdunklau: last question last, apropos the figure at "Integrating an Approved Feature" https://www.atlassian.com/git/tutorials/merging-vs-rebasing | 15:18 |
|
Dougie187
| Celmor[m]: you could always filter-branch the file, and then merge the filtered branch into the other branch you want it in. | 15:19 |
|
| If that makes any sense. | 15:19 |
|
anddam
| cdunklau: the initial state has the head of feature with two parents, one from master. That would mean a merge of master in feature has happened already, right? | 15:20 |
|
Celmor[m]
| moldy: but the copy in the new place will cause errors if left unchanged | 15:20 |
|
moldy
| Celmor[m]: what kind of errors? | 15:20 |
| → usbguy1 joined | 15:20 |
|
anddam
| I am clear about the two following scenarios but that image seems a bit off, I would have guessed the two branch would have un-connected heads | 15:20 |
| → cdown joined | 15:20 |
|
Celmor[m]
| paths/package/module specifications, it's just not intended to be "there" | 15:21 |
|
Dougie187
| Celmor[m]: I actually think (after re-reading your question) that I don't understand fully what you're looking for. So hopefully moldy knows and can help you instead. :P | 15:21 |
|
moldy
| Celmor[m]: who cares? :) | 15:21 |
|
| Celmor[m]: not each individual commit needs to be a working state | 15:21 |
| ← mobidrop left | 15:22 |
| ← zumba_addict left | 15:22 |
| ← computer2000 left | 15:22 |
| ← jguddas-tr2 left | 15:22 |
|
Celmor[m]
| I like to keep the code in my commits in a working state so if something breaks I see exactly made it break | 15:22 |
| ← chele left | 15:23 |
|
Celmor[m]
| so filter-branch just copies the history of the path? | 15:24 |
|
scrote
| If i'm squashing via interactive rebase, can I change the final commit's (the one everything is squashed into)'s commit message right there during the interactive rebase? Or must it remain the same, and do an additional --ammend if I want to change it | 15:27 |
| → _xor joined | 15:28 |
| → royal_screwup21 joined | 15:31 |
| → gxt joined | 15:32 |
| → czart_ joined | 15:33 |
| ← cdown left | 15:33 |
| ← czart left | 15:36 |
| ← _xor left | 15:36 |
| → _xor joined | 15:37 |
| → justanotheruser joined | 15:37 |
| → glosoli joined | 15:38 |
| → agg joined | 15:39 |
| → threenuc joined | 15:40 |
| → blackmesa joined | 15:41 |
| → ExeciN joined | 15:42 |
| ← glosoli left | 15:42 |
| → dijitol joined | 15:43 |
|
threenuc
| Hi. I have this repo - https://github.com/3nuc/dotfiles . Recently it's possible to use git submodules as a plugin manager for Vim, so I tried to take advantage of that. I clone the repo using `git clone [url] --recursive` but it the folders in ~/dotfiles/.vim/plugins/start/[anyplugin] are empty. Meaning the clone didn't recursively load submodules. Why is that the case? My .gitmodules file is in dotfiles/.vim folder | 15:43 |
| ← imigunov left | 15:43 |
| ← tsaka__ left | 15:45 |
|
moldy
| Celmor[m]: you still see exactly what broke if you commit the copied file in a single commit | 15:46 |
| → tsaka__ joined | 15:46 |
| ← teward left | 15:46 |
| ← rfuentess left | 15:46 |
|
cdunklau
| anddam: yes, that's correct. master was merged into Feature | 15:47 |
|
moldy
| scrote: not sure from the top of my head, but if you rebase one commit further back, it should definitely be possible | 15:47 |
|
cdunklau
| anddam: you don't _have_ to do that before rebasing, IIRC, but it's probably a good idea, since you'd want to make sure the merge would actually work, test it, etc | 15:49 |
|
| i'm off | 15:50 |
| ← _xor left | 15:51 |
| → _xor joined | 15:51 |
| ← shored left | 15:52 |
| → shored joined | 15:52 |
| → oxymoron93 joined | 15:52 |
| ← _xor left | 15:53 |
| → nerosnm joined | 15:53 |
| → _xor joined | 15:53 |
| → tharkun joined | 15:55 |
| → teward joined | 15:56 |
|
tharkun
| Good $DAY some idiot erased a branch from our git server. Is there a way to figure out who did it? | 15:56 |
| → e^1 joined | 15:58 |
|
bin_bash
| linux server? | 15:59 |
|
igemnace
| not from within git, no. are you using some git hosting provider? | 15:59 |
| ← ed_peguillan left | 16:01 |
| ← gxt left | 16:05 |
| ← gloomy left | 16:07 |
| ← malina left | 16:15 |
| → malina joined | 16:17 |
| → jguddas-tr2 joined | 16:17 |
| → jguddas-tr3 joined | 16:18 |
| ← threenuc left | 16:19 |
| ← thiago left | 16:19 |
| → glosoli joined | 16:20 |
| ← tgunr left | 16:20 |
| ← agowa338 left | 16:20 |
| ← lupine left | 16:21 |
| → lupine joined | 16:21 |
| ← jguddas-tr2 left | 16:21 |
| ← glosoli left | 16:22 |
| ← jottr_ left | 16:25 |
| → gareppa joined | 16:28 |
| im0nde_ → im0nde1 | 16:28 |
| → jottr_ joined | 16:28 |
| ← javashin left | 16:29 |
| → jottr joined | 16:31 |
| ← liberiga left | 16:32 |
| → jottr__ joined | 16:33 |
| → im0nde_ joined | 16:33 |
| ← jottr_ left | 16:33 |
| ← gareppa left | 16:34 |
| → tgunr joined | 16:34 |
| ← im0nde1 left | 16:35 |
| ← tgunr left | 16:35 |
| ← jottr left | 16:36 |
| ← Cabanossi left | 16:38 |
| ← veegee left | 16:38 |
| → fphilipe_ joined | 16:40 |
| ← tsaka__ left | 16:42 |
| → Cabanossi joined | 16:44 |
| → mindveg joined | 16:44 |
| → tsaka__ joined | 16:45 |
| → glosoli joined | 16:46 |
| ← im0nde_ left | 16:47 |
| → wootehfoot joined | 16:49 |
| → im0nde_ joined | 16:49 |
| → justan0theruser joined | 16:50 |
| → clime joined | 16:51 |
| → gajah joined | 16:51 |
| ← justanotheruser left | 16:51 |
| ← e^1 left | 16:53 |
| ← alonkli left | 16:54 |
|
tharkun
| bin_bash: Yes, it is a linux server. | 16:55 |
|
| igemnace: no, it is company hosted. | 16:56 |
|
| Do I need to dive into ssh logs? | 16:56 |
|
moldy
| probably, yup | 16:56 |
|
| or http, depending | 16:57 |
| → gloomy joined | 16:58 |
|
tharkun
| Ok, :( | 16:58 |
|
bin_bash
| yep and then bash history | 16:59 |
| → thiago joined | 17:00 |
|
tharkun
| bash_history? Why so? | 17:02 |
| → NwS joined | 17:05 |
|
igemnace
| are you using some git hosting software? | 17:05 |
|
tharkun
| plain git | 17:05 |
|
| git init -bare iirc | 17:05 |
| → Mattiaslndstrm joined | 17:06 |
| → gareppa joined | 17:07 |
|
igemnace
| right. yep, will have to dive into any sort of audit logs you have on the server | 17:09 |
| ← gloomy left | 17:10 |
| ← malmalmal left | 17:10 |
|
moldy
| and ask yourself why people have write permissions if you don't trust them ;) | 17:11 |
|
oxymoron93
| thankfully this is why distributed vcs exist. Nothing is lost. | 17:12 |
| → nabil_ joined | 17:15 |
| → millerti joined | 17:16 |
| ← TomyWork left | 17:16 |
| ← tsaka__ left | 17:16 |
|
igemnace
| and if you're on git init --bare, it's not like any commits are lost. you can just recreate the branch | 17:17 |
| ← justan0theruser left | 17:17 |
| → tsaka__ joined | 17:17 |
| → gloomy joined | 17:17 |
| ← Raging_Hog left | 17:17 |
| → SkarmoutsosV joined | 17:18 |
| ← nabil__ left | 17:18 |
| ← planetcall|work left | 17:18 |
|
bin_bash
| tharkun: ssh logs aren't going to tell what commands someone ran while ssh'd in. | 17:20 |
| ← tsaka__ left | 17:23 |
| → tsaka__ joined | 17:25 |
| → gxt joined | 17:25 |
|
tharkun
| bin_bash: the git user has /usr/bin/git-shell so actually noone can log in as it. Hence my lack of understanding how it got wiped out. | 17:26 |
| → malmalmal joined | 17:27 |
| ← figuinhas left | 17:28 |
| → gordonfish joined | 17:28 |
| ← POQDavid left | 17:29 |
| ← nikivi left | 17:29 |
| ← marklite left | 17:29 |
| ← pikapika left | 17:29 |
|
bin_bash
| i haven't used git-shell, does it not allow removing of branches? | 17:30 |
| → CryptoDavid joined | 17:30 |
| → Phylock joined | 17:31 |
| → POQDavid joined | 17:31 |
| → nikivi joined | 17:32 |
| → marklite joined | 17:32 |
| ← tsaka__ left | 17:33 |
| → justan0theruser joined | 17:34 |
| → tsaka__ joined | 17:34 |
| ← SkarmoutsosV left | 17:35 |
| → pikapika joined | 17:35 |
| ← jottr__ left | 17:38 |
| → rodorgas joined | 17:39 |
| ← nika_ left | 17:40 |
| ← fphilipe_ left | 17:43 |
| ← igemnace left | 17:44 |
| ← tsaka__ left | 17:46 |
| → tsaka__ joined | 17:47 |
|
tharkun
| It does not allow login at all. | 17:47 |
|
bin_bash
| ¯\_(ツ)_/¯ | 17:48 |
|
| have you confirmed that tharkun? | 17:48 |
| ← jguddas-tr3 left | 17:49 |
|
tharkun
| Yes :) | 17:50 |
|
| Anyway, I will have to take some backup actions outside of the repositorie to find differences and correlate that to the ssh logs. I hope that does not take me a lot of time. | 17:51 |
|
| bin_bash: Thanks for taking care of my situation. | 17:51 |
|
bin_bash
| seems really weird... ive not used git-shell, but looking at the docs it seems like something may be misconfigured https://git-scm.com/docs/git-shell | 17:52 |
| → Superfox_il_volp joined | 17:52 |
| ← tsaka__ left | 17:52 |
| → dglambert joined | 17:53 |
| ← T_UNIX left | 17:53 |
|
dglambert
| yo | 17:53 |
|
| quick questino | 17:53 |
|
| someone accidentally merged a branch in to their branch when they shouldn't have | 17:53 |
|
tharkun
| bin_bash: I am looking into it. Thanks again. | 17:53 |
|
dglambert
| I can revert the merge commit | 17:53 |
|
| but what if I reset the head to the commit before the merge commit | 17:53 |
|
bin_bash
| np gl | 17:53 |
| → pSouper joined | 17:55 |
|
dglambert
| my concern is the timeline, let say the last commit of the developer was yesterday 9/23, the merge commit was today 9/24, but lets say that the merge commit brought in commits from a week prior, lets say 9/13 | 17:55 |
|
| would the 9/13 commit still be in if I reset to the 9/23 commit | 17:55 |
| → tsaka__ joined | 17:56 |
| ← gareppa left | 17:58 |
| → igemnace joined | 17:58 |
| ← tribly left | 17:59 |
| → tribly joined | 17:59 |
| ← tsaka__ left | 18:00 |
| → tsaka__ joined | 18:00 |
| ← tsaka__ left | 18:04 |
| → tsaka__ joined | 18:05 |
| → Sasazuka joined | 18:06 |
| ← usbguy1 left | 18:07 |
| ← fflam left | 18:08 |
| → leeN joined | 18:09 |
| → fflam joined | 18:09 |
| ← gloomy left | 18:10 |
| ← tsaka__ left | 18:13 |
| ← czart_ left | 18:13 |
| ← tribly left | 18:13 |
| → tsaka__ joined | 18:14 |
|
vishal
| dglambert: git works on ancestry of commits, not their dates | 18:16 |
|
| so resetting to one before the merge will remove everything the merge brought in, regardless of the date | 18:17 |
| → troulouliou_dev joined | 18:19 |
| → bolovanos joined | 18:20 |
| ← pie_ left | 18:21 |
| ← tsaka__ left | 18:22 |
| ← sauvin left | 18:29 |
| ← f3r70rr35f left | 18:30 |
| → gareppa joined | 18:34 |
| ← shabius left | 18:34 |
| ← Sasazuka left | 18:35 |
| ← tufteddeer left | 18:36 |
|
dglambert
| vishal thank you, I thought that would be the case | 18:36 |
| → gh00p joined | 18:36 |
| → tribly joined | 18:37 |
|
gh00p
| Hi folks. I've lost an alias and I miss it. I used to have a `gls` bash alias that basically gave me `ls` style ouput but with git hash and last update date per file. I seem to recall that it was a pipe, perhaps something that ran `git ls-files` through xargs for another git command to apply formatting per-file. Does this sound like something you might have? | 18:38 |
| → fuzzybear3965 joined | 18:38 |
|
fuzzybear3965
| I just did a `git merge master` on a `feature` branch. | 18:39 |
|
| I was 4 commits behind `master`. | 18:39 |
| → cdown joined | 18:39 |
| ← dglambert left | 18:39 |
|
fuzzybear3965
| I was 1 commit ahead of the remote feature branch. | 18:39 |
|
ghoti
| gh00p: so you're basically looking for a `-l` (long format) version of `git ls-files`? | 18:39 |
|
fuzzybear3965
| Now, I'm 5 commits ahead of the remote feature branch. | 18:39 |
|
| This all makes sense, except for that `git log` shows `origin/feature` as being only one commit behind my local `feature` branch.... | 18:40 |
|
| I don't see the 4 commits that were merged in from `master`. | 18:40 |
| ← millerti left | 18:40 |
|
fuzzybear3965
| Would anyone know why this is happening? | 18:40 |
|
gh00p
| ghoti: yes, kinda. I don't need file size or filesystem timestamp, but it would be great to be able to review files in the directory and their status (staged, changed) with a single commend. | 18:40 |
|
ghoti
| gh00p: sounds useful. I'd like that too. Hope someone else answers you. :-) | 18:41 |
| → fphilipe_ joined | 18:41 |
| gschanuel59 → gschanuel | 18:42 |
| → jottr__ joined | 18:42 |
| → millerti joined | 18:42 |
| ← ericfreese left | 18:42 |
| → shabius joined | 18:43 |
| ← glosoli left | 18:44 |
| → Sasazuka joined | 18:45 |
| → cd joined | 18:45 |
| → cdown_ joined | 18:45 |
| ← nabil_ left | 18:47 |
| ← ExeciN left | 18:47 |
| ← cdown left | 18:48 |
| cdown_ → cdown | 18:48 |
| im0nde_ → im0nde1 | 18:48 |
| ← fphilipe_ left | 18:48 |
| ← jottr__ left | 18:50 |
|
fuzzybear3965
| ... anybody? | 18:51 |
| ← millerti left | 18:53 |
| → EnJohnGee joined | 18:53 |
|
vishal
| gh00p: something like this: | 18:53 |
|
| git ls-files | while read -r file; do git --no-pager log --format="format:%h %s" -1 -- "$file"; printf "%s\n" "$file"; done | 18:53 |
| → millerti joined | 18:54 |
| → SkarmoutsosV joined | 18:56 |
| ← shabius left | 18:59 |
| → is_null_ joined | 19:00 |
| ← millerti left | 19:01 |
| ← pSouper left | 19:01 |
| → jottr__ joined | 19:01 |
| ← fuzzybear3965 left | 19:02 |
| ← rodorgas left | 19:02 |
| → millerti joined | 19:03 |
| ← blackmesa left | 19:03 |
| ← nerosnm left | 19:06 |
| → g00s joined | 19:06 |
| → gloomy joined | 19:06 |
| → blackmesa joined | 19:08 |
| ← jottr__ left | 19:08 |
| → pie_ joined | 19:12 |
| → imigunov joined | 19:14 |
| ← is_null left | 19:15 |
| ← is_null_ left | 19:15 |
| ← kantlivelong left | 19:16 |
| ← gloomy left | 19:18 |
| → jnewt joined | 19:19 |
| → shabius joined | 19:19 |
| → rsrx joined | 19:20 |
| ← caskd-dev left | 19:20 |
| → kantlivelong joined | 19:23 |
| ← imigunov left | 19:26 |
| → nerosnm joined | 19:26 |
| → caskd joined | 19:27 |
| ← malmalmal left | 19:29 |
| ← nerosnm left | 19:31 |
| ← nurdie left | 19:32 |
| ← emsjessec left | 19:32 |
| → gloomy joined | 19:34 |
| → nerosnm joined | 19:35 |
| ← comptroller left | 19:36 |
| → fuzzybear3965 joined | 19:37 |
| ← fuzzybear3965 left | 19:37 |
| → troulouliou_div2 joined | 19:38 |
| → jottr__ joined | 19:39 |
| → nabil joined | 19:42 |
| → malmalmal joined | 19:44 |
| ← nerosnm left | 19:44 |
| ← anddam left | 19:46 |
| → comptroller joined | 19:46 |
| ← jottr__ left | 19:49 |
| ← nabil left | 19:52 |
| → anddam joined | 20:00 |
| → Fernando-Basso joined | 20:05 |
| ← CryptoDavid left | 20:06 |
| → owlscientist joined | 20:07 |
| → n3wborn joined | 20:09 |
| → Lucas_Gray joined | 20:11 |
| ← EnJohnGee left | 20:13 |
| → bitwinery joined | 20:14 |
| ← tobiasBora left | 20:15 |
| ← Dougie187 left | 20:16 |
| → nerosnm joined | 20:18 |
| → DoDU joined | 20:20 |
| ← kerframil left | 20:22 |
| → chris11 joined | 20:22 |
| → limarfrek joined | 20:22 |
| limarfrek → kerframil | 20:22 |
|
chris11
| I've got a repo on GitHub with subfolders. The subfolders are themselves repos. Can I point fetch and push urls to those subfolders? | 20:23 |
| ← troulouliou_div2 left | 20:27 |
| ← Lucas_Gray left | 20:27 |
| → Lucas_Gray joined | 20:29 |
| ← saint_ left | 20:30 |
| ← bitwinery left | 20:31 |
| ← feriman left | 20:31 |
| ← nerosnm left | 20:33 |
| ← jnewt left | 20:35 |
| → saint_ joined | 20:35 |
| → dege joined | 20:39 |
| ← gh00p left | 20:40 |
|
ghoti
| gh00p, vishal, you inspired me. What about this? | 20:40 |
|
| gls() { git ls-files | while read -r file; do git --no-pager log --format=$'format:%h\t%ai\t<%aE>\t' -1 -- "$file"; printf "%s\n" "$file"; done | column -s $'\t' -t; } | 20:40 |
| ← JanC left | 20:40 |
| ← pi- left | 20:41 |
|
ghoti
| gh00p, you dropped off. What about: | 20:41 |
|
| gls() { git ls-files | while read -r file; do git --no-pager log --format=$'format:%h\t%ai\t<%aE>\t' -1 -- "$file"; printf "%s\n" "$file"; done | column -s $'\t' -t; } | 20:42 |
| ← Phylock left | 20:42 |
|
ghoti
| gah, he's still gone. | 20:42 |
| → JanC joined | 20:44 |
| ← oatmealraisin left | 20:44 |
| ← JanC left | 20:45 |
| → courrier joined | 20:46 |
| → JanC joined | 20:46 |
| → i^migunov joined | 20:49 |
| → dgw joined | 20:51 |
| → ericfreese joined | 20:52 |
| ← gareppa left | 20:53 |
| → Phylock joined | 20:56 |
| → m0viefreak joined | 20:56 |
| ← inkbottle left | 21:02 |
| ← chris11 left | 21:02 |
| ← oxymoron93 left | 21:05 |
| ← SkarmoutsosV left | 21:06 |
| ← prg318 left | 21:07 |
| ← gloomy left | 21:07 |
| → prg318 joined | 21:08 |
| ← Phylock left | 21:08 |
| ← Stoot left | 21:09 |
| → nurdie joined | 21:10 |
| → nurdie_ joined | 21:12 |
| → yonder joined | 21:13 |
| ← moldybits left | 21:13 |
| → nerosnm joined | 21:14 |
| ← nurdie left | 21:15 |
| → inkbottle joined | 21:15 |
| → rodorgas joined | 21:17 |
| ← n3wborn left | 21:17 |
| → durham joined | 21:18 |
| → n3wborn joined | 21:19 |
| ← nerosnm left | 21:21 |
| ← tmager left | 21:22 |
| → bambanx joined | 21:23 |
| → nerosnm joined | 21:24 |
| → Qizzy joined | 21:27 |
| → tgunr joined | 21:36 |
| ← g00s left | 21:37 |
| → imigunov joined | 21:38 |
| ← malmalmal left | 21:40 |
| ← leeN left | 21:43 |
| ← i^migunov left | 21:46 |
| ← dijitol left | 21:46 |
| → i^migunov joined | 21:47 |
| ← imigunov left | 21:50 |
| → imigunov joined | 21:51 |
| ← i^migunov left | 21:51 |
| ← nerosnm left | 21:52 |
| ← troulouliou_dev left | 21:53 |
| ← kerframil left | 21:54 |
| ← Superfox_il_volp left | 21:54 |
| ← rsrx left | 21:55 |
| ← imigunov left | 21:56 |
| → i^migunov joined | 21:56 |
| → kerframil joined | 21:57 |
| ← wootehfoot left | 21:59 |
| → nerosnm joined | 22:00 |
| ← nurdie_ left | 22:00 |
| ← Envil left | 22:01 |
| ← clime left | 22:01 |
| → oatmealraisin joined | 22:02 |
| → Raimondii joined | 22:03 |
| ← nerosnm left | 22:04 |
| ← bolovanos left | 22:04 |
| ← vavkamil left | 22:05 |
| ← Raimondi left | 22:06 |
| Raimondii → Raimondi | 22:06 |
| → Envil joined | 22:07 |
| → Stoot joined | 22:08 |
| ← greggerz left | 22:08 |
| ← CodeSlingerPaul left | 22:10 |
| ← POQDavid left | 22:10 |
| ← igemnace left | 22:10 |
| ← nikivi left | 22:11 |
| ← marklite left | 22:11 |
| ← pikapika left | 22:11 |
| ← Lucas_Gray left | 22:12 |
| ← Raimondi left | 22:14 |
| → nerosnm joined | 22:16 |
| → Raimondi joined | 22:19 |
| → imigunov joined | 22:19 |
| ← Stoot left | 22:20 |
| ← i^migunov left | 22:21 |
| → nabil joined | 22:22 |
| ← kerframil left | 22:22 |
| ← imigunov left | 22:22 |
| ← Newami left | 22:22 |
| ← nerosnm left | 22:22 |
| → nerosnm joined | 22:24 |
| ← xcm left | 22:27 |
| → is_null joined | 22:27 |
| → is_null_ joined | 22:27 |
| → xcm joined | 22:28 |
| ← nerosnm left | 22:29 |
| ← oatmealraisin left | 22:29 |
| → Stoot joined | 22:32 |
| → bitwinery joined | 22:34 |
| → ferdna joined | 22:37 |
| ← nuxdie left | 22:38 |
| ← justan0theruser left | 22:40 |
| → justanotheruser joined | 22:40 |
| → nuxdie joined | 22:40 |
| → igemnace joined | 22:41 |
| ← owlscientist left | 22:43 |
| → SmashingX joined | 22:44 |
| ← Stoot left | 22:45 |
| → Wetmelon joined | 22:47 |
| ← is_null left | 22:48 |
| → is_null joined | 22:49 |
| → nerosnm joined | 22:49 |
| ← royal_screwup21 left | 22:50 |
| ← nerosnm left | 22:54 |
| ← omnireq left | 22:54 |
| ← ericfreese left | 22:55 |
| → Stoot joined | 23:01 |
|
wwalker
| I can find in my .git/config "[branch "8221-3540"]; remote = upstream; merge = refs/heads/release_3.5.40" what is the git command that would show me that same data about the current branch? | 23:01 |
| ← igemnace left | 23:01 |
| → nerosnm joined | 23:01 |
| ← thiago left | 23:02 |
| ← nerosnm left | 23:06 |
| → thiago joined | 23:06 |
| → nurdie joined | 23:06 |
| ← cdown left | 23:10 |
| → nerosnm joined | 23:10 |
| → cdown joined | 23:11 |
| ← nurdie left | 23:11 |
| ← cd left | 23:11 |
| → nurdie joined | 23:13 |
| ← nerosnm left | 23:14 |
| ← nurdie left | 23:17 |
| → nerosnm joined | 23:17 |
| ← nerosnm left | 23:22 |
| → publio joined | 23:23 |
| → nerosnm joined | 23:27 |
| ← perrier-jouet left | 23:29 |
| → justan0theruser joined | 23:30 |
| ← justanotheruser left | 23:31 |
| ← m0viefreak left | 23:32 |
| ← nerosnm left | 23:33 |
| ← n3wborn left | 23:33 |
| ← dege left | 23:34 |
| ← z8z left | 23:35 |
| → jtmusky joined | 23:42 |
| → moldybits joined | 23:44 |
| → nerosnm joined | 23:45 |
| → jguddas-tr3 joined | 23:47 |
| ← nerosnm left | 23:49 |
| ← blackmesa left | 23:49 |
| ← jguddas-tr3 left | 23:51 |
| → oatmealraisin joined | 23:51 |
| → nerosnm joined | 23:52 |
| ← nerosnm left | 23:57 |
| ← SmashingX left | 23:57 |