Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-28

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:01 solrize joined #git
00:02 brent__ joined #git
00:02 waveclaw joined #git
00:03 solrize so i have a remote repo where several branches have new commits, and i want to pull all of them.... "git pull --all" apparently fetches the remote commits but doesn't merge them.  is there a way to update everything at once?
00:03 thiago joined #git
00:09 canuk joined #git
00:22 hahuang61 joined #git
00:24 otiose joined #git
00:28 dsdeiz joined #git
00:28 dsdeiz joined #git
00:33 Darren_ joined #git
00:34 dirtyroshi joined #git
00:34 ReptilianBrain joined #git
00:35 ecuanaso joined #git
00:39 cdg joined #git
00:39 ReptilianBrain joined #git
00:43 ozmage joined #git
00:46 Vinnie_win_c joined #git
00:47 cliluw joined #git
00:48 BackEndCoder joined #git
00:48 matoro joined #git
00:49 KV joined #git
00:50 DolpheenDream joined #git
00:51 xlegoman joined #git
00:53 Lyqyd joined #git
00:55 msonntag joined #git
00:56 safe joined #git
00:58 Cabanossi joined #git
00:59 mostlybadfly joined #git
00:59 mischat joined #git
01:00 BSaboia joined #git
01:06 stickperson joined #git
01:08 ozmage joined #git
01:10 noxi joined #git
01:12 noxi joined #git
01:12 quviar joined #git
01:15 jccn joined #git
01:16 brent__ joined #git
01:20 svm_invictvs joined #git
01:22 ozmage <ozmage> git revert 984065055e6e39f8dd812529e11922374bd39352
01:22 ozmage <ozmage> error: commit 984065055e6e39f8dd812529e11922374bd39352 is a merge but no -m option was given.
01:22 ozmage <ozmage> fatal: revert failed
01:22 ozmage how i revert this commit ?
01:23 matsaman from your log?
01:23 fahadash joined #git
01:23 thebinary joined #git
01:23 ozmage from the linux kernel tree
01:24 ozmage https://cgit.freedesktop.org/~airlied/linux/commit/?id=984065055e6e39f8dd812529e11922374bd39352
01:24 a_thakur joined #git
01:24 nckpz joined #git
01:24 matsaman revert to the commit before it
01:24 matsaman I told you how in another channel already
01:24 matsaman git reset --hard hashprecedinghere
01:26 noxi joined #git
01:26 webdev007 joined #git
01:27 MrWoohoo joined #git
01:27 ozmage i dont know which is the commit before it
01:27 ozmage and im trying to revert that commit on the recent kernel
01:27 ozmage 4.9.6
01:28 matsaman ozmage: go into your git clone copy of the kernel
01:28 matsaman ozmage: run 'git log'
01:28 matsaman ozmage: hit '/' and search for that dr-next whatever description
01:28 matsaman find the commit below it, copy the hash
01:28 matsaman git reset --hard thathash
01:30 quviar joined #git
01:32 ozmage ok the commit before it is 12768c1e2c83b05ea1658470045789a14b6edf4c
01:32 ozmage lets see
01:35 ozmage this is not what i really want  git reset --hard 12768c1e2c83b05ea1658470045789a14b6edf4c is checking out the kernel 4.4
01:35 a_thakur_ joined #git
01:36 matsaman ozmage: how isn't it what you want?
01:36 ozmage i want to revert the commit 984065055e6e39f8dd812529e11922374bd39352
01:36 ozmage om the kernel 4.9.6 to see if that work
01:37 ozmage like i say  git reset --hard 12768c1e2c83b05ea1658470045789a14b6edf4c is checking out the kernel 4.4
01:38 rewt that moves your current branch pointer to the specified commit (and yes, resets your files to match that commit)
01:40 ozmage yeah that is what is doing
01:40 Noldorin joined #git
01:40 rewt 12768 actually seems like the merge of 4.5-rc1
01:42 ozmage so i can do git revert 984065055e6e39f8dd812529e11922374bd39352 -m 12768 ?
01:42 ozmage looks like is working
01:43 Cabanossi joined #git
01:43 ozmage nope
01:43 ozmage git revert 984065055e6e39f8dd812529e11922374bd39352 -m 1276
01:43 ozmage error: commit 984065055e6e39f8dd812529e11922374bd39352 does not have parent 1276
01:43 ozmage fatal: revert failed
01:43 a_thakur joined #git
01:44 rewt you may need more to that hash
01:45 Ryanar joined #git
01:45 ozmage how is that ?
01:46 rewt may not be unique enough
01:46 donught joined #git
01:47 donught joined #git
01:47 gkatsev joined #git
01:48 ozmage hmm i dont know what to do here
01:48 rewt btw, a revert will creat a new commit, not undo any existing commits
01:49 rewt you need to do what was already said;  git reset --hard 12768c1e2c83b05ea1658470045789a14b6edf4c
01:50 a_thakur joined #git
01:50 ozmage yeah but that will checkout the kernel 4.4 which i dont want
01:50 ozmage i want the kernel 4.9.6
01:50 KV joined #git
01:51 rewt wait... does 984065055e6e39f8dd812529e11922374bd39352 have any child commits?
01:53 ozmage https://cgit.freedesktop.org/~airlied/linux/commit/?id=984065055e6e39f8dd812529e11922374bd39352
01:53 rewt yes... you pasted that already
01:53 ozmage how do i know im pretty new to git
01:54 JanC_ joined #git
01:54 rewt ... what exactly do you want to accomplish?
01:54 ozmage well im bisecting the kernel and that is the first bad commit
01:55 ozmage the kernel 4.5-rc1 introduced a slowness
01:55 ozmage the compiles times slowdown
01:55 rewt along which parent did you bisect?
01:56 ozmage and the 3d games are too damm slow
01:56 ozmage im bisecting the kernel 4.4 between 4.5-rc1
01:57 rewt can't be... 98406505 is after 4.5-rc1, which should be after 4.4
01:57 GT4066 joined #git
01:58 redhedded1 joined #git
01:59 ozmage ok
02:00 ozmage what can be the parent number of 984065055e6e39f8dd812529e11922374bd39352
02:01 mischat joined #git
02:02 a_thakur joined #git
02:04 raijin joined #git
02:04 rewt it says right in your link; one parent is 12768c1e2c83b05ea1658470045789a14b6edf4c (4.5-rc1), and the other is 1df59b8497f47495e873c23abd6d3d290c730505 (drm-intel fixes)
02:06 elsevero joined #git
02:06 matoro joined #git
02:06 ozmage and why git revert 984065055e6e39f8dd812529e11922374bd39352 -m 12768c1e2c83b05ea1658470045789a14b6edf4c  is not working
02:07 rewt revert doesn't undo or remove any commits; it creates a new commit whose diffs are the exact opposite of the commit you want to revert
02:08 lucasem joined #git
02:08 rewt it doesn't "work" because it doesn't make sense in this case
02:09 ozmage let me reboot
02:09 rewt that won't do anything
02:10 ozmage no i need to reboot to other kernel
02:11 MattMaker joined #git
02:13 Cabanossi joined #git
02:14 MattMaker joined #git
02:14 elsevero_ joined #git
02:14 MineCoins joined #git
02:15 ozmage joined #git
02:17 ozmage when this git bisect finish im going to file a bug report
02:19 chipotle joined #git
02:20 pks joined #git
02:23 mehola joined #git
02:24 Colloguy joined #git
02:25 themill joined #git
02:27 msonntag joined #git
02:28 BSAlb joined #git
02:28 finalbeta joined #git
02:29 Colloguy For example, "**/foo" matches file or directory "foo" anywhere, the same as pattern "foo"
02:29 Colloguy oops ignore that
02:29 Colloguy According to man gitignore, if proj/.gitignore contains "foo" then the match "is relative to the location of .gitignore file". Then why does it also match proj/A/foo ?
02:29 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
02:29 brent__ joined #git
02:30 otiose joined #git
02:37 Ryanar joined #git
02:39 pur3eval joined #git
02:40 ozmage https://paste.pound-python.org/show/4P1qURu2PDMfshuVEPy4/
02:40 ozmage git revert 984065055e6e39f8dd812529e11922374bd39352 -m 1 is failing
02:46 lucasem ozmage: what's your git status looking like? You may need to stash or commit any changes you've made
02:46 rewt ozmage, git revert does not make sense there!
02:46 Cabanossi joined #git
02:46 rewt revert does not remove any commits!
02:46 energizer joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and alternative commits | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-slushie: submit your best punch line to https://madeitwor.se/git-jokes
02:48 energizer left #git
02:48 Vampire0_ joined #git
02:49 rewt ozmage, your past there says exactly what you need to do to complete the revert, but that will not do what you think it will do
02:49 rewt paste*
02:50 BackEndCoder joined #git
02:51 KV joined #git
02:53 jameser joined #git
02:53 ozmage there are too much conflicts i cant do anything
02:54 d^sh joined #git
02:54 ozmage this has to be fixed by the developer
02:54 rewt because it doesn't make sense to revert that commit
02:54 rewt you need to bisect up the other tree
02:54 rewt what was your original bisect command?
02:55 ozmage im using this guide https://wiki.gentoo.org/wiki/Kernel_git-bisect
02:55 hahuang62 joined #git
02:55 rewt you copy/pasted that whole page into your terminal???
02:56 ozmage git bisect bad v4.5-rc1 | tee -a /root/bisect.log
02:56 ozmage git bisect good v4.4 | tee -a /root/bisect.log
02:56 ozmage git bisect start | tee -a /root/bisect.log
02:56 ozmage git bisect start | tee -a /root/bisect.log  first
02:58 ozmage this what i get so far https://paste.pound-python.org/show/RZ3Ab8ngc5DWhYNRCx5g/
02:58 prg3 joined #git
03:00 brent__ joined #git
03:01 mischat joined #git
03:02 rewt where did you get the idea to use git revert?
03:03 jameser_ joined #git
03:03 ozmage on some bug reports i saw
03:04 ozmage so what i need to do the kernel 4.9.6 all the way back to 4.5-rc1 is fucked up here slow as hell
03:04 ozmage compile time is slow
03:05 ozmage i compile the kernel 4.1 sources with the kernel 4.1.37 in 12 minutes and with the 4.9.6 the same sources in 30 minutes
03:05 ozmage and the 3d games are slow as hell
03:12 chachasmooth joined #git
03:13 Cabanossi joined #git
03:14 hfp_work joined #git
03:14 ozmage joined #git
03:14 hfp joined #git
03:17 dysfigured i've had a screenshot.gif in my dotfiles repo for a while, and recently learned that git makes an entire copy of your repo for every commit (and my dotfiles repo has a lot of commits), i'm looking at the bfg-repo-cleaner to see if i can prune this from my history (cloning is taking a fairly long time to download).. but i can't quite figure out the incantations to use it
03:17 jozwior joined #git
03:18 Vortex34 joined #git
03:18 dysfigured surely it's not as simple as `bfg --delete-files screenshot..gif` right?
03:18 kadoban dysfigured: Does that file ever change?
03:19 dysfigured yeah, it's had a few changes over the years
03:20 jozwior joined #git
03:20 dodobrain joined #git
03:20 kadoban Unless it's changed pretty often, I doubt it's really causing a problem.
03:20 fstd_ joined #git
03:21 jozwior joined #git
03:22 cyan___ joined #git
03:22 dysfigured my repo has 730 commits, doesn't that mean it has 730 ~1MB gifs in the history? i mean i'm sure they're compressed and all, but i can't help thinking it'd be a lot cleaner without the gifs in there
03:23 a_thakur_ joined #git
03:23 cyan___ joined #git
03:23 kadoban IIUC it should have at most one copy for each time it's changed.
03:24 lucasem dysfigured: git only stores diffs. The commit where it was added has the whole file. Subsequent commits only store anything about it if there was a change to that file within that particular commit.
03:24 mizu_no_oto joined #git
03:24 ozmage rewt, what i do to solve my slowness problem on kernels from 4.5-rc1 to 4.9.6?
03:24 rodan joined #git
03:25 rewt you need to finish the bisect
03:25 otiose joined #git
03:25 cyan___ joined #git
03:25 rewt it estimated you have about 8 more recompiles
03:25 preaction git does not store diffs, it stores each unique file once. if you have 730 different versions of that 1MB GIF, then your repo should have 730 MB
03:26 preaction if you only have 1 version of that GIF and it never changed, then you only have 1MB in your repo
03:26 cyan___ joined #git
03:26 ozmage rewt kk
03:26 bremner well. as an implimentation optimization it stores deltas for files that delta well
03:28 MattMaker joined #git
03:28 dysfigured lucasem: http://willi.am/blog/2014/10/14/for-the-last-time-git-stores-snapshots-not-diffs/ was telling me otherwise, and i'm very confused
03:29 preaction dysfigured: how many times did you change the GIF?
03:29 preaction dysfigured: you could also try reading !gcs to understand how everything works internally, if that's your desire
03:29 gitinfo dysfigured: [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
03:30 dysfigured history says there's only 3 different versions https://github.com/DanielFGray/dotfiles/commits/master/screenshot.gif
03:30 kadoban dysfigured: It's more correct that it store snapshots. But a snapshot of a tree, like the working directory, is like a list of hashes of the files in it. A file that doesn't change isn't going to get copied again over and over and over as you make commits.
03:30 preaction then you have 3 1MB gifs in your repository
03:30 kadoban There will be ~3 different full copies of that file then, at most. Getting rid of that isn't going to matter much.
03:31 tmcmahon joined #git
03:31 dysfigured i guess my question really boils down to: will nuking the screenshot entirely from history make cloning the repo go any faster?
03:31 rewt it'll make about a 3/730 difference
03:32 rewt if your repo is 730MB
03:32 kadoban By a really small amount, maybe.
03:32 rewt dysfigured, how big is the repo?
03:32 rewt in bytes
03:32 dysfigured 24.8 MB according to `du`
03:33 ash_workz joined #git
03:33 kadoban lucasem: That's not really correct, just in case you haven't been following the convo after that. At least the first sentence isn't.
03:33 kadoban Oh, are you going over a pretty slow network or something?
03:33 martin290 joined #git
03:34 kadoban If it's only 24 megs, that could be a pretty noticable difference I guess, if it's taking appreciable time.
03:34 dysfigured my home internet is 10Mb, maxes out at like 1.1MB/s
03:34 lucasem kadoban: I was following. A long time ago, I read the git parable http://tom.preston-werner.com/2009/05/19/the-git-parable.html and I guess I misinterpreted the section on diffs.
03:34 preaction and is that 25M only the .git dir? or is it the work tree?
03:34 lucasem thanks though! TIL
03:34 dysfigured .git is 15MB
03:34 preaction then that's your repo. 15MB
03:34 martin290 i'm pretty new to git, but i've used tortoise svn a good bit... i was wondering if there was a good tutorial about branches
03:35 martin290 i know what branches are, i just had an issue with merging a branch i created back to the master branch
03:35 preaction if your work tree is then 10MB, it means that you've got 5MB in the repo that isn't in the work tree (which means 5MB of "old" files or files on other branches)
03:35 dysfigured oh, derp. yeah i've got some folders in there with other repos for deps (that aren't committed)
03:36 kadoban dysfigured: How long is cloning actually taking? This is over LAN and it's only a few megs and it's still taking a long time?
03:36 kadoban Something about that sounds very off.
03:36 preaction i don't think there was a problem, i think they just wanted to know if it could've been a problem
03:37 dysfigured it takes longer than my impatient ass can stand waiting for a glorified zip of some text files :^)
03:37 preaction GIF is already compressed, so it can't really be compressed more
03:37 kadoban Well ... I mean ballpark, is this like 5 seconds and you're pretty impatient, or?
03:38 preaction also, if you're cloning your whole repo over and over, why are you cloning your whole repo over and over?
03:38 kadoban If it's taking much longer than that, then something things weird. Yeah, also that ^
03:38 nivag joined #git
03:38 kadoban s/things/seems/
03:38 preaction when you use pull/push, you only move the refs that aren't in the other repo (so... a "diff" :p)
03:38 dysfigured well i just installed termux on my new phone today and cloned my dots onto it for my fancy zsh prompt etc, and it took a good minute to download, and I got to thinking that the screenshot really needn't be tracked at all
03:39 Bizkit joined #git
03:39 dysfigured (aside, termux is super interesting, if you have android i'd say it's worth checking out)
03:40 dysfigured (it's basically like having an ubuntu chroot on your phone. however useful that might be is a different story)
03:40 anuxivm joined #git
03:41 dysfigured i think it would just appease my ocd to nuke the screenshots from there anyway.. even if it's only 3MB of gifs, that's 1/5 the size of the history
03:42 rewt martin290, branches in git are nothing more than pointers to a commit.  that's it.  when your checkout is a branch and you make a new commit, it will automatically move the branch pointer to the new commit.  they're basically a way to avoid having to remember the commit id
03:42 preaction dysfigured: but you'd have to rewrite history, and that means you'd be storing even more information in your repos (until you did a "git gc")
03:43 kadoban A minute sounds really long for like 20 megs over LAN
03:44 dysfigured well if gc'ing the history will fix that then that sounds like a good solution. it's just my personal dotfile repo, i'm not too worried about the effects of rewriting history
03:44 raspado joined #git
03:44 martin290 rewt: so should new features be created in a branch, and once those new features are tested and everything, they get merged to the master? or, no need to do a branch at all for that?
03:44 rewt martin290, in other CVSes, a commit to a branch "lives" in that branch, but not so in git.  when you ask git which branch a commit is in, it actually looks down the commit tree and finds all branch pointers pointing all commits that came after the one you asked about.  it does not directly associate a commit with the branch that was checked out at the time
03:44 jnewt_ joined #git
03:44 dysfigured martin290: feature branches are always a good idea, imo
03:45 jnewt_ so i have a repository i cloned from github.  i made some changes in a new branch and now i want to do a pull request.  do i push my branch first and then do the rest from githu
03:45 jnewt_ b?
03:45 dysfigured martin290: have you seen git flow? http://nvie.com/posts/a-successful-git-branching-model/ https://github.com/nvie/gitflow
03:45 rewt martin290, it depends on how you like to do it;  most workflows create a new branch for feature dev, and then merge it back
03:46 martin290 dysfigured: i haven't seen that before, let me look it over
03:46 dysfigured jnewt_: yep, pull requests aren't a feature of git itself
03:46 rewt martin290, some of them leave the branch there, some of them just delete the branch pointer, and some rebase the branch at the tip so it looks as if there were no branches in the first place
03:47 MattMaker joined #git
03:47 dysfigured i think it's good to leave the branch in there, history is a lot easier to look over since your features are grouped by branches, instead of just a huge list of commits
03:48 jnewt_ dysfigured, i'm getting a 403 error.  probably because my new branch doesn't exist on github?
03:48 rewt agreed
03:48 BackEndCoder joined #git
03:48 martin290 can y'all look over my repo real quick? essentially, I have a branch called AddPost, and i want to merge it back to master
03:48 martin290 i haven't gotten comfortable with the git commands yet
03:48 dysfigured jnewt_: the way i've always done it is to fork the repo on github, clone it locally on my machine, push changes to my fork, then use the github ui to start a PR
03:49 dysfigured martin290: `git checkout -b master && git merge <branch>` should do the trick
03:49 jnewt_ dysfigured, seems like a bunch of extra steps
03:49 martin290 what does the "-b" do?
03:50 dysfigured martin290: check the man page for git checkout :)
03:50 dysfigured jnewt_: compared to?
03:51 martin290 got it. so let's say i start changing a file, and i want to revert to the last commit (undo my changes), what git command would do that?
03:51 dysfigured martin290: git revert
03:51 martin290 oh wow
03:51 martin290 thats simple :) thanks!
03:51 dysfigured or git reset HEAD~
03:52 KV joined #git
03:52 dysfigured martin290: searching for `git revert commit` should answer that question pretty easily
03:52 rewt git revert only if it's already been committed (and you don't want to change your history)
03:52 Jellyg00se joined #git
03:53 dysfigured ^
03:53 martin290 what if i haven't committed it yet?
03:54 rewt reset
03:54 martin290 ahh ok
03:55 Rodya_ joined #git
03:57 dysfigured `git reset` by itself will unstage changes, `git reset HEAD~` is what you'd use if you have saved changes to disk you want to revert to the most recent commit (correct me if i'm wrong here?)
03:57 bannakaf_ joined #git
03:58 Cabanossi joined #git
03:58 martin290 gosh, there's so many different commands
03:59 dysfigured good think you don't have to learn them all at once, you just incorporate new things into your 'tool belt' as you need them
04:00 rewt also keep in mind the different "locations": (1) working tree, (2) index/staging, (3) local repo, (4) remote repo
04:01 rewt (1) is the files you see and can edit, (3) and (4) are where commits live, and (2) is limbo between the 2 where you stage what you want the commit to contain
04:02 rewt the index lets you make a lot of edits before any commits and turn them into multiple commits (so you can group the edits logically)
04:02 mischat joined #git
04:02 martin290 ugh i just deleted files accidentally using git clean -f :(
04:02 martin290 is there a way to undo that?
04:03 hexagoxel joined #git
04:03 sunri5e joined #git
04:04 dysfigured martin290: https://encrypted.google.com/search?hl=en&amp;q=undo%20git%20clean%20-f
04:04 msonntag joined #git
04:05 kadoban martin290: Typically not, unless they've ever been staged for commiting.
04:05 kadoban Which would be ... rare.
04:05 martin290 dang!! :(
04:05 martin290 this is so confusing
04:06 dysfigured just think of all the things you're learning :D
04:06 kadoban -f should be a warning sign when you're running something in git without knowing what it does. A *big* warning sign.
04:06 martin290 dysfigured: i'm not sure learning is the word lol
04:07 kadoban There's a few dangerous commands that don't have -f in them, but not that many.
04:07 dysfigured git reset --hard is one i learned about, the hard way
04:07 dysfigured martin290: mistakes are always an educational experience if you learn not to repeat them
04:07 martin290 thats true
04:08 kadoban dysfigured: Usually possible to undo though, that one. At least partially.
04:08 kadoban Though not the unstaged changes to tracked files.
04:10 dysfigured i'm a percussion instructor, i tell my students all the time "you have to make mistakes in order to learn", if you're not making mistakes and screwing up, you're [probably] not doing anything new. (i remember hearing a story about how) thomas edison learned about 100 different ways that you couldn't make a lightbulb before he finally got one working.
04:10 Cabanossi joined #git
04:10 martin290 that's very true
04:11 Derperpe1 joined #git
04:11 martin290 is there a good tutorial i can look over for git?
04:11 dysfigured kadoban: nor the unstaged changes to untracked files, which is what makes --hard so damaging
04:11 dysfigured martin290: dozens, all a just search away
04:11 kadoban dysfigured: reset --hard shouldn't nuke untracked files
04:12 blacksyke left #git
04:12 dysfigured oh maybe i'm mixing up reset and clean again
04:12 martin290 ahh, head is the latest commit :) that's good to know
04:13 kadoban martin290: The Pro Git book that's available on the website is decent
04:13 dysfigured ^ that's what i starte with. them some trial and error, then more searching
04:15 dysfigured i should probably go over that again, actually
04:16 martin290 i'm doing this now: https://try.github.io/levels/1/challenges/5
04:16 martin290 hope it helps!
04:16 dysfigured good luck!
04:16 martin290 thanks
04:17 martin290 :)
04:18 damo22 joined #git
04:18 damo22 how do i use git to cherry pick from a patch file?
04:18 damo22 as in, i want to add the patch file as a commit
04:19 otiose joined #git
04:19 msonntag joined #git
04:19 dysfigured git joke i made a while ago: https://www.reddit.com/r/fossworldproblems/comments/1d1ixc/my_girlfriend_said_i_have_commitment_issues_but_i/
04:20 kadoban damo22: Apply the patch, possibly with 'git apply' or just whatever your favorite patch command is really, then (stage and) commit.
04:20 Nilesh_ joined #git
04:21 damo22 kadoban: id like to use the commit message from the patch file, you see i have about 100 of these
04:21 duderonomy joined #git
04:21 damo22 id prefer to automate the commits
04:23 damo22 eg, i have a whole set of commits as patches and i just want to commit them in a big series one after the other without manually editing the commit message
04:24 damo22 i know its probably not good practice, but these patches have been tested on another tree and work fine
04:24 otiose joined #git
04:24 damo22 and i cant just pull from the other repo because im filtering the patch series
04:24 kadoban How were they generated? Are they something that 'git am' can process? I don't really know, working with actual patches is pretty bad in general, it's like ... a backup case that I've never actually been forced to fall back to.
04:25 damo22 i generated them with git format-patch
04:26 damo22 i assumed there would be a simple command i could use like git apply --apply or something
04:26 kadoban There probably is, not sure I know it.
04:27 damo22 no worries, maybe someone else will chime in eventually
04:27 kadoban You say you can't pull, can you just fetch and cherry-pick or 'rebase -i' and then merge?
04:27 gfixler joined #git
04:27 kadoban Not that it's necessarily going to help now, after you already have them all as patches.
04:28 damo22 i suppose i could but i already have them as files yea
04:28 Goplat joined #git
04:28 damo22 i dont really want to pull a shitload of patches and then rebase -i and drop tons
04:29 martin290 so i was able to merge the branch i had, which is good! i ran "git branch -d AddPost" and the ran "git push" but the AddPost branch still exists. do i do something wrong?
04:29 ash_workz joined #git
04:30 damo22 martin290: i dont know what youre trying to do but it sounds like you just deleted the AddPost branch locally
04:30 martin290 i'm trying to delete the AddPost branch locally, then push my changes to git
04:30 kadoban damo22: Unless it's a case where you simply can't fetch, either because there's no repo you have access to or I dunno maybe like a weird network setup? There's essentially always going to be an easier way than generating patches to proceed. Like a cherry-pick. But I'll shutup so you have a hope of someone seeing your actual question.
04:30 martin290 so that branch no longer exists
04:31 kadoban (might want to reask in a few if nobody notices, since I talked so much people will probably ignore it)
04:31 damo22 all good
04:33 martin290 would this be a safe command to delete a branch i just merged: git push origin --delete <branch_name>
04:34 ertes joined #git
04:36 xlegoman joined #git
04:37 parasite_ joined #git
04:38 eizua joined #git
04:47 pks joined #git
04:47 BSAlb joined #git
04:48 BSab joined #git
04:52 KV joined #git
04:52 jeffspeff joined #git
04:53 mrnuke left #git
04:53 martin290 left #git
04:55 Cabanossi joined #git
04:56 jimi_ joined #git
05:01 dermoth joined #git
05:03 mischat joined #git
05:09 mehola joined #git
05:11 Derperpe1 joined #git
05:13 xissburg joined #git
05:14 brent__ joined #git
05:16 Rodya_ joined #git
05:22 seni joined #git
05:27 freekevin joined #git
05:28 raspado joined #git
05:33 jozwior joined #git
05:34 seni joined #git
05:36 ash_workz joined #git
05:41 jim left #git
05:42 seni joined #git
05:42 Ryanar joined #git
05:49 basiclaser joined #git
05:51 dsdeiz joined #git
05:51 dsdeiz joined #git
05:52 pks joined #git
05:53 tirej joined #git
05:53 KV joined #git
05:54 seni joined #git
05:55 Cabanossi joined #git
05:59 Rodya_ joined #git
06:04 mischat joined #git
06:06 seni joined #git
06:10 ankit01ojha joined #git
06:12 Derperpe1 joined #git
06:13 nckpz joined #git
06:14 adino joined #git
06:14 shinnya joined #git
06:18 aidalgol joined #git
06:19 a_thakur joined #git
06:21 stickperson joined #git
06:24 bilb_ono joined #git
06:25 otiose joined #git
06:27 seni joined #git
06:27 a_thakur joined #git
06:29 BSAlb joined #git
06:36 bocaneri joined #git
06:36 Rodya_ joined #git
06:36 pks joined #git
06:37 systemovich joined #git
06:39 guitarman_ joined #git
06:39 systemovich joined #git
06:44 guitarman_ joined #git
06:45 MattMaker joined #git
06:48 guitarman_ joined #git
06:49 ElGrandeAmigo joined #git
06:50 ElGrandeAmigo joined #git
06:53 dfas joined #git
06:54 KV joined #git
06:54 dfas joined #git
06:55 otiose joined #git
06:57 [0xAA] joined #git
07:05 ShapeShifter499 joined #git
07:05 mischat joined #git
07:05 prg3 joined #git
07:06 Sircle left #git
07:08 braderhart joined #git
07:10 Cabanossi joined #git
07:10 ash_workz joined #git
07:10 guitarman_ joined #git
07:14 Derperpe1 joined #git
07:17 Derperpe1 joined #git
07:19 jagob joined #git
07:20 jmpp joined #git
07:20 jmpp joined #git
07:20 overlord_tm joined #git
07:22 dreiss joined #git
07:22 pks joined #git
07:24 svara1 joined #git
07:25 guitarman_ joined #git
07:30 Murii joined #git
07:34 thebinary joined #git
07:35 [0xAA] joined #git
07:37 dsdeiz joined #git
07:39 jagobdue joined #git
07:42 jagobdue joined #git
07:49 Rodya_ joined #git
07:50 otiose joined #git
07:51 pks joined #git
07:53 dersand joined #git
07:55 Cabanossi joined #git
07:55 KV joined #git
07:56 stickperson joined #git
07:56 bernardio joined #git
07:57 m4sk1n joined #git
07:57 raspado joined #git
07:59 tirej joined #git
07:59 [0xAA] joined #git
08:01 jagob joined #git
08:05 czuber joined #git
08:06 czuber left #git
08:06 mischat joined #git
08:08 pks joined #git
08:08 shgysk8zer0 joined #git
08:09 Xarodon joined #git
08:09 Hogofwar joined #git
08:10 matoro joined #git
08:14 brent__ joined #git
08:15 lindenle joined #git
08:18 govg joined #git
08:24 chachasmooth joined #git
08:28 cyan___ joined #git
08:29 cyan___ joined #git
08:31 cyan___ joined #git
08:32 cyan___ joined #git
08:33 cyan___ joined #git
08:34 ozmage joined #git
08:34 chachasmooth joined #git
08:34 ozmage hello this is what i got from my git bisect https://paste.pound-python.org/show/P0IE7imE2i9UkdxBFhDZ
08:34 ozmage now what ?
08:35 t0by joined #git
08:38 MineCoins joined #git
08:39 _ikke_ ozmage: git bisect reset to go back to the state before the bisect
08:41 ozmage why ?
08:44 _ikke_ why what?
08:44 seni joined #git
08:44 _ikke_ This should have given you the commit that you were looking for
08:44 otiose joined #git
08:45 chachasmooth joined #git
08:49 [0xAA] joined #git
08:50 ozmage so this is what is making the problem #BAD# [f0f59a00a1c9be11038bef5aa735ed7dd985f9cf] drm/i915: Type safe register read/write ?
08:51 ozmage when i do git reset --hard [f0f59a00a1c9be11038bef5aa735ed7dd985f9cf] git checkout the kernel 4.3-rc3
08:51 ozmage and the problem is not on the kernel 4.4.44
08:51 SteffanW joined #git
08:51 ozmage and its in the kernel 4.5-rc1
08:52 iron74 joined #git
08:52 ozmage how i know if git bisect is wrong
08:52 ozmage this seems like was a waste of time and cpu cycles
08:53 _ikke_ git bisect works as good as the input you give it
08:53 _ikke_ and it makes a few assumtions
08:53 _ikke_ note that git reset --hard does not undo a commit
08:53 _ikke_ You need to verify if the bug is indeed in that commit
08:53 xissburg joined #git
08:55 matsaman joined #git
08:55 KV joined #git
08:56 matsaman left #git
08:57 ozmage this is weird git reset --hard 4fe5dc4873663fc4cfbdae7a45a1b4378a2d7993 which is the commit before [f0f59a00a1c9be11038bef5aa735ed7dd985f9cf] is checking out the kernel 4.4
08:57 ozmage what the hell
08:57 sea-gull joined #git
08:59 damo22 left #git
08:59 ozmage i compiled the kernel with this commit and was #BAD# [f0f59a00a1c9be11038bef5aa735ed7dd985f9cf] drm/i915: Type safe register read/write
08:59 guitarman_ joined #git
08:59 ozmage and git bisect in the final bisect says is the first bad commit
09:00 ozmage so the bug is there because the kernel was slow
09:00 mattxtlm joined #git
09:02 Ragnor joined #git
09:04 guitarman_ joined #git
09:06 xissburg_ joined #git
09:07 mischat joined #git
09:08 mattxtlm hi there! I've got a best practice question: say, I've got branch "dev" and some feature branches (e.g. "Feature42"). I do some work on Feature42 and realize I need "class a" for Feature42, but it would also be helpful in "Feature43". Do I go back in "dev", create that class and merge "dev" to "Feature42" and "Feature43"? Or Create that class in "Feature42" and just merge that class to "dev" and "Feature43" if
09:08 mattxtlm that is possible? What would be a good approach?
09:12 robotroll joined #git
09:12 guitarman_ joined #git
09:14 nyo2 joined #git
09:21 pks joined #git
09:24 stickperson joined #git
09:26 dsdeiz joined #git
09:26 dsdeiz joined #git
09:26 TomTomTo1 joined #git
09:29 sobersabre joined #git
09:30 anuxivm joined #git
09:30 sobersabre hi. I've looked at this write up: http://stackoverflow.com/questions/3161204/find-the-parent-branch-of-a-git-branch
09:30 sobersabre I'm implementing a semver auto-bumper.
09:30 jknetl joined #git
09:31 sobersabre In order to simplify the scope, I can enforce e.g. single merge from feature branch back to its parent.
09:31 systemovich joined #git
09:32 pur3eval joined #git
09:32 sobersabre so if we have a long running branch off master, it can "catch up" (i.e. merge master), but it would not be merged and then new commits added.
09:32 _ikke_ mattxtlm: I would go for the first approach
09:32 sobersabre moment, trying to setup ASCII art for this. :)
09:32 garethdaine joined #git
09:32 _ikke_ mattxtlm: but both are equally valid
09:33 YuGiOhJCJ joined #git
09:33 otiose joined #git
09:36 kruszynka joined #git
09:42 jknetl joined #git
09:43 msonntag joined #git
09:43 sobersabre anyway, https://gist.github.com/mvk/ee01ef9d513d44ce0ea43a95fca0d88c
09:44 sobersabre Need to find that my "feature" branch is coming off "master" first.
09:44 MineCoins joined #git
09:48 fieldmapper joined #git
09:50 mrnuke joined #git
09:52 NwS joined #git
09:53 spacelord_ joined #git
09:54 Cabanossi joined #git
09:55 aavrug joined #git
09:56 FederationOfNULL joined #git
09:56 ShoaibJahejo joined #git
09:56 PioneerAxon joined #git
09:58 rivarun joined #git
09:58 KV joined #git
09:58 ShoaibJahejo joined #git
09:59 govg joined #git
09:59 ShoaibJahejo joined #git
10:00 ShoaibJahejo joined #git
10:00 jknetl joined #git
10:00 ShoaibJahejo joined #git
10:02 sobersabre is there a git command to find the 1st commit in the ancestry with 2 children ?
10:03 sobersabre i.e. if I'm at a branch, I would like to identify the commit I could have been branched off.
10:04 sobersabre (I know this has its limits due to branches volatile nature)
10:09 johnny56 joined #git
10:11 rossome joined #git
10:12 otiose joined #git
10:14 ignacio joined #git
10:14 ignacio any idea on how much time it takes to "git add " 200mb? o,o
10:16 jozwior joined #git
10:17 govg joined #git
10:18 _ikke_ Shoul not take too long
10:18 _ikke_ should
10:19 troulouliou_div2 joined #git
10:20 satifant joined #git
10:23 theoceaniscool joined #git
10:24 govg joined #git
10:25 nowhere_man joined #git
10:25 Cabanossi joined #git
10:25 stickperson joined #git
10:26 ignacio done :D
10:29 govg joined #git
10:30 cdown joined #git
10:30 mischat joined #git
10:35 jagob joined #git
10:38 inflames joined #git
10:39 GavinMagnus joined #git
10:40 alex1a joined #git
10:42 TomyLobo sobersabre, git merge-base A B
10:43 msonntag joined #git
10:44 TomyLobo finds the latest common ancestor of A and B
10:45 balukanattil joined #git
10:45 balukanattil left #git
10:47 doener joined #git
10:48 acetakwas joined #git
10:48 browndawg joined #git
10:50 cdown_ joined #git
10:51 pur3eval joined #git
10:51 durham joined #git
10:52 otiose joined #git
10:52 SteffanW joined #git
10:55 davimore_ joined #git
10:57 afuentes joined #git
10:59 KV joined #git
11:04 jknetl joined #git
11:04 pur3eval joined #git
11:05 bauruine joined #git
11:08 adymitruk what's the best way to do "if ( commit1 is descendent of commit2 )" in bash?
11:10 TomyLobo that command has a parameter for that i think
11:10 TomyLobo git merge-base --is-ancestor <commit> <commit>
11:10 _ikke_ adymitruk: git merge-base --is-ancestor commit2 commit1
11:10 TomyLobo oh, not the same guy
11:11 adymitruk _ikke_: thanks!
11:12 TomyLobo psh i was 3 seconds faster
11:12 _ikke_ I specified the order of commits :P
11:12 adymitruk what would be the bash syntax for the test? if [ ! git merge-base --is-ancestor commit2 commit1 ]; then echo is ancestor; fi
11:12 manuelschneid3r joined #git
11:12 cdown_ joined #git
11:13 adymitruk is not*
11:13 _ikke_ right
11:13 _ikke_ is not
11:13 _ikke_ the [ ] should not be necessary
11:13 adymitruk ok
11:13 _ikke_ let me test
11:13 adymitruk what would be the bash syntax for the test? if ! git merge-base --is-ancestor commit2 commit1; then echo is ancestor; fi
11:14 dsdeiz joined #git
11:14 dsdeiz joined #git
11:14 _ikke_ yeah, that should work
11:15 TomyLobo not only that, they're wrong and will break it
11:16 TomyLobo and the ! is wrong too
11:16 _ikke_ TomyLobo: He wants to know if the commit is not an ancestor
11:16 [0xAA] joined #git
11:17 TomyLobo but his echo is wrong
11:17 GT4066 joined #git
11:17 _ikke_ He corrected himself
11:18 [0xAA] joined #git
11:19 adymitruk just checked. works well
11:20 fieldmapper joined #git
11:20 BSaboia joined #git
11:20 thebinary joined #git
11:21 fieldmapper joined #git
11:22 mehola joined #git
11:25 YuGiOhJCJ joined #git
11:26 TomTomTo1 joined #git
11:27 TomTomTo1 left #git
11:27 jknetl joined #git
11:28 bruce_lee joined #git
11:29 rnsanchez joined #git
11:30 mathematic-alpha joined #git
11:31 SteffanW2 joined #git
11:32 Tobbi joined #git
11:38 KV joined #git
11:39 robotroll joined #git
11:40 nyo2 joined #git
11:40 Cabanossi joined #git
11:42 y_sekino joined #git
11:42 Thorn joined #git
11:46 jagob joined #git
11:46 bonzibuddy joined #git
11:49 Puffball joined #git
11:49 raijin joined #git
11:50 jknetl joined #git
11:50 darkSeid_ joined #git
11:53 ertesx joined #git
11:53 theoceaniscool joined #git
11:55 HcsOmot joined #git
11:55 HcsOmot left #git
11:55 mohabaks joined #git
11:56 HcsOmot joined #git
11:56 HcsOmot left #git
11:56 HcsOmot joined #git
11:57 mattxtlm joined #git
11:57 noxi joined #git
11:59 King_Hual joined #git
11:59 King_Hual joined #git
11:59 y_sekino joined #git
12:00 Limes joined #git
12:01 VampiricPadraig joined #git
12:01 VampiricPadraig joined #git
12:01 masuberu joined #git
12:01 Noldorin joined #git
12:03 Limes__ joined #git
12:07 troulouliou_dev joined #git
12:07 Puffball joined #git
12:07 davimore joined #git
12:08 adymitruk anyone here use gitea?
12:08 adymitruk or gogs?
12:09 mva joined #git
12:09 mva hi there!
12:09 jim joined #git
12:10 adymitruk it seems to only support to serverside hooks. I'd like to use the update hook instead of the 2 they have there.
12:10 Varunram joined #git
12:10 mva advice me, please, how can I (if it is possible at all) look on entire content of specified file at specified commit without doing 'checkout'? :)
12:10 jim hi... if I want to go back to a particular commit, do I... git tag to list them, and git checkout the tag I want?
12:11 mva jim: if only that commit was tagged
12:11 mva otherwise, look in git log
12:11 jim there are a LOT of tags (this is the linux kernel)
12:12 freimatz joined #git
12:12 freimatz joined #git
12:13 kaldoran joined #git
12:13 stickperson joined #git
12:13 grayjoc joined #git
12:13 Varunram If you mean reverting changes, just reset hard followed by the number of commits you want to go back
12:13 sim590 joined #git
12:14 mva I guess,  he's bisecting the kernel
12:14 Varunram O.o
12:17 troydm joined #git
12:17 troydm how do I ignore a submodule in git repo entirely?
12:18 noxi_ joined #git
12:18 Varunram git rm <that submodule>
12:18 troydm I've tried adding it's path to .gitignore but it still reports it's changes as unstaged
12:19 troydm Varunram: I've tried it but it still reports it in git status
12:19 MineCoins joined #git
12:19 Varunram do you want to discard the unstated commits ?
12:19 troydm Varunram: I want it to be there in filesystem but entirely ignored by main repo
12:20 fieldmapper joined #git
12:20 troydm Varunram: I want it to be managed separately
12:22 troydm Varunram: also I don't want main repo to contain some special git submodule kind of link or something like that I don't remember exactly how it's called
12:22 Varunram so basically, you want to track the main repo-submodule and the submodule, right?
12:22 noxi__ joined #git
12:24 Varunram I think they are called submodules itself (i.e. they are tracked by the exact commit specified in the main project)
12:25 tirej joined #git
12:25 noxi joined #git
12:25 troydm Varunram: no, I don't want to track it in main repo, I want main repo to completly ignore it entirely
12:26 Varunram did you try adding another gitignore in the child directory?
12:26 troydm Varunram: the fact it's a directory which has .git directory in it qualifies it as submodule and my main repo always reports it as submodule instead of entirely ignoreing it since i have it in .gitignore
12:27 troydm Varunram: what kind of git ignore in child directory?
12:28 Varunram * <newline> !*/ <newline>!.gitignore
12:28 rivarun joined #git
12:28 noxi joined #git
12:28 Varunram too lazy to use pastern, so just delete <newline> and replace it with a new line
12:29 Varunram paste bin*
12:30 Varunram does it work?
12:32 mikecmpbll joined #git
12:35 CheckDavid joined #git
12:36 jim Varunram, here's a pretty handy alternative: [[pastebin
12:36 jim oops
12:36 jim Varunram, here's a pretty handy alternative: you can pastebin the output of an arbitrary command by running "anArbitraryCommand | nc termbin.com 9999", and to include error messages, "anArbitraryCommand 2>&1 | nc termbin.com 9999"
12:37 Varunram Oh cool, thanks a lot
12:37 jim welcome
12:39 fieldmapper joined #git
12:40 otiose joined #git
12:40 jnavila joined #git
12:40 Cabanossi joined #git
12:48 johnny56 joined #git
12:50 jagobdue joined #git
12:50 darkSeid_ hi, im getting merge conflicts for files that i haven’t touched. Not rly sure why this is happeneing. Any ideas or any extra info I need to provide? I checked with the projects owner and he made those changes, I’m just not sure why they are showing up as merge conflicts for me
12:50 manuelschneid3r joined #git
12:58 sdothum joined #git
12:59 ojdo joined #git
13:02 dsdeiz joined #git
13:04 troydm left #git
13:04 fahadash joined #git
13:05 doener joined #git
13:06 jbitdrop joined #git
13:06 ocbtec joined #git
13:08 pks joined #git
13:08 sarri joined #git
13:08 sarri joined #git
13:10 freimatz joined #git
13:13 davimore_ joined #git
13:13 shinnya joined #git
13:18 johnny56_ joined #git
13:19 fieldmapper joined #git
13:21 spacelord_ joined #git
13:23 johnny56 joined #git
13:24 mehola joined #git
13:26 Cabanossi joined #git
13:26 jnavila joined #git
13:28 tirej joined #git
13:32 ecuanaso joined #git
13:32 jagobdue joined #git
13:39 wgrant joined #git
13:41 anli joined #git
13:42 Murii joined #git
13:42 anli Can I ignore platforms/ and unignore platsforms/platforms.json?
13:42 kusanagi_ joined #git
13:42 Jackneill_ joined #git
13:48 HcsOmot hi, I'm fairly new to git, sorry for any possible dumb/obvious questions. i made a change to a file, did not stage it, it was just sitting there in working directory. then I did git checkout -- myfile. is there a way to undo that? to get back those changes I made and then foolishly discarded?
13:48 sea-gull joined #git
13:50 ayogi joined #git
13:52 notebox joined #git
13:53 j416 HcsOmot: restore it from your backup.
13:55 j416 darkSeid_: your branch did touch those files.
13:58 darkSeid_ hi j416, i think i may have found the problem. i forked the repo then branched from `master` not from `development` which i think has caused this issue
13:59 darkSeid_ thankfully i only made minor changes so i can do them again manually
14:01 stickperson joined #git
14:02 HcsOmot j416: not sure how to do that. let me try explaining again: git status returned that all is ok, no untracked files and nothing to add. working directory was clean. then I changed one of the files, ran git status which returned that one file was modified. then I did git checkout -- myfile,and after that git status returned that there's nothing added.
14:02 HcsOmot so it's basically as if I didn't even made the change.
14:03 HcsOmot so now I'm wondering is there any way to actually retrieve that change that got discarded.
14:03 HcsOmot to me it's basically the same as if I wrote something in a text editor, then hit undo. in some editors i could just hit 'redo' and keep going back and forth like that
14:04 HcsOmot i'm wondering if something like that is possible with git.
14:04 j416 HcsOmot: not possible.
14:04 j416 you never added it.
14:04 HcsOmot understood
14:05 HcsOmot but if I wanted to get it back, I suppose it could be possible from the editor?
14:05 j416 I don't know
14:05 HcsOmot i made the change using vim, so I don't know how that would work, but still
14:07 otiose joined #git
14:10 jknetl joined #git
14:12 Tobbi joined #git
14:13 otiose joined #git
14:14 webdev007 joined #git
14:15 panzergame joined #git
14:16 courrier joined #git
14:16 KV joined #git
14:16 Bob8989|3 joined #git
14:17 Bob89893 joined #git
14:17 Bob89895 joined #git
14:17 apotry joined #git
14:18 pbrewczynski joined #git
14:18 panzergame Hello everyone, i have two different local repository using the same sub modules, they both use the same confirguration in .git/config and .gitmodules. The first success init the submodules thanks to "git submodule update --init --recursive" bu the second is blocked at the cloning stage. Did someone have an idea ? Thanks in advance.
14:20 chipotle joined #git
14:21 raijin joined #git
14:22 mohabaks joined #git
14:25 panzergame left #git
14:27 dodobrain joined #git
14:31 m0viefreak joined #git
14:31 todd_dsm joined #git
14:40 _ikke_ blocke
14:40 _ikke_ oh, gone already
14:44 madewokherd joined #git
14:45 davimore__ joined #git
14:46 robotroll joined #git
14:47 grayjoc joined #git
14:50 raijin joined #git
14:53 KV joined #git
14:54 aiena joined #git
14:55 aiena need some help I goofed up. I was on the "colorlabs" branch of a repo and then I ran "git checkout -b origin colorlabs" now when I run "git branch" I have 2 pointers to the same branch
14:55 aiena how do I resolve this ?
14:56 aiena I dont know what really happened
14:58 manuelschneid3r joined #git
14:59 ncthom91 joined #git
15:00 ncthom91 joined #git
15:00 mikecmpbll joined #git
15:01 jknetl joined #git
15:01 ncthom91 joined #git
15:01 kristofferR joined #git
15:02 ncthom91 joined #git
15:02 otiose joined #git
15:03 _ikke_ aiena: you created a branch called origin
15:03 _ikke_ git update-ref -d refs/heads/origin should fix it
15:03 aiena on the server or locally ?
15:03 _ikke_ locally
15:03 _ikke_ make sure you checkout another branch first
15:04 jnavila joined #git
15:05 aiena how do I check if everything isok now ?
15:06 aiena Also I come across this situation often
15:06 aiena How do I merge correctly.
15:06 GT4066 joined #git
15:06 aiena E.g. I commit in office. THen I work at home and do a push. Then I commit in office accidentaly forgetting to do a git pull before that
15:07 otiose joined #git
15:07 aiena is there an easy way to keep all changes, pull to the head remote is on and then put the commit which is local over it
15:08 _ikke_ aiena: git pull --rebase
15:08 _ikke_ does that
15:08 _ikke_ ie, fetches the changes from the remote, and then reapplies the local commits on top of that
15:08 aiena Ok
15:09 aiena _ikke_: if your working directory has uncommitted changes
15:09 anuxivm joined #git
15:09 aiena are those lost during a rebase
15:09 _ikke_ It refuses to rebase then
15:09 DrSlony left #git
15:09 aiena how do you resolve that situation
15:09 aiena git stash ?
15:10 _ikke_ (there is --autostash, which will stash the changes, rebases, and then pops the stash again)
15:10 anuxivm joined #git
15:10 aiena ok thank you
15:11 Lauven joined #git
15:11 aiena _ikke_: how do I list remote refs
15:11 seni joined #git
15:12 nostrora joined #git
15:12 anuxivm joined #git
15:12 _ikke_ git branch -r
15:13 aiena so the ones in red are the remotes E.g.   origin/HEAD -> origin/colorbars
15:13 _ikke_ yes
15:13 _ikke_ remote tracking branches
15:13 aiena ok so if I did not have a remote they would not be there and I would not be able to do a git pull
15:13 anuxivm joined #git
15:14 aiena or push
15:14 _ikke_ git pull = git fetch + git merge
15:14 _ikke_ and a remote is a shortcut for a url to a remote repository
15:14 aiena so origin is ony the default one
15:14 _ikke_ (git pull --rebase = git fetch + git rebase)
15:14 _ikke_ aiena: exactly
15:15 aiena so I can have many remotes and some remotes can be several commits ahead of others
15:15 brent__ joined #git
15:15 _ikke_ Correct
15:15 anuxivm joined #git
15:15 aiena e.g. origin , kitty etc.
15:15 aiena ok for now I have only one remote I think its easie that way
15:16 anuxivm joined #git
15:17 aiena _ikke_:  I think I did not understand correctly
15:17 aiena WHen I do "git checout master"
15:17 aiena *checkout
15:17 aiena then I run git branch -r
15:18 aiena I still get  origin/HEAD -> origin/colorbars even though now I am on master
15:21 aiena is this expected ?
15:23 grawity well, origin/HEAD isn't *your* repository's HEAD
15:23 texinwien_ joined #git
15:25 mehola joined #git
15:25 aiena its the remotes head
15:25 aiena I think
15:26 Cabanossi joined #git
15:26 jagob joined #git
15:32 King_Hual joined #git
15:32 jagob joined #git
15:34 Bizkit joined #git
15:36 _ikke_ aiena: what branch you are on does not affect the output of git branch -r
15:36 aiena ok
15:36 _ikke_ which shows all remote tracking branches available
15:37 p4trix joined #git
15:38 sorressean joined #git
15:38 Arban joined #git
15:38 sorressean I used git reset --hard [commit] to go back for some code I deleted. how do I get back to head?
15:39 sorressean ah, git pull worked to fast-forward
15:39 Bob8989|2 joined #git
15:39 aiena yup
15:39 Bob89896 joined #git
15:39 Bob89897 joined #git
15:40 aiena but that would have cleared your uncommitted changes too
15:40 aiena or is that git clean
15:40 mattxtlm joined #git
15:42 _ikke_ git reset --hard removes all changes to tracked files, git clean removes all untracked files
15:42 aiena ah
15:42 aiena so git clean is dangerous if you want to keep the untracked files for a future commit
15:42 aiena thanks
15:49 theoceaniscool joined #git
15:49 jaafar joined #git
15:50 stickperson joined #git
15:50 Fr0stBit joined #git
15:51 Fr0stBit Hello o/
15:51 Fr0stBit I recently started getting this warning in all my repos, and i have no idea why: "WARNING: Unable to search for locks contained in this push.\nTemporarily skipping check ..."
15:51 Varunram joined #git
15:52 Varunram left #git
15:53 _ikke_ Hmm, never seen that one
15:53 _ikke_ When do you get that?
15:53 Fr0stBit When i'm just pushing
15:53 Fr0stBit (github)
15:54 _ikke_ Do you use a different client (gui or some sorts)?
15:54 Fr0stBit Nop, plain old command line
15:54 _ikke_ I cannot find that error in gits source
15:54 Fr0stBit I'm in linux, my remotes are through ssh
15:55 Fr0stBit I get it as the first output, before the line "Counting objects: "
15:55 KV Tried to grep for it in the git source, found nothing
15:55 Fr0stBit Could it be from the git-lfs project?
15:55 _ikke_ Fr0stBit: Not prefixed with remote?
15:55 Cabanossi joined #git
15:55 _ikke_ Fr0stBit: That's certainly possible
15:55 _ikke_ Fr0stBit: And very likely too
15:55 Fr0stBit _ikke_: its just a "git push origin master"
15:56 KV Yes it was in git-lfs: https://github.com/git-lfs/git-lfs/blob/5d9dc1c1379c7fcf51e814ba147b01ed9e81eb42/commands/uploader.go#L52
15:56 _ikke_ haha
15:56 _ikke_ found it at the same time
15:57 a_thakur joined #git
15:57 _ikke_ Fr0stBit: I'd file an issue here https://github.com/git-lfs/git-lfs/issues
15:57 otiose joined #git
15:58 _ikke_ https://github.com/git-lfs/git-lfs/issues/1878
15:58 Fr0stBit _ikke_: ok! Thanks for helping
15:58 _ikke_ Fr0stBit: Do you use arch?>
15:59 Fr0stBit _ikke_: yeah, why?
16:00 Lauven joined #git
16:00 _ikke_ That last issue shows someone with the problem and is using arch too
16:01 Fr0stBit _ikke_: already building package
16:02 chipotle joined #git
16:02 mablae joined #git
16:02 otiose joined #git
16:03 _ikke_ Fr0stBit: So the issue is that you used a non-released version of git-lfs
16:03 Fr0stBit _ikke_: will tell soon if this fixed it, i'm about to push a new commit
16:06 nowhere_man joined #git
16:08 _ng joined #git
16:08 Fr0stBit _ikke_: yep, that fixed it.
16:11 WayToDoor joined #git
16:11 cyan___ joined #git
16:12 _ikke_ Fr0stBit: Cool
16:13 Murii joined #git
16:13 Naan joined #git
16:15 a_thakur joined #git
16:16 xlegoman joined #git
16:16 PhysicsSucks joined #git
16:16 fahadash joined #git
16:19 le_melomane joined #git
16:19 lindenle joined #git
16:20 dave0x6d joined #git
16:21 jost joined #git
16:22 YuGiOhJCJ joined #git
16:23 PhysicsSucks In Github's markdown, what is the proper way to highlight a file name within a paragraph? I was thinking about `file.c` but that's for code not file names as far as I know
16:24 grawity good enough
16:24 grawity either that, bold, or italics, or a mix
16:24 ozym4nd145 joined #git
16:25 PhysicsSucks I thought it's strictly for code, ok I'll just use it then
16:25 Cabanossi joined #git
16:26 le_melomane joined #git
16:27 mehola joined #git
16:31 waveclaw joined #git
16:34 AaronMT joined #git
16:38 mizu_no_oto joined #git
16:45 netj joined #git
16:47 waveclaw joined #git
16:52 Eryn_1983_FL joined #git
16:52 multi_io joined #git
16:52 otiose joined #git
16:53 PioneerAxon joined #git
16:55 KV_ joined #git
16:56 t0by joined #git
16:56 t0by joined #git
16:57 otiose joined #git
16:59 lmat joined #git
17:04 jknetl joined #git
17:07 cdg joined #git
17:09 sea-gull joined #git
17:12 GT4066 joined #git
17:13 prg3 joined #git
17:14 pur3eval joined #git
17:15 zeroed joined #git
17:16 Domhack_ joined #git
17:16 stickperson joined #git
17:17 howitdo joined #git
17:18 peepsalot joined #git
17:19 jsolano joined #git
17:22 bilb_ono joined #git
17:22 masuberu joined #git
17:25 mizu_no_oto joined #git
17:28 PhysicsSucks joined #git
17:30 rt joined #git
17:31 kristofferR joined #git
17:34 [0xAA] joined #git
17:34 GT4066 joined #git
17:35 ash_workz joined #git
17:38 theoceaniscool joined #git
17:39 leeN joined #git
17:40 mehola joined #git
17:45 zeroed joined #git
17:45 zeroed joined #git
17:47 kristofferR joined #git
17:47 otiose joined #git
17:48 tmcmahon joined #git
17:52 jil joined #git
17:52 jil hi
17:52 otiose joined #git
17:53 jil I've read the gittutorial but dit not see how to add file reccursively. git add -r
17:53 jil ?
17:54 nyo2 joined #git
17:54 jil Also How do I push file to my github ?
17:56 KV jil, 'git add -A' adds everything 'git add -u' adds all edited but not new files. If you create a repo att github it shows all command you need to push to it.
17:59 jil I tryed git add -A  but I only add the file in the root directory.  It did not add the subdirectories.
18:00 jil I checked using git status
18:00 jil only the readme.md file is showing and I did not do any commit
18:03 _ikke_ git add is recursive by default
18:06 jil _ikke_: so what could be the problem with my install ? (linux mint to uptodate)
18:07 mda1_ joined #git
18:07 jil I have rw right of subdirs.
18:07 chardan joined #git
18:07 jil Oh, maybe it's because they are empty
18:08 jil yes, I was trying to add empty directories.  If I add files inside them they are added with the git add -A
18:08 _ikke_ correct
18:09 _ikke_ git does not track directories
18:09 govg joined #git
18:10 jil but then I've just added an empty file then removed it git rm --cached test
18:11 jil I'm left the empty dir in the staging area.  how do I get ride of it ?
18:11 titankiller joined #git
18:11 _ikke_ git reset <path>
18:15 ispn joined #git
18:17 jil ok.  on last thing.  I'm trying to push my project to github and followed instruction on their website but I'm blocked.  Permission denied (publickey)..
18:18 _ikke_ DId you add your public key to github?
18:18 jil I don't know how to.
18:18 KV jil: https://help.github.com/articles/connecting-to-github-with-ssh/
18:19 _rht joined #git
18:20 darkSeid_ my first attempt to fork a repo and trying to contribute is going comically bad
18:21 mattxtlm joined #git
18:22 _ikke_ darkSeid_: What's the problem?
18:23 darkSeid_ well, i forked the repo, made some changes, did git status and it showed a bunch of files staged that i didnt touch
18:24 darkSeid_ i think what happened is that i forked from `master` and i should have forked from `development`
18:24 _ikke_ You fork entire repsotories, not just branches
18:24 _ikke_ Or do you mean that you created a branch on top of master / develop
18:24 KV Probably fogott to switch from master to develop?
18:25 gajus joined #git
18:25 darkSeid_ ive only got master and 1 other branch locally
18:26 darkSeid_ this is why its going so comically bad, im not even sure where i made a mistake lol
18:26 darkSeid_ im at that ‘im so confused i cant even formulate a question’ stage
18:26 _ikke_ !transcript
18:26 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:27 darkSeid_ good idea :)
18:28 mehola joined #git
18:32 matoro joined #git
18:32 darkSeid_ _ikke_ any cmds i could run before i paste which would help show you any extra info?
18:33 Darren_ joined #git
18:35 jil KV Yes I did it. Thank you too _ikke_
18:35 dreiss joined #git
18:35 darkSeid_ https://gist.github.com/BlindPacemaker/ebe48b7d7a096a5e4de7cd886e4a5a2f
18:35 kulelu88 joined #git
18:35 darkSeid_ there’s the gist, if it helps i can link u to my fork or the original repo itself
18:36 jil Don't you think that "branch" vocabulary in git referencing more to river branch than tree branches ?
18:36 cdown joined #git
18:37 jil developpement maps is not so much like a tree but more like a river delta don't you think ?
18:38 thiago you're probably right
18:38 thiago we don't have a trunk either
18:41 fletom joined #git
18:41 fletom with `git diff -M`, how do I see the actual difference instead of "similarity index 99%"?
18:42 sq-one joined #git
18:42 jil left #git
18:42 Hudu joined #git
18:42 sea-gull joined #git
18:42 rwp joined #git
18:42 otiose joined #git
18:44 ozmage joined #git
18:45 thiago fletom: it shows the difference for you.
18:46 pur3eval joined #git
18:47 diogenese joined #git
18:47 peepsalot joined #git
18:49 Goplat joined #git
18:49 fletom thiago: you're so right, it does! oops
18:51 svm_invictvs joined #git
18:53 thiago it won't show anything if it's a pure rename (100% similarity), for obvious reasons
18:54 _ikke_ 3
18:54 darkSeid_ any idea whats gone wrong from the gist?
18:55 _ikke_ what kind of changes does git diff return?
18:56 Cabanossi joined #git
18:56 darkSeid_ https://gist.github.com/BlindPacemaker/7453f7325427e16d044ae0120727e8b9
18:57 thiago darkSeid_: what's the problem? It looks like normal workflow.
18:57 thiago fix the conflicts, then commit
18:57 darkSeid_ the issue is that those conflicts are in files i haven’t touched
18:58 darkSeid_ it appears that im synced with `master` when i need to be synced with `development` ?
18:59 _ikke_ Do you have the terminal session further back?
18:59 _ikke_ This shows modified files with conflict markers, but no conflict status
18:59 darkSeid_ unfortunately not :/ any way to retrieve them?
18:59 _ikke_ no\
18:59 darkSeid_ acht
19:00 _ikke_ So if you do no care about this modified files, then you can check out those files
19:00 _ikke_ git checkout <file> would undo the changes to those files
19:00 darkSeid_ alright, may have to try that
19:00 darkSeid_ thanks, btw
19:01 thiago darkSeid_: assume you're wrong and Git is right.
19:01 thiago you touched those files
19:01 thiago therefore, you have now to fix the conflict
19:01 darkSeid_ oh, im not going to assume that, i _know_ that
19:02 thiago you must have pulled from somewhere that made changes to those files
19:02 darkSeid_ yeah i did
19:02 darkSeid_ i pulled from master but the most up to date is development, which is what im trying to merge with
19:02 darkSeid_ so thats the issue, i think?
19:03 thiago yes
19:03 thiago I think you pulled from somewhere else
19:04 darkSeid_ somewhere else?
19:04 _ikke_ From a remote
19:04 darkSeid_ ah
19:04 thiago the other option is if your upstream did a history rewrite
19:05 thiago but no one in their sane mind does that without telling everyone who uses the repository and getting them to immediately take action
19:06 darkSeid_ yeah
19:06 darkSeid_ is there an easy fix?
19:06 thiago fix the conflict
19:06 thiago then commit
19:07 darkSeid_ so just manually resolve the conflicts
19:07 darkSeid_ wont this keep happening though?
19:08 sea-gull joined #git
19:08 inflames joined #git
19:09 thiago no, with a merge you only have to fix a particular conflict once
19:09 thiago there could be other conflicts, though
19:09 thiago if you git log one of the conflicted files now and you know you didn't modify, it will tell you when it was last modified
19:09 thiago that may give you a hint where you got those changes from
19:10 darkSeid_ good idea
19:13 heroux joined #git
19:14 darkSeid_ hm, that is interesting
19:14 darkSeid_ that was a good idea thiago
19:18 nostrora joined #git
19:19 mda1 joined #git
19:21 MarioBranco joined #git
19:23 kyan joined #git
19:23 WayToDoor joined #git
19:24 seni joined #git
19:26 Cabanossi joined #git
19:26 darkSeid_ joined #git
19:26 thebinary joined #git
19:28 thiago joined #git
19:28 ozmage joined #git
19:29 troyt joined #git
19:30 matoro joined #git
19:30 Ryanar joined #git
19:37 otiose joined #git
19:38 zeroed joined #git
19:38 zeroed joined #git
19:43 Vinnie_win joined #git
19:43 ajf- joined #git
19:45 jstimm joined #git
19:46 ToBeCloud joined #git
19:47 Tobbi joined #git
19:52 Atm0spher1c joined #git
19:52 hbqo joined #git
19:53 nyo joined #git
19:54 dreiss joined #git
19:54 _geoff joined #git
20:02 stickperson joined #git
20:02 aidalgol joined #git
20:02 mizu_no_oto joined #git
20:04 spacelord_ joined #git
20:06 dreiss joined #git
20:12 NimeshNeema joined #git
20:13 gugah joined #git
20:15 p4trix joined #git
20:16 bernardio joined #git
20:16 gfixler joined #git
20:18 sea-gull joined #git
20:20 xlegoman joined #git
20:21 mehola joined #git
20:22 prabhu1990 joined #git
20:26 Jackneill_ joined #git
20:27 johnmilton joined #git
20:28 MineCoins joined #git
20:32 otiose joined #git
20:35 nostrora joined #git
20:36 mezzasega joined #git
20:38 nettoweb joined #git
20:40 ResidentBiscuit joined #git
20:41 mva left #git
20:42 sim590 joined #git
20:43 kaldoran joined #git
20:44 kyan Hi! I'm having trouble with git smudge/clean: I have "initramfs-* filter=compress" in the .gitattributes file, and "[filter "compress"]\n clean = xz\n smudge = unxz" in my .gitconfig, but when I clone the repository, the files aren't unpacked
20:48 vuoto joined #git
20:50 Tobbi joined #git
20:56 brent__ joined #git
20:57 sim590 joined #git
20:58 braderhart joined #git
21:01 kaldoran joined #git
21:04 Vinnie_win_b joined #git
21:06 courrier_ joined #git
21:08 salamanderrake joined #git
21:10 mkoskar joined #git
21:11 nd_ joined #git
21:12 cdown joined #git
21:17 howitdo joined #git
21:17 ozmage joined #git
21:20 dreiss joined #git
21:23 valize joined #git
21:27 otiose joined #git
21:27 jeffreylevesque_ joined #git
21:29 kaldoran joined #git
21:30 justan0theruser joined #git
21:32 otiose joined #git
21:34 Hudu joined #git
21:35 cdg joined #git
21:36 matoro joined #git
21:38 hwrdprkns joined #git
21:40 Cabanossi joined #git
21:42 pypypypypy joined #git
21:44 matoro joined #git
21:44 Starky joined #git
21:44 ResidentBiscuit joined #git
21:45 vuoto joined #git
21:47 wcpan joined #git
21:48 ResidentBiscuit joined #git
21:49 tmcmahon joined #git
21:51 multi_io joined #git
21:54 vuoto joined #git
21:55 jagobdue joined #git
22:02 msonntag joined #git
22:08 ash_workz joined #git
22:10 thebinary joined #git
22:12 cqi joined #git
22:17 hwrdprkns joined #git
22:22 WayToDoor joined #git
22:22 otiose joined #git
22:25 tristanp joined #git
22:26 Cabanossi joined #git
22:26 snowkidind joined #git
22:27 otiose joined #git
22:31 ecuanaso joined #git
22:32 mehola joined #git
22:35 mehola joined #git
22:36 tristanp joined #git
22:37 mehola joined #git
22:37 mehola joined #git
22:41 matsaman joined #git
22:42 menip joined #git
22:44 WayToDoor joined #git
22:44 mehola joined #git
22:45 dx joined #git
22:50 z1haze joined #git
22:52 z1haze I'm pretty new to git, and I have a git repo that isnt very organized with my commits, etc.. I am trying to do a interactive reset but it seems that my reflog doesnt include all of the commits that are on my github repo. i think that I cloned my repo once and it only started tracking from that point. is there anyway for me to reset back to my very first commit even if its not showing up in my local reflog?
22:52 spacelord_ joined #git
22:53 otiose joined #git
22:54 matsaman git fetch --unshallow? Just a guess
22:55 littleoldme joined #git
22:57 z1haze here is what ive done: I have a bunch of commits on my master branch, i checked out a new branch in that current state, then i reset the master branch way back to the beginning
22:58 z1haze now while on the new branch i checked out, i perform an interactive rebase, but I want to squash all of these other commits
22:58 z1haze I've tried this but i get told Cannot 'squash' without a previous commit
22:58 z1haze what could I be doing wrong?
23:01 matsaman think it said already, no? It wants at least one commit
23:01 fmeerkoetter joined #git
23:01 ResidentBiscuit ^
23:02 ResidentBiscuit You need at least one commit to squash into
23:02 z1haze is it referring to the branch that im on, or the master branch?
23:02 hashpuppy joined #git
23:02 matsaman it's not referring to some random other branch
23:02 z1haze I know it probably sounds really simple, but it can be a lot for a new person
23:03 z1haze both branches have commits
23:03 z1haze the master which i reset back to my first commit has one commit on it
23:03 z1haze and the new branch i checked out to rebase has a ton of commits
23:03 ResidentBiscuit When you rebase, you're not putting any new commit into master
23:03 matsaman I don't know if I'd call using git (in a way you want to use it) particularly simple =P but this is a help channel so don't sweat it
23:04 ResidentBiscuit You're just adjusting the time the branch was created to after the last commit in master
23:04 z1haze so when i got to git checkout master and then do git log, i see a commit in there
23:04 matsaman it's very easy to use git an a boring, imperfect way that nobody likes
23:04 z1haze well honestly, im just trying to learn all the little tricks
23:04 ResidentBiscuit Git isn't _that_ complicated most of the time
23:04 matsaman humans want things to be tidier than git is really designed to easily facilitate, IMO; an oversight I'm sure we'll overcome eventually
23:04 z1haze and i was reading that you can reset history in a sense to clean things up
23:04 matsaman (with the help of git, heh)
23:05 z1haze but back to my issue, my master branch has a commit on it
23:05 ResidentBiscuit Got that part
23:05 z1haze so what's it ocmplaining about
23:06 ShalokShalom joined #git
23:07 bilb_ono joined #git
23:08 ResidentBiscuit The commit on master is irrelevant. The interactive rebase only messes with the commits on your branch. So if you squash every commit, there's no commit to drop those changes into. The first commit has to be picked in some way (pick, edit, reword, something else maybe?)
23:09 cdown_ joined #git
23:09 ResidentBiscuit If you just want to clean up your branch into one nice commit, mark the top commit as a reword and squash/fixup the rest
23:10 z1haze oh i see
23:11 z1haze so the top commit in my rebase thing will overwrise the first commit on the master brnach?
23:11 Lyqyd joined #git
23:11 z1haze i just assumed that it would leave the one on the master the same and just add this new one to it
23:13 ResidentBiscuit All the commits you see in an interactive rebase are the commits on your branch but not on master
23:13 ResidentBiscuit Master doesnt get touched when you rebase
23:15 kyan Is there anything needed other than specifying in .gitattributes and .gitconfig to enable clean/smudge filters?
23:15 kyan My smudge filter still isn't doing anything...
23:17 z1haze i have definitely broke it now
23:17 z1haze :)
23:17 z1haze I did everything but now none of the changes are on the master
23:17 Dandelock joined #git
23:17 ResidentBiscuit Why would they be? I've already said rebasing your branch with master does not touch master
23:18 ResidentBiscuit You need to merge your branch into master if you want your changes
23:18 Atemu joined #git
23:18 hwrdprkns joined #git
23:19 z1haze ok.
23:19 z1haze i did that, now now i still have 2 commits called 'first commit'
23:20 z1haze maybe walk me through this one more time, given my goals?
23:21 z1haze i have just a single branch, but there is bunch of nonsense commits, nothing is really tidy and neat, and my goal here is to erase all of the previous commits on github, and basically just have a 'first commit' in there, but still have all of my up to date data
23:22 z1haze so now, after what I have just done I have a master branch with 2 commits that says 'first commit' and I have another branch that i used to rebase, it also has the same 2 commits
23:22 z1haze This is not what I wanted to have happen. I wanted to just end up with a single branch and a single commit with all my latest code in the end
23:26 pur3eval joined #git
23:31 spacelord_ joined #git
23:31 ResidentBiscuit joined #git
23:32 z1haze anyone?
23:33 jstimm joined #git
23:33 osse z1haze: git checkout --orphan temp; git commit -m 'Initial commit'; git branch -M master
23:34 ResidentBiscuit joined #git
23:36 z1haze osse, that seems to look good locally, but how do i get it up to github and to only have one commit in the history
23:36 osse z1haze: you push it
23:36 osse use the --force, luke
23:37 z1haze ahh i see what you did there :)
23:38 z1haze how about deleting releases and tags?
23:38 osse z1haze: for tags: push --delete. for releases: no clue
23:39 osse z1haze: wouldn't it be easier removing the repo from github altogether and create a new one with the same name?
23:39 z1haze osse, yea it would but I want to learn how to fix things
23:39 z1haze ive already been down that path
23:39 z1haze but i figured if people are ever using my repos i dont want to lose them as watchers and lose the stars
23:39 peeps[lappy] joined #git
23:40 Cabanossi joined #git
23:41 ozmage joined #git
23:41 rewt`` joined #git
23:41 dendazen joined #git
23:41 NeverDie_ joined #git
23:41 Derperperd joined #git
23:41 ariver joined #git
23:42 ResidentBiscuit joined #git
23:42 tristanp_ joined #git
23:43 ResidentBiscuit joined #git
23:43 holdsworth joined #git
23:43 fatalhalt joined #git
23:44 armyriad joined #git
23:45 bambams joined #git
23:45 bambams joined #git
23:45 yonatankoren joined #git
23:47 oskarkv joined #git
23:49 johnny56 joined #git
23:53 webdev007 joined #git
23:53 matoro joined #git
23:53 ozmage joined #git
23:58 tristanp joined #git
23:59 tristanp joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary