Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-06

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

All times shown according to UTC.

Time Nick Message
00:00 Derperperd joined #git
00:02 anuxivm left #git
00:03 MattMaker joined #git
00:04 ToBeCloud joined #git
00:09 Levex joined #git
00:11 variable joined #git
00:11 variable how do I get the "ahead" and "behind" for a given branch progmaticlaly
00:11 variable i.e.  [origin/master: ahead 2, behind 5]
00:11 variable this value from "git branch -vv"
00:13 eblip joined #git
00:13 variable git for-each-ref --format="%(upstream:track)" refs/heads
00:13 variable is almost what I want, but its very verbose; I just want the "2" and the "5"
00:17 Aboba joined #git
00:17 cbreak variable: man git-rev-list
00:17 gitinfo variable: the git-rev-list manpage is available at http://jk.gs/git-rev-list.html
00:17 cbreak variable: it has --count
00:18 cbreak you can ask it about a..b and b..a, which would give you the numbers
00:18 variable that works, but also seems a bit slow
00:18 * variable looks closely
00:19 cbreak slow?
00:19 ojacobson that's how the ahead and behind amounts are calculated
00:19 ojacobson it is exactly as fast as what `git-status` and `git-branch` do
00:19 ojacobson because it is what they do
00:19 variable I need it for each branch
00:19 variable so it would be an additional exec
00:19 variable actually, 2
00:19 cbreak why do you exec?
00:20 ojacobson libgit2, then
00:20 cbreak if you want performance, you'd stay in C++ and use a library
00:20 ojacobson and do your own graph walking
00:20 variable I'm working on rewriting https://github.com/unixdotfiles/bin/blob/master/git-all-rebase
00:20 ojacobson but I've never found that git's exec-able API is meaningfully slow - the dominating factors are IO
00:20 variable to be a pure "for-each-ref" script
00:20 learning joined #git
00:20 variable and avoid trying to rebase things that are neither ahead nor behind
00:26 durham joined #git
00:26 durham joined #git
00:27 _28_ria joined #git
00:28 Disavowed joined #git
00:32 zumba_addict joined #git
00:32 Levex joined #git
00:32 Disavowed Hey all. Just noticed my commits recently stopped being signed with my gpg key. Is there a neater fix for this than using filter-branch? It always makes me nervous to use!
00:33 variable Disavowed git rebase -i
00:33 courrier joined #git
00:33 variable or just sign the newer commits: it gives you as much information as signing all of them
00:34 RinzeWind joined #git
00:34 RinzeWind left #git
00:34 Disavowed Do you think?
00:34 Disavowed I'll defer to your experience. Thank you!
00:40 planigan` joined #git
00:42 dsdeiz joined #git
00:42 dsdeiz joined #git
00:42 durham joined #git
00:47 theoceaniscool joined #git
00:48 ansimation joined #git
00:50 braderhart joined #git
00:51 Mixologic joined #git
00:54 MattMaker joined #git
00:55 brent__ joined #git
00:56 kadoban joined #git
00:57 sgen joined #git
00:59 Levex joined #git
01:00 variable ojacobson cbreak thanks for the help: https://github.com/unixdotfiles/bin/blob/master/git-all-rebase is much faster now
01:00 variable I was planning on writing it entirely inside of --format and then evaling it, but that made the code extremely hard to read
01:01 variable fwiw, if anyone knows any tree operations that might allow me to rebase without "git checkout"
01:01 variable that would be great
01:08 MattMake_ joined #git
01:10 xaviergmail joined #git
01:11 BackEndCoder joined #git
01:11 orbyt_ joined #git
01:13 brent__ joined #git
01:13 Disavowed left #git
01:21 clemf joined #git
01:21 matt_m joined #git
01:22 Jeremy joined #git
01:24 Levex joined #git
01:24 NeXTSUN joined #git
01:24 dsdeiz joined #git
01:30 ozmage joined #git
01:34 pks joined #git
01:35 Kaedenn cbreak: it's a private repository and a private github
01:35 jimi_ joined #git
01:36 Kaedenn cbreak: our credentials to said github are managed externally via LDAP
01:36 cbreak github allows SSH
01:36 cbreak use that
01:37 Schwarzbaer_ joined #git
01:38 Kaedenn I need to add my public key to the github it seems
01:39 cbreak yes
01:39 cbreak that's how they identify you
01:41 Schwarzbaer_ left #git
01:46 Kaedenn I did all that and it still denies my key.
01:46 Kaedenn Permission denied (publickey).
01:46 Kaedenn fatal: The remote end hung up unexpectedly
01:47 Kaedenn I did: ssh-keygen -t rsa -b 4096 -C "me@domain.com" (where me@domain.com is instead the email I use to authenticate)
01:47 Kaedenn ...I wonder if it just wants my username rather than full email
01:48 rwp It should want your github username.
01:49 Kaedenn I gave it the github username I use, uploaded that public key to the github, did ssh-add on the private key
01:50 clemf joined #git
01:52 gugah joined #git
01:52 cqi joined #git
01:52 zeroed joined #git
01:52 kbs Kaedenn: #github might give you better help, fwiw I've found https://help.github.com/articles/testing-your-ssh-connection/ to be pretty useful for me
01:54 Kaedenn Okay now I'm really confused. ssh -T git@our-private-github.com worked.
01:55 Kaedenn ...oh, git clone ssh://git@our-private-github.com/me/thing.git (replacing domain, "me", and "thing" with actual values) worked
01:55 Kaedenn I needed the "git@"
01:58 MattMaker joined #git
01:58 dviola joined #git
01:58 Kaedenn cbreak: I got it working
02:02 MattMake_ joined #git
02:02 TbobbyZ joined #git
02:06 xaviergmail joined #git
02:07 Noodlewitt joined #git
02:10 dmj` hey guys
02:10 dmj` I’m in a project with a submodule. I’ve updated the .gitmodules file, and called git submodule sync, but when I push the branch, the submodule still reflects the same commit
02:11 dmj` How can I get the submodule to reflect the new commit
02:14 warthog9 joined #git
02:14 nowhereman joined #git
02:17 jameser joined #git
02:18 Nilesh_ joined #git
02:20 arooni joined #git
02:20 finalbeta joined #git
02:21 thebope joined #git
02:26 gugah joined #git
02:28 singalaut joined #git
02:32 ocelotsloth joined #git
02:33 monty_hall joined #git
02:33 monty_hall halp!
02:33 monty_hall did a "git stash"
02:33 monty_hall switch to "master"
02:33 monty_hall did a git pull
02:33 monty_hall now I can't "git stash pop"
02:34 clickjack joined #git
02:34 monty_hall it said "auto-merging ps4.py"
02:34 monty_hall CONFLIC (content): Merge Conflict in ps4.py
02:34 monty_hall Auto-merging experiment.py
02:34 d^sh joined #git
02:34 monty_hall I do git stash pop again
02:34 monty_hall "ps4.py" needs merge
02:34 monty_hall "unagle to refresh index"
02:35 pks joined #git
02:36 altendky joined #git
02:36 Groovin joined #git
02:36 preaction monty_hall: you need to fix the !conflict
02:36 gitinfo monty_hall: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
02:36 clickjack joined #git
02:39 monty_hall wait
02:39 monty_hall I know what I did wrong
02:39 monty_hall I git stashed
02:39 monty_hall changed branches
02:39 monty_hall pulled
02:39 monty_hall and then git stash popped in the branch
02:40 monty_hall I need to change back and the pop
02:40 monty_hall and then pop
02:40 monty_hall whew
02:41 dave0x6d joined #git
02:42 chigang joined #git
02:46 raijin joined #git
02:46 TbobbyZ joined #git
02:46 SwiftMatt joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 arescorpio joined #git
02:56 fstd_ joined #git
02:59 TbobbyZ joined #git
03:01 pur3eval joined #git
03:02 venmx joined #git
03:04 ojdo joined #git
03:04 toothe left #git
03:05 aavrug joined #git
03:06 aavrug joined #git
03:07 aavrug joined #git
03:08 aavrug joined #git
03:09 aavrug joined #git
03:11 aavrug joined #git
03:12 aavrug joined #git
03:14 chachasmooth joined #git
03:27 cdg joined #git
03:29 venmx joined #git
03:31 Vortex35 joined #git
03:31 mizu_no_oto joined #git
03:33 mehola joined #git
03:33 mehola joined #git
03:34 mehola joined #git
03:35 brent__ joined #git
03:35 mehola joined #git
03:36 mehola joined #git
03:37 mehola joined #git
03:37 jeffreylevesque joined #git
03:37 mehola joined #git
03:39 jstimm joined #git
03:39 SwiftMatt joined #git
03:40 jason237 joined #git
03:41 sunri5e joined #git
03:46 pks joined #git
03:52 zeroed joined #git
03:59 pks joined #git
03:59 chachasmooth joined #git
03:59 diego__ joined #git
04:00 diego__ left #git
04:02 ISmithers joined #git
04:02 plexigras joined #git
04:03 ahrs_ joined #git
04:04 hexagoxel joined #git
04:05 diego__ joined #git
04:06 Silenced joined #git
04:07 diego__ joined #git
04:08 diego__ joined #git
04:08 bgerber joined #git
04:10 xaviergmail joined #git
04:11 clickjack left #git
04:11 clickjack joined #git
04:16 TbobbyZ joined #git
04:20 Emperor_Earth joined #git
04:21 clickjack joined #git
04:22 chachasmooth joined #git
04:22 robattila256 joined #git
04:23 jungsubk joined #git
04:23 dreiss joined #git
04:24 stoopkid joined #git
04:28 clickjack joined #git
04:29 clickjack joined #git
04:31 clickjack joined #git
04:33 wilbert joined #git
04:33 ahrs joined #git
04:38 mehola joined #git
04:40 Xenophon1 joined #git
04:43 gtristan joined #git
04:45 YuGiOhJCJ joined #git
04:50 chachasmooth joined #git
04:50 wilbert_ joined #git
04:51 TbobbyZ joined #git
04:51 thecrooked joined #git
04:51 robotroll joined #git
04:53 MattMaker joined #git
04:53 dreiss joined #git
04:54 Cabanoss- joined #git
04:56 clickjack joined #git
05:01 MattMake_ joined #git
05:01 dmj` once you pop, the fun don’t stop
05:02 wilbert_ joined #git
05:03 netj joined #git
05:04 TbobbyZ joined #git
05:08 radoslavcap joined #git
05:11 Kaedenn left #git
05:20 askb joined #git
05:22 Andrew_K joined #git
05:24 chipotle joined #git
05:25 xall joined #git
05:27 hhee joined #git
05:30 TbobbyZ joined #git
05:32 lucido-cl joined #git
05:32 sarri joined #git
05:32 sarri joined #git
05:36 pur3eval joined #git
05:37 chipotle_ joined #git
05:38 pur3eval joined #git
05:39 MattMaker joined #git
05:42 TbobbyZ joined #git
05:44 venmx joined #git
05:48 nevodka joined #git
05:49 TbobbyZ joined #git
05:49 NeXTSUN joined #git
05:49 MineCoins joined #git
05:51 Derperperd joined #git
05:52 imack joined #git
05:53 zeroed joined #git
05:58 diogenese joined #git
05:59 chachasmooth joined #git
06:02 safe joined #git
06:05 jfr joined #git
06:08 dec0n joined #git
06:09 radoslavcap joined #git
06:10 MineCoins joined #git
06:11 sbulage joined #git
06:12 _ng joined #git
06:13 StuartMI joined #git
06:14 akkad joined #git
06:14 qt-x joined #git
06:15 rscata joined #git
06:15 clickjack joined #git
06:17 aidalgol joined #git
06:18 Silenced joined #git
06:20 muhannad_______ joined #git
06:21 MineCoin_ joined #git
06:21 Silenced joined #git
06:25 f0rks joined #git
06:27 Anja joined #git
06:28 TbobbyZ joined #git
06:28 MineCoins joined #git
06:28 jozwior joined #git
06:31 TbobbyZ joined #git
06:32 clickjack joined #git
06:34 overlord_tm joined #git
06:34 TbobbyZ_ joined #git
06:35 chachasmooth joined #git
06:38 TbobbyZ joined #git
06:40 dersand joined #git
06:42 TbobbyZ joined #git
06:43 TbobbyZ joined #git
06:46 chachasmooth joined #git
06:53 ayogi joined #git
06:54 ThomasLocke joined #git
06:55 freimatz joined #git
06:58 math-alpha joined #git
07:01 a_thakur joined #git
07:02 carlisyle joined #git
07:08 dreiss joined #git
07:09 thiago joined #git
07:14 rchavik joined #git
07:24 Atm0spher1c joined #git
07:25 Atm0spher1c joined #git
07:26 JeroenT joined #git
07:26 eroux joined #git
07:29 aard_ joined #git
07:31 gwolff joined #git
07:33 clickjack joined #git
07:33 Khisanth joined #git
07:33 mehola joined #git
07:37 zeroed joined #git
07:37 zeroed joined #git
07:38 byte512 joined #git
07:38 eduardas_m joined #git
07:41 xall joined #git
07:42 DDBag joined #git
07:42 ToxicFrog joined #git
07:45 venmx joined #git
07:46 blackwind_123 joined #git
07:46 PtxDK joined #git
07:47 jnavila joined #git
07:48 MattMaker joined #git
07:48 eduardas_m joined #git
07:48 clickjack joined #git
07:50 lordjancso joined #git
07:50 i7c doesn’t*
07:50 i7c Kids these days.
07:51 jfr joined #git
07:54 finalbeta joined #git
07:55 Silenced joined #git
07:55 Silenced joined #git
07:57 thecrooked joined #git
07:57 venmx joined #git
08:01 clickjack joined #git
08:01 chele joined #git
08:05 dvaske joined #git
08:06 danielitit_ joined #git
08:06 rchavik joined #git
08:07 King_Hual joined #git
08:07 King_Hual joined #git
08:10 elect joined #git
08:10 clickjack joined #git
08:11 Bizkit joined #git
08:16 thiago joined #git
08:17 MattMaker joined #git
08:17 xbob joined #git
08:18 sirmob joined #git
08:20 dvaske_ joined #git
08:22 Darcidride joined #git
08:26 thiago joined #git
08:28 TomyWork joined #git
08:29 stemid joined #git
08:30 ploop joined #git
08:30 stemid I made a mistake a few commits ago where I commited the wrong files to the wrong branch. then I deleted them and commited that change. but this stops me from merging branch1 with branch2 because it would delete the files in branch2 where they're supposed to be. all I can think of is deleting the repo and re-creating it from 0, but is there a real solution for this where I keep my repo?
08:32 stemid I guess I could checkout the last good commit and then restore files manually from a backup.
08:33 osse stemid: git merge --no-commit; resurrect the files; git commit
08:34 osse (ie. manual manipulation of the merged result)
08:36 stemid thanks for the advice. made me think that I could actually just go ahead and merge, the files would be deleted, then restore them and re-commit them. that would also be one solution that's easier than what I first thought.
08:37 thecrooked joined #git
08:39 chachasmooth joined #git
08:40 DieguezZ joined #git
08:43 hexagoxel joined #git
08:43 Balliad joined #git
08:43 thiago_ joined #git
08:45 heftig[m] joined #git
08:49 venmx joined #git
08:50 cebor joined #git
08:52 Bizkit joined #git
08:55 RxMcDonald joined #git
08:55 srandon1213 joined #git
08:55 RxMcDonald I'm seeing most of the files in my repo modified and idk why, how do you check diff of a single file?
08:55 srandon1213 in order to resolve conflicts... do you manually delete the lines with <<<<<<<<<<<<HEAD strings  ?
08:55 dcpc007 joined #git
08:55 srandon1213 i mean i check those lines... and delete i part i do not want... is this the correct way  ?
08:56 _ikke_ RxMcDonald: git diff <file>
08:56 _ikke_ srandon1213: That's the manual way, but would work, yes
08:56 RxMcDonald It shows contents are identical but makrs it as modified why?
08:56 jast srandon1213: yeah, figure out which parts between the <<</===/>>> you need and make the file look like it should be, with all markers removed
08:56 _ikke_ srandon1213: There are also merge tools which give you a side-by-side view and lets you choose what side to pick
08:56 srandon1213 _ikke_: like for example ?which tools  ?
08:57 RxMcDonald Why is it marking my files as modified if the contenet is identical??
08:57 RxMcDonald oh shit i realize now
08:57 RxMcDonald permissions chaned, nvm
08:57 _ikke_ srandon1213: see man git config (merge.tool) for some suggestions)
08:57 gitinfo srandon1213: the git-config manpage is available at http://jk.gs/git-config.html
08:58 Raging_Hog joined #git
09:02 grayjoc joined #git
09:02 basiclaser joined #git
09:02 srandon1213 is there a way to take the last three commits and make a single commit ?
09:02 srandon1213 i mean join them in a single commit
09:02 a_thakur joined #git
09:02 nevodka squash
09:02 _ikke_ srandon1213: git rebase -i HEAD~3
09:03 _ikke_ in the editor, change the last two 'pick' words to fixup (or squash)
09:03 srandon1213 _ikke_: sorry which editor  ?
09:04 _ikke_ srandon1213: If you execute that command, an editor should spawn
09:05 sbasso joined #git
09:05 srandon1213 ok thanks _ikke_
09:06 Noodlewitt joined #git
09:06 lmatteis joined #git
09:07 Junior joined #git
09:07 gelei007 joined #git
09:08 mikecmpbll joined #git
09:10 ispn joined #git
09:12 zxd joined #git
09:13 zxd when is annotated tag is useful? when would I want to use annotated tag vs regular tag?
09:13 osse zxd: annotated tags can be signed. they have their own tagger (author), date and message
09:14 canton7 annotated tags can contain a message, they can contain a gpg signature, tools like 'git describe' use them but not lightweight tags by default
09:14 tvw joined #git
09:15 marcogmonteiro joined #git
09:15 zxd ah so it's a real object
09:15 zxd lightweight tag isn't
09:15 osse lightweight tag is just like a branch except it doesn't move
09:19 singalaut joined #git
09:20 _ikke_ annotated tag is ref + object, lightweight tag is just a ref
09:22 Dumblez0r joined #git
09:26 DieguezZ joined #git
09:28 srandon1213 i created a new branch locally how can i push this repository online on github ?  i locally created a my_feature branch... github doesn't have it... how can i push it creating a my_feature branch on github ?
09:29 tobiasvl srandon1213: git checkout my_feature; git push
09:30 srandon1213 tobiasvl: fatal: The current branch markdown_add has no upstream branch. To push the current branch and set the remote as upstream, use
09:30 srandon1213 git push --set-upstream origin markdown_add
09:30 tobiasvl srandon1213: then do as it suggests
09:30 nevodka ^
09:30 rominronin joined #git
09:30 dec0n joined #git
09:31 srandon1213 thanks tobiasvl
09:33 rvgate joined #git
09:35 gtristan joined #git
09:36 Noodlewitt joined #git
09:37 clmsy joined #git
09:39 TomyWork srandon1213 -u is short for --set-upstream btw
09:39 srandon1213 how can i remove a commit (or multiple commits) form history ?
09:39 TomyWork srandon1213 what's your goal?
09:39 TomyWork hide sensitive data?
09:40 canton7 srandon1213, follow !fixup
09:40 gitinfo srandon1213: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
09:40 TomyWork canton7 wrong way :)
09:40 canton7 hmm?
09:40 srandon1213 TomyWork: yes wy  ?
09:41 hexagoxel joined #git
09:41 TomyWork canton7 oh never mind, i skipped over something
09:41 TomyWork srandon1213 be aware that everyone who already pulled already has your history
09:41 Muzer joined #git
09:42 srandon1213 ok yes TomyWork
09:42 TomyWork so the secure way to go forward would be to change the password :)
09:42 TomyWork and then just remove it in a regular commit
09:42 TomyWork if you cannot do that, the link from the gitinfo factoid should help you
09:44 srandon1213 another doubt... why i should do for example "git mv myfile mynewfile", can't i do simply "mv myfile mynewfile" ?
09:44 donnib joined #git
09:44 TomyWork "doubt"? do you mean "question"?
09:45 TomyWork srandon1213 to answer your question, git mv updates your index, mv does not
09:45 canton7 srandon1213, !mv
09:45 gitinfo srandon1213: [!rename] git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.LNX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
09:45 _ikke_ TomyWork: 'doubt' is used in certain languages / cultures
09:45 srandon1213 TomyWork: what does it mean to update the index ? means that staging area is updated  ?
09:46 ThiefMaster why doesn't git-clean -n use an exit code indicating whether there's something to clean or not? :/
09:46 srandon1213 TomyWork: oh yes sorry question
09:46 canton7 srandon1213, as the trigger says, 'git mv' is shorthand for 'mv', and then a 'git rm' of the old file and a 'git add' of the new file
09:46 mmlb joined #git
09:46 srandon1213 ok thanks canton7
09:47 Noodlewitt joined #git
09:47 srandon1213 a useful thing would be to select a specific file in a specific commit and bring it back to the current status of the project ... how can i do that ?
09:49 sirmob joined #git
09:49 canton7 srandon1213, git checkout thecommit -- path/to/file
09:50 osse ThiefMaster: probably a combination of reasons:  1) no one's bothered to implement it 2) not enough people think it's interesting 3) it uses exit code for other things (report failures)
09:51 venmx joined #git
09:53 seni joined #git
09:53 chachasmooth joined #git
09:53 srandon1213 do you guys think it is a good idea to pull every x seconds  ?
09:55 selckin hell no
09:55 vuoto joined #git
09:55 osse fetch every x seconds, on the other hand!
09:55 mischat joined #git
09:55 jast still a lot of overhead
09:56 osse yes, but it's mostly harmless
09:56 canton7 jast, your LE certs expired, btw
09:56 jast dangit
09:56 osse Hah! I'm LEM
09:56 jast gesundheit
09:57 kent\n mlem
09:57 Darcidride joined #git
09:58 PCatinean joined #git
09:59 pks joined #git
09:59 chll_ joined #git
10:01 SwiftMatt joined #git
10:03 bongjovi joined #git
10:03 srandon1213 jast: lots of overhead  why  ?
10:04 jast osse: FIXED
10:04 jast whoops, wrong person
10:04 jast canton7: FIXED
10:05 denisMone joined #git
10:05 ahr3n joined #git
10:06 ExpiredDev joined #git
10:07 MattMaker joined #git
10:07 canton7 sweet!
10:09 netj joined #git
10:09 _ikke_ jast: still no proper solution for auto renewal? :P
10:09 kent\n echo "list" | git remote-https origin   # just monitor that, that's the minimum overhead you're going to have for simple "branch head changed?" queries
10:10 _ikke_ whatabout git ls-remote?
10:10 kent\n git ls-remote calls git remote-https
10:10 canton7 yeah, that seems a bit more transport-agnostic :P
10:11 canton7 ... or the other remote helpers, if it isn't https :P
10:11 kent\n yeah..
10:11 kent\n but the basic strategy you want is not to say "do a full sync", you just want to know if the far side has done some basic change since last time and *then* decide if you want to do a full sync or not
10:12 _ikke_ kent\n: git ls-remote does not do a sync
10:12 kent\n no. It does not. but I'm just giving tools to give a /minimum/ overhead measurement
10:12 kent\n ls-remote is going to be more stable, but it has a modicum of local overhead
10:12 kent\n (ie: when you're stracing the syscalls you can get lost in it )
10:13 troulouliou_div2 joined #git
10:13 Forlorn joined #git
10:13 kent\n if I could do the same thing with `curl` I would have
10:13 canton7 I'd rather we recommend the obvious, documented, stable options to newbies in here
10:13 kent\n I'm not saying to do that.
10:13 kent\n I'm just saying, "if you want a speed measurement, it won't get faster than this"
10:14 canton7 "just monitor that" <-- looks like a recommendation to me :)
10:14 math-alpha joined #git
10:14 kent\n here I meant to imply "do perfomance analysis on this"
10:14 xall joined #git
10:15 bdeferme joined #git
10:18 Cymew joined #git
10:22 marcogmonteiro joined #git
10:25 Gk-1wm-su joined #git
10:28 Junior joined #git
10:28 kent\n Actually its doable with curl.
10:28 kent\n It just takes a bit of reading ;P
10:28 kent\n and the result is hard to decode
10:29 Levex joined #git
10:29 Junior left #git
10:29 Junior joined #git
10:31 mikecmpbll joined #git
10:31 kent\n why you'd care: If you can set up a standalone tool that opens ( and keeps open ) an SSL channel, and employs HTTP keep-alive, you could greatly reduce some of those overheads
10:31 jimi_ joined #git
10:33 * kent\n has said too much :0
10:33 zero85 joined #git
10:34 mischat joined #git
10:35 _ikke_ I don't think many people care about that overhead :P
10:36 Darcidride joined #git
10:37 flaviodesousa joined #git
10:38 jast kent\n: most of the overhead is in having to negotiate what objects to send, not in the transport protocol
10:38 mikecmpbll joined #git
10:38 jast and you're right, simply listing the refs is faster, but you have to do a fair bit of scripting to build on that and personally I don't think it's worth it
10:41 canton7 most people don't care about the odd millisecond
10:42 jast for me, a fetch on my main work repo takes about two seconds (if there are no changes)
10:42 jast same for ls-remote, in fact
10:43 canton7 1.2s here for a fetch, ls-remote in 0.8s
10:43 xall_ joined #git
10:44 zefferno joined #git
10:45 math-alpha left #git
10:47 afuentes joined #git
10:48 Noodlewitt joined #git
10:49 tvw joined #git
10:49 kent\n Its just if you were polling once-a-second, ... then yeah, that sort of overhead would start to matter ;)
10:50 _ikke_ Right, but imo it doesn't make sense to do that :-)
10:50 kent\n yeah. Would only be sort of useful if you were abusing git as a high-frequency relay
10:52 venmx joined #git
10:52 Celelibi joined #git
10:52 mischat joined #git
10:54 manuelschneid3r joined #git
10:55 Levex joined #git
10:58 clickjack joined #git
10:59 TomyWork joined #git
11:00 Silenced joined #git
11:00 Silenced joined #git
11:01 felixjet joined #git
11:02 TheWild joined #git
11:02 TheWild hello
11:02 TheWild how to setup a file in a repository that is suitable to be cloned, changed locally but not pushed back?
11:03 TheWild If I add it to .gitignore, will the file still be cloned?
11:05 leeN joined #git
11:05 kyan joined #git
11:05 osse yes
11:05 osse TheWild: !config
11:05 gitinfo TheWild: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
11:06 DBag joined #git
11:06 jimi_ joined #git
11:06 TheWild thanks osse, I'm reading.
11:07 MattMaker joined #git
11:09 jameser joined #git
11:10 Noodlewitt joined #git
11:10 Tobbi joined #git
11:10 Celelibi joined #git
11:12 dsdeiz joined #git
11:13 MineCoins joined #git
11:13 brent__ joined #git
11:14 hakzsam joined #git
11:14 esc joined #git
11:14 esc joined #git
11:14 Sound joined #git
11:16 buzzLightBeer joined #git
11:17 gelei007 joined #git
11:19 Silenced joined #git
11:19 Silenced joined #git
11:20 mischat_ joined #git
11:23 cdleonard joined #git
11:26 mischat joined #git
11:26 hexagoxel joined #git
11:32 Celelibi joined #git
11:35 TheWild does git rely on <<<<<<, ====== and >>>>>> or it is just for developer's convenience?
11:35 freimatz joined #git
11:35 canton7 TheWild, no, they're just for the developer to use when resolving the conflict
11:35 canton7 if you accidentally commit them, git doesn't care
11:37 TheWild ok, thanks canton7
11:37 TheWild so I can put those marks on my own and it won't confuse git :D
11:37 canton7 if you really want, sure
11:38 jay-m joined #git
11:38 _ikke_ Would be an evil language that uses <<<<<< as syntax :P
11:38 jimi_ joined #git
11:39 canton7 it's a hereherehereherehereheredoc
11:39 waxdt joined #git
11:39 _ikke_ hehe
11:39 borkr joined #git
11:39 osse i call it "mindboggingly much less than"
11:40 canton7 heh
11:40 TheWild or bits shift left far far away
11:40 waxdt Hi, I was wondering if it is possible to merge 3 git repositories to 1 new repository with each old repository being a subfolder of the new repository.
11:40 osse it's almost a byteshift
11:40 waxdt while keeping history and other branches.
11:41 rnsanchez joined #git
11:41 _ikke_ waxdt: man git subtree
11:41 gitinfo waxdt: the git manpage is available at http://jk.gs/git.html
11:41 _ikke_ he
11:41 amrits joined #git
11:41 _ikke_ !subtree
11:41 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
11:41 theoceaniscool joined #git
11:42 waxdt @_ikke_ with git subtree in a brand new repo I get this error fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
11:43 _ikke_ waxdt: I guess it expects at least one commit to exists
11:43 waxdt ah ok
11:43 waxdt no worries
11:43 Levex joined #git
11:44 waxdt So _ikke_ does git subtree also take into account all branches of the other repos?
11:45 Silenced joined #git
11:45 donnib if i have a branch with few commits that i want to rebase on master but i don't want to take each conflict and solve it because i may have things that i change and then cahnge back so i would like to take the conflicts at the end (like i do in a merge), is there a way to accomplish that with rebase ?
11:46 _ikke_ donnib: Not really, due to the way that rebase works
11:47 Forlorn joined #git
11:47 donnib _ikke_: yeah i was kind of expecting that :(, i like the rebase vs. merge to bring changes from master into my branch but doing the same thing many times is not that great
11:48 tobiasvl donnib: look at !rerere ?
11:48 tobiasvl gm
11:48 tobiasvl man git rerere
11:48 gitinfo the git-rerere manpage is available at http://jk.gs/git-rerere.html
11:49 EV3RYDAYPR0GRESS joined #git
11:49 donnib tobiasvl: i don't think the rere can solve this, if i make a change then next commit i change something on the same lines and at end i do something else i have to solve 3 merge conflicts, rere will only help if i have to do same conflicts again and again, i just want to avoid to do 3 merge conflicts istead just do one at the end
11:51 ismithers joined #git
11:51 donnib if i remove a line then i add it again it's silly that i have to solve the first conflict when in the end the line is there if you understand, this is how merge works but i understand why rebase is doing what it's doing, i was kind of hoping there was a way to do a merge with rebase and get the history tree of a rebase :P
11:53 tobiasvl aha, hmm
11:53 venmx joined #git
11:55 srandon1213 sorry i'm used to the "git checkout -b new_feature" but what does the command "git checkout -b new_feature master" do ?
11:56 bremner srandon1213: see the 4th line of man git checkout
11:56 gitinfo srandon1213: the git-checkout manpage is available at http://jk.gs/git-checkout.html
11:57 masuberu joined #git
11:57 srandon1213 sorry bremner i don't know what it means "start point"
11:58 srandon1213 i mean so my branch won't have history ?  but its first commit will be the last commit of master ?
11:58 bremner it will copy the history of master up to that point
11:59 bremner branches are just pointers; it's saying initialize this pointer to the value of this other one
12:01 _ikke_ joined #git
12:02 _Vi joined #git
12:03 bakibour joined #git
12:03 bakibour left #git
12:04 bourbaki joined #git
12:04 bourbaki Is there any way to list files from a repository not cloned?
12:04 _ikke_ git ls-files -o ?
12:05 bourbaki sec
12:05 osse the correct answer is "no".
12:05 bourbaki Ok
12:05 bourbaki Hm
12:05 osse host services may have an API you can use
12:06 bourbaki Yeah i was looking at GitBlit, which we use, but did not find anything yet.
12:06 bourbaki Since i exactly know what file i am looking for i could try to check that file out, i guess.
12:07 osse bourbaki: it probably has a predictable "raw" link.
12:07 jameser joined #git
12:07 osse go to a repo, click on a file, see if you have the option to look at the file itself, then see the URL
12:07 bourbaki osse: Oh good idea
12:08 bourbaki What is the ratonale behind not getting access to the file list of a branch via git?
12:08 bourbaki add chars where apropiate ;)
12:08 grawity "nobody implemented it"
12:08 MattMaker joined #git
12:08 grawity or, perhaps, "kinda defeats the design of Git"
12:09 cdown joined #git
12:09 bruce_lee joined #git
12:12 Levex joined #git
12:15 jameser joined #git
12:16 YuGiOhJCJ joined #git
12:16 metalraiden34 joined #git
12:21 _Vi joined #git
12:21 srandon1213 what are typical git workflows  ?
12:23 yushyin e.g. man gitworkflows
12:23 gitinfo the gitworkflows manpage is available at http://jk.gs/gitworkflows.html
12:26 Snugglebash joined #git
12:28 _Cyclone_ joined #git
12:28 matt_m joined #git
12:28 m1dnight_ joined #git
12:29 shinnya joined #git
12:29 Levex joined #git
12:31 thiago joined #git
12:32 peacememories joined #git
12:33 _28_ria joined #git
12:33 Impaloo joined #git
12:34 navidr joined #git
12:38 sharababy joined #git
12:43 kristofferR joined #git
12:44 dreiss joined #git
12:48 sharababy hi , I found a test_expect_failure at merge-recursive rename vs. rename/symlink in t/t3030-merge-recursive.sh could someone tell me more about this ?
12:54 venmx joined #git
12:55 Tobbi joined #git
12:59 zeroed joined #git
12:59 zeroed joined #git
13:00 Levex joined #git
13:00 PCatinean joined #git
13:00 elsevero joined #git
13:02 khfeng_ joined #git
13:04 _ikke_ git::bba56042
13:04 gitinfo Git web link: https://github.com/git/git/commits/bba56042
13:05 _ikke_ https://github.com/git/git/commit/bba56042e7011a5555cb8b44a84e0d853fa43af5
13:05 _rgn joined #git
13:05 RxMcDonald left #git
13:06 seni1 joined #git
13:07 tmg joined #git
13:07 sunri5e joined #git
13:09 jameser joined #git
13:09 Levex joined #git
13:09 Impaloo joined #git
13:10 Snugglebash joined #git
13:10 GreySunshine joined #git
13:11 dviola joined #git
13:12 Celelibi joined #git
13:12 kpease_ joined #git
13:12 grayjoc joined #git
13:13 d0nn1e joined #git
13:13 sz0 joined #git
13:13 zxd joined #git
13:13 zxd hi
13:14 sunri5e joined #git
13:14 moritz ho
13:15 zxd in https://git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery    isn't the  output from the command "$ git log -g"   supposed to also show  '484a59275031909e19aadb7c92262719cfcdf19a added repo.rb'
13:15 Celelibi_ joined #git
13:15 osse yes
13:15 osse my guess is they left it out intentionally
13:17 Levex joined #git
13:17 GodGinrai joined #git
13:18 catsup joined #git
13:21 seni1 joined #git
13:22 thiago joined #git
13:22 synthroid joined #git
13:23 catsup joined #git
13:24 synthroi_ joined #git
13:25 thiago_ joined #git
13:25 dunk left #git
13:26 jameser joined #git
13:29 brent__ joined #git
13:30 Derperperd joined #git
13:31 _Cyclone_ joined #git
13:34 Levex joined #git
13:34 srandon1213 what does in git mean the "--" parameter ? for example when i do git checkout or even in other examples... does it always have the same meaning  ?
13:34 osse !--
13:34 gitinfo [!dashes] Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"
13:35 kexmex joined #git
13:37 Celelibi joined #git
13:38 hhee joined #git
13:41 armin joined #git
13:42 ankit01ojha joined #git
13:43 nevodka joined #git
13:44 ad joined #git
13:45 Raging_Hog joined #git
13:46 thebinary joined #git
13:47 finalbeta joined #git
13:47 xall_ joined #git
13:47 moongazer joined #git
13:47 moongazer How do I see the list of branches via the list command?
13:48 Impaloo joined #git
13:48 moritz moongazer: what is "the list command"?
13:49 moritz moongazer: just type "git branch"
13:49 moongazer moritz, git branch only lists one branch'
13:49 moritz moongazer: then you only have one local branch
13:49 moritz moongazer: you can add -a or -r options
13:51 howitdo joined #git
13:51 howitdo joined #git
13:53 nickabbey joined #git
13:54 venmx joined #git
13:57 _rgn joined #git
13:57 jameser joined #git
13:57 frib joined #git
13:57 frib how can I apply a specific pull request to my working directory?
13:58 osse frib: https://help.github.com/articles/checking-out-pull-requests-locally/
13:58 frib thanks osse
14:01 mmlb joined #git
14:02 bongjovi joined #git
14:02 Derperperd joined #git
14:02 porsche944 joined #git
14:04 Shatnerz0 joined #git
14:06 BackEndCoder joined #git
14:07 yqt joined #git
14:07 Schrostfutz joined #git
14:07 finalbeta joined #git
14:07 kexmex joined #git
14:08 Schrostfutz Hi, I'd like to change the last but one commit, how would I do that? Usually I use amend but that only works for the last commit, doesn't it?
14:08 bremner rebase -i
14:08 jast yes. the answer is !interactive_rebase
14:08 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
14:09 jay-m joined #git
14:09 MattMaker joined #git
14:10 jast .trigger_edit rebase-i @!interactive_rebase
14:10 gitinfo jast: Okay.
14:10 Schrostfutz bremner, jast: Thanks, I'll try that
14:10 nowhereman joined #git
14:13 ShekharReddy joined #git
14:15 CEnnis91 joined #git
14:16 Silenced joined #git
14:16 Silenced joined #git
14:16 publio joined #git
14:18 masuberu joined #git
14:19 cmosguy hello, I have a script that I am checking into my repository, and I did a git update-index --chmod=+x <file>
14:19 cmosguy when I cone the same repo, the permissions for 755 did not stick
14:19 cmosguy what am I doing wrong?
14:22 heftig left #git
14:23 s17 did you commit
14:25 jameser joined #git
14:25 overlord_tm joined #git
14:25 cdg joined #git
14:31 kbs joined #git
14:32 thiago joined #git
14:33 jameser joined #git
14:33 cmosguy s17: yes i did
14:33 Dougie187 joined #git
14:33 _ng joined #git
14:34 cmosguy s17: when i did a git pull on same checked out branch it did not restore the same executable file permissions
14:36 masuberu joined #git
14:37 jeffreylevesque joined #git
14:37 buzzLightBeer joined #git
14:38 jast what do you mean, 'restore'? if it's in the same repo and same branch, a 'git pull' will see that there are no commits you don't already have, and do nothing
14:38 guampa joined #git
14:39 cmosguy jast... ok
14:39 cmosguy so what do I do to force these permissions when i do a 'git pull'?
14:39 clickjack joined #git
14:39 jast if you have committed and pushed, in a new repo, it should automatically apply them
14:40 jast in your current repo, git is seeing the permissions that are different from what's in the history, and treating it as an uncommitted change (basically it thinks you did a -x on the file). to discard (ALL) uncommitted changes, you can use 'git reset --hard'
14:46 Sound joined #git
14:47 zxd 'git reset --hard'  will checkout to the commit in HEAD?
14:48 jast basically, yes. it will throw away all uncommitted changes you've made (except untracked files, of course)
14:49 Es0teric joined #git
14:50 _ng joined #git
14:51 gtristan joined #git
14:51 cdown joined #git
14:51 Levex joined #git
14:55 venmx joined #git
14:58 mischat_ joined #git
14:59 zeroed joined #git
14:59 zeroed joined #git
15:01 faux___ joined #git
15:01 Silenced joined #git
15:01 faux___ joined #git
15:03 kexmex joined #git
15:04 darkbit joined #git
15:05 kulelu88 joined #git
15:05 crose joined #git
15:05 ExoUNX joined #git
15:06 srandon1213 what's the meaning of signing a commit  ?  for example with commit -s  ?
15:06 srandon1213 what is the purpose ?  and how can i use it in my projects ?
15:07 yitzchak joined #git
15:07 ExoUNX joined #git
15:07 kulelu88 left #git
15:07 ronny srandon1213: it puts a cryptographic signature into the commit objec allowing others to verify its really from you
15:07 _ikke_ ronny: noep
15:08 _ikke_ nope
15:08 _ikke_ it adds a 'signed-off-by' tag to the commiit
15:08 _ikke_ commit
15:08 srandon1213 ronny: ok so it should be a good practice to always include it  ?
15:08 _ikke_ Some projects require it for legal reasonns
15:08 _ikke_ srandon1213: (git commit -s != git commit -S)
15:08 ronny oh, did i confuse those
15:08 srandon1213 ok so what is the other  ?
15:09 sdxxqa joined #git
15:09 srandon1213 _ikke_: so whatr's the purpose of putting a signed by  ?
15:09 Puffball joined #git
15:09 srandon1213 i mean what could be a benefit in my small teams projects ?
15:09 srandon1213 can't i see normally which user made a commit  ?
15:10 _ikke_ srandon1213: For most projects it's of very little use
15:10 ronny srandon1213: i beleive the feature is for when a project has grown way beyond a single small team
15:11 _ikke_ srandon1213: It's mainly use by linux and git itself
15:11 srandon1213 ok thanks _ikke_
15:11 srandon1213 _ikke_: so it's not a good practice to sign-off commits normally right  ?
15:11 _ikke_ srandon1213: correct, it has no purpose
15:11 _ikke_ srandon1213: https://stackoverflow.com/questions/1962094/what-is-the-sign-off-feature-in-git-for
15:14 Glowball joined #git
15:15 chipotle joined #git
15:21 faux___ joined #git
15:21 chipotle joined #git
15:21 al-damiri joined #git
15:21 whaley joined #git
15:21 jerit joined #git
15:22 dave0x6d joined #git
15:24 sirmob joined #git
15:24 dvaske__ joined #git
15:25 nd_ joined #git
15:26 chipotle joined #git
15:29 thiago joined #git
15:34 PioneerAxon_ joined #git
15:35 chachasmooth joined #git
15:36 imack joined #git
15:37 finalbeta joined #git
15:38 annoymouse joined #git
15:40 elsevero Can I clone only a folder from the repo ?
15:40 webdev007 joined #git
15:40 BackEndCoder joined #git
15:40 dviola joined #git
15:40 _ikke_ no
15:42 rubyonrailed joined #git
15:43 PioneerAxon joined #git
15:43 PioneerA- joined #git
15:45 mischat joined #git
15:46 mischat joined #git
15:47 mischat joined #git
15:48 PCatinean joined #git
15:48 buzzLightBeer joined #git
15:55 srandon1213 if i have 4 commits, how can i squash all four commits in a single commit  ?
15:55 osse srandon1213: do you mean the 4 latest commits, or are those all the commits you have?
15:56 venmx joined #git
16:00 crayon joined #git
16:00 Gustavo6046 joined #git
16:00 Electrometro joined #git
16:00 King_Hual joined #git
16:01 Levex joined #git
16:01 mischat_ joined #git
16:01 faux___ joined #git
16:02 rapidshot64 joined #git
16:03 _rgn joined #git
16:03 _rgn joined #git
16:04 synthroid joined #git
16:04 jungsubk joined #git
16:05 mda1 joined #git
16:06 rominronin joined #git
16:07 clickjack joined #git
16:10 xtsaqc joined #git
16:11 xall_ joined #git
16:11 MattMaker joined #git
16:13 Jellyg00se joined #git
16:13 srandon1213 osse: the last 4 commits
16:14 osse srandon1213: git reset HEAD~4; git commit -m 'Squash dat shit, yo'
16:15 TomyWork --soft
16:15 TomyWork osse srandon1213 ^
16:15 troulouliou_dev joined #git
16:15 TomyWork add that argument. it's important if you added files in those last 4 commits
16:16 osse oh right
16:16 aard_ joined #git
16:16 TomyWork anyway, off home
16:16 srandon1213 sorry osse shouldn't i squash  ?
16:16 srandon1213 instead of reset  ?
16:16 clemf joined #git
16:16 osse srandon1213: there is no 'git squash' command
16:16 osse this accomplishes the same thing
16:16 srandon1213 osse:  i mean with rebase
16:16 srandon1213 rebase -i HEAD4
16:16 osse you can do that too. this easier
16:17 osse yes, you can do git reset -i HEAD~4; then mark the three last commits 'squash' (or just 's') instead of pick
16:18 GreySunshine left #git
16:18 faux___ joined #git
16:20 cdg_ joined #git
16:21 tlaxkit joined #git
16:23 oncall-pokemon joined #git
16:23 Derperperd joined #git
16:24 JuPeter joined #git
16:27 Murii_ joined #git
16:28 guampa joined #git
16:28 nkhl joined #git
16:28 brent__ joined #git
16:28 qqx Using squash may be easier if there's info in the commit messages that should be preserved.
16:29 brent__ joined #git
16:29 sbulage joined #git
16:29 JuPeter hi all. i am lost in documentation and cannot find the proper information on google. i want to write a pre-commit hook and need the filename i passed to "git commit". is there a variable or any way to get this filename?
16:30 grawity take a diff between the index and HEAD, I guess
16:30 srandon1213 qqx: osse i have a problem... with sourcetree... when i squash... it still tells me that i have to pull 4 commits  ?? why ?
16:30 srandon1213 i even pushed...
16:30 grawity or, I dunno how it behaves with the index-bypassing `git commit <file>` actually
16:30 srandon1213 and form command line it is everything ok... how can i cancel those pulls ?
16:31 osse JuPeter: use git diff --staged --name-only  in the hook
16:31 osse grawity: i tested it. it twerks!
16:31 finalbeta joined #git
16:32 osse srandon1213: you have rewritten history. as far as git is concerned there are 4 commits out there you don't have.
16:32 osse srandon1213: the solution is likely to force push.
16:33 JuPeter osse: i have that. but if i commit one file explicit, like "git commit myFile" , is it possible to get "myFile" instead of all files changed (what i have with git diff --staged)?
16:33 Es0teric joined #git
16:33 TomyLobo joined #git
16:33 jason237 joined #git
16:34 osse JuPeter: yes. it will work either way
16:35 srandon1213 <osse> but form command line everything is ok...
16:35 srandon1213 i don't understand... i mean if i do git log
16:35 srandon1213 i odn't see anymore the commits i wanted to remove
16:35 osse that's expected
16:36 osse do   git log --graph --decorate --oneline HEAD HEAD@{u}
16:36 JuPeter osse: oh man, you are right, i should have tested git diff --staged within the hook context, not just on the commandline. i feel sad now, but happy ;o)
16:39 clemf joined #git
16:40 zivester joined #git
16:40 Levex joined #git
16:41 m0ltar joined #git
16:41 JuPeter osse: thx, and bye all.
16:41 rivarun joined #git
16:41 Puffball joined #git
16:42 username1 joined #git
16:43 nkhl joined #git
16:43 prg3 joined #git
16:44 durham joined #git
16:44 nkhl joined #git
16:45 nettoweb joined #git
16:46 nkhl joined #git
16:49 causasui joined #git
16:49 synthroid joined #git
16:49 tsunamie joined #git
16:51 petersaints joined #git
16:52 Exagone313 joined #git
16:53 unic0rn joined #git
16:54 thebope joined #git
16:54 thebird joined #git
16:55 unic0rn hi. i've got a problem, which is a result of a silly move over silly idea. i've got a rather big folder (cygwin home) added to a git repo, with equally huge list of things in .gitignore. i didn't touch that repo in a long time, but amongst other things, it caches some config files like bashrc
16:56 unic0rn now, i've modified that bashrc earlier today. later on, i've created a stash with 'git stash' by mistake. since i honestly never used stashes before and couldn't predict that something may go wrong, i did git stash drop right after that. everything was fine until now, when i've realized that changes to bashrc which were made before creating that stash...are gone
16:56 unic0rn the question is, what the hell happened?
16:57 venmx joined #git
16:58 ^7heo you did the equivalent of `rm stash`.
16:58 robotroll joined #git
16:58 ^7heo with the stash drop.
16:58 ^7heo don't use what you don't understand, unless you're okay to cause problems.
16:58 ^7heo (i.e. unless you do it in a disposable, isolated environment)
17:01 MaximusColourum joined #git
17:01 MineCoins joined #git
17:01 sbasso joined #git
17:02 ayogi joined #git
17:02 spb unic0rn: when you did git stash, you told it to revert your working directory to the last commit, saving the changes in a temporary stash to be applied back again later on
17:02 spb unic0rn: when you did stash drop, you told it you didn't need those changes and it should throw them away
17:03 unic0rn crap... forgot that stash reverts to last commit.
17:03 unic0rn yeah, it screwed up everything that it was tracking
17:03 unic0rn it's not lost though, i've got a hash
17:04 thebird joined #git
17:04 vF3hNGxc47h8 joined #git
17:05 unic0rn so... how do i safely fix it? git checkout hash, then add and commit?
17:06 tang^ joined #git
17:06 cdg joined #git
17:06 thebope joined #git
17:06 thiago joined #git
17:06 jagob joined #git
17:07 rominronin joined #git
17:08 madewokherd joined #git
17:08 nd joined #git
17:09 jagobdue joined #git
17:09 ejb joined #git
17:09 Bizkit joined #git
17:12 justan0theruser joined #git
17:12 MattMaker joined #git
17:12 multi_io joined #git
17:13 ayogi joined #git
17:15 unic0rn fixed i think. thanks for pointing out my insanity -.-
17:15 unic0rn at least with git, nothing gets lost, just... misplaced
17:16 ^7heo not true.
17:16 ^7heo it's harder to lose things
17:16 ^7heo but you can definitely lose stuff.
17:17 unic0rn well, true. but as far as i've noticed, when user is doing something dangerous, it tends to be more verbose
17:18 ^7heo "you're about to kill yourself, lemme read you the old testament"
17:18 ^7heo "oh crap, he shot himself already."
17:18 unic0rn more or less
17:18 Glowball joined #git
17:19 basiclaser joined #git
17:19 nettoweb1 joined #git
17:20 17SAAHWDE joined #git
17:20 unic0rn well, at lest it gave me the hash. i should've noticed earlier. and not much got screwed in the process, some unused irssi stuff, ssh config, bashrc, and that's about it. i was more careful with adding everything to gitignore than i though. still, it was stupid move on my part, no doubt about it
17:20 thebird joined #git
17:20 radoslavcap joined #git
17:20 svm_invictvs joined #git
17:21 unic0rn anyway, thanks for the help and have a nice day
17:21 unic0rn left #git
17:22 davimore joined #git
17:23 metalraiden34 joined #git
17:25 thebope joined #git
17:26 eroux joined #git
17:28 boombatower joined #git
17:30 porton joined #git
17:30 porton How to revert the last commit for just one file (not for all changed files)?
17:30 peeps[lappy] joined #git
17:31 clemf joined #git
17:31 raspado joined #git
17:32 porton I can copy the Git repo, revert in the copy and then copy the file in question to the "main" repo. Is there a simpler way?
17:32 Bizkit joined #git
17:33 grawity git checkout HEAD^ myfile.c
17:33 Schrostfutz joined #git
17:35 tyreld joined #git
17:35 bomb-on joined #git
17:36 davimore joined #git
17:36 dreiss joined #git
17:37 fwvoice joined #git
17:40 moongazer joined #git
17:43 orbyt_ joined #git
17:44 XenophonF joined #git
17:44 jnavila joined #git
17:45 cdg_ joined #git
17:46 mischat joined #git
17:48 bongjovi joined #git
17:51 xissburg joined #git
17:51 MineCoins joined #git
17:52 xbob joined #git
17:52 kpease joined #git
17:54 cdg joined #git
17:54 sunri5e joined #git
17:54 clemf joined #git
17:56 raijin joined #git
17:56 Schrostfutz joined #git
17:56 rafalcpp joined #git
17:57 venmx joined #git
18:00 j7k6_ joined #git
18:00 marc_v92 joined #git
18:01 thebope joined #git
18:01 Doow joined #git
18:02 jstimm joined #git
18:04 thebope joined #git
18:05 diogenese joined #git
18:05 _rgn joined #git
18:05 _rgn joined #git
18:06 fwvoice left #git
18:08 VicMackey joined #git
18:08 thebope joined #git
18:10 __rgn joined #git
18:11 VicMackey Hello everybody. I have a kind of dumb question to ask. I am working in a personal repo with two branches: master and develop. I have been reading that essentially branches should be used for everything, and that it's a good idea to create a branch even for the smaller things. Now, I have a thing that probably would get done in a single commit... Would you create a branch for that too
18:12 VicMackey ?
18:12 corentin VicMackey: I'd say it really depends on the context, but usually you don't create a branch for each and every commit
18:13 corentin if you implement kind of a new feature though, it would make sense to make it in a new branch, even if there is only one commit
18:13 corentin my two cents
18:13 MattMaker joined #git
18:14 VicMackey corentin thanks for answering. It really would be a small thingy, like replacing a hardcoded value with a global variable, so to say.
18:14 nevodka if its noteworthy enough
18:14 nevodka then no
18:14 VicMackey I guess its not...
18:14 corentin VicMackey: doesnt sound like a feature
18:14 nevodka branches are intended for new features
18:14 osse it's easy to create a branch after the fact anyway
18:14 nevodka well not *all* branches
18:14 thebope joined #git
18:15 bvcosta joined #git
18:15 VicMackey nevodka yeah I have read that you should branch to work on everything: fixes, features, maybe releases, etc. but it sounded like a little bit "too much" to create a branch for a small change
18:15 nevodka yes
18:16 marc_v92 joined #git
18:16 bongjovi joined #git
18:16 VicMackey corentin, nevodka, osse: thank you very much indeed for your time and help :)
18:16 osse it's not like there's a price to pay for a branch
18:17 VicMackey I think a have it more clear now
18:17 VicMackey osse that's what I thought...
18:17 osse when in doubt, make a branch. if all you do is merge it into master ten minutes later, then so what
18:17 nowhereman joined #git
18:17 osse if you commit directly on master that's often ok too. it is not the same as origin/master after all
18:18 nevodka its just a matter of good book keeping
18:18 nevodka and in other cases isolation as well
18:19 ProblemChild left #git
18:19 chardan joined #git
18:20 VicMackey Well, as I am still learning how to use git I think I am going to follow your advice and use branches wisely
18:20 oskarkv joined #git
18:21 VicMackey Again, thank you for your help :)
18:24 t0by joined #git
18:25 erebel55 joined #git
18:26 rubyonrailed joined #git
18:27 raijin joined #git
18:27 muhannad_______ joined #git
18:29 irqq joined #git
18:30 Hez joined #git
18:31 ratdeptrai joined #git
18:35 kbs joined #git
18:35 eroux joined #git
18:37 Schrostfutz joined #git
18:38 rominronin joined #git
18:41 Es0teric joined #git
18:41 aielima joined #git
18:41 gopar joined #git
18:42 aielima joined #git
18:43 ertes joined #git
18:43 cutthroat83 joined #git
18:44 uhmgawa^3 joined #git
18:45 duderonomy joined #git
18:45 cutthroat83 joined #git
18:46 qpdb joined #git
18:46 Glowball joined #git
18:48 Guest64317 joined #git
18:48 raynold joined #git
18:49 sbasso joined #git
18:50 ayogi joined #git
18:52 Rodya_ joined #git
18:54 cutthroat83 Hey
18:54 gitinfo cutthroat83: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
18:55 Sample joined #git
18:55 kristoff_ joined #git
18:55 cutthroat83 Anybody had issue using lol on Arch. I'm getting at blank screen on the lauch page.
18:56 Schrostfutz joined #git
18:56 bremner cutthroat83: 'lol' is a git related thing?
18:57 cutthroat83 league of legends
18:57 cutthroat83 I used git to install
18:57 osse I think you're in the wrong channel
18:57 cutthroat83 Sorry
18:57 osse This channel is for Dota
18:58 cutthroat83 Whats Dota
18:58 Anja joined #git
18:58 cutthroat83 Nevermind let me look it up
18:58 venmx joined #git
18:59 osse now i definitely don't follow
18:59 osse you play lol, but haven't heard of dota? :O
18:59 Atm0spher1c joined #git
18:59 osse Also how did you use git to install it?
18:59 kubuntu_ joined #git
19:00 cutthroat83 I just start playing games again. Haven't had time in years.
19:00 Vampire0 I prefer dott
19:00 osse but dota is 14 years old :O
19:01 Vampire0 dott is 24 years old :-D
19:01 cutthroat83 The last game online I played was 2 moons back in 2007
19:01 cutthroat83 wow I'm not a big gamer
19:02 rubyonrailed joined #git
19:02 jerit Having made changes and additions to my working directory, I'd now like to commit the changes and push them to the remote repo, but git it having none of it... https://gist.github.com/ortund/a785677c3e17cb30f110801be0a1f75a
19:02 jerit can anyone assist?
19:03 cutthroat83 I found the git package on the arch wiki.
19:04 bomb-on joined #git
19:04 marc_v92 joined #git
19:06 osse jerit: either you're wrong or all the changes you've made are to files that are not tracked by git
19:06 metalraiden34 joined #git
19:06 jerit osse (cool name btw, from Silmarilion?) or ~\SkyDrive\Documents\GitHub is not the right dir for it to be working in -_-
19:07 jerit I used cd to navigate to my working directory and now it seems to work
19:07 clemf joined #git
19:07 blr joined #git
19:14 Sasazuka joined #git
19:15 jnavila joined #git
19:17 osse jerit: not silmarillion. it's an asciified version of my real life nickname
19:17 cutthroat83 left #git
19:17 osse in fact i didn't know about it until the previous guy asked a year or two ago :p
19:18 jerit well in that case its about time someone asked again anyway :P
19:19 VicMackey left #git
19:19 osse incidentally I am trying to write a windows mini-clone of a linux program written in a language called vala
19:19 MattMaker joined #git
19:19 Tobbi joined #git
19:23 ash_workz joined #git
19:24 Impaloo joined #git
19:25 clemf joined #git
19:25 aielima joined #git
19:27 eroux joined #git
19:35 lucido-cl joined #git
19:35 irqq joined #git
19:36 metalraiden34 joined #git
19:36 cdg joined #git
19:38 Emperor_Earth joined #git
19:42 overlord_tm joined #git
19:42 elsevero joined #git
19:43 kubuntu joined #git
19:43 mknod joined #git
19:45 Rodya_ joined #git
19:46 HurricaneHarry joined #git
19:47 TbobbyZ joined #git
19:47 whaley joined #git
19:47 Derperperd joined #git
19:48 armin joined #git
19:48 chipotle joined #git
19:52 raijin joined #git
19:53 hashpuppy joined #git
19:54 apotry joined #git
19:54 omnigoat joined #git
19:54 wilbert_ joined #git
19:54 sathed joined #git
19:54 hashpuppy if i have develop -> upstream/develop.  and do git fetch upstream develop, then will develop automatically gets update, right?
19:56 Rodya_ joined #git
19:57 raijin joined #git
19:58 thiago hashpuppy: no
19:58 Sasazuka_ joined #git
19:58 ejb joined #git
19:58 grawity in recent git releases, yes
19:59 grawity oooor,no
19:59 hashpuppy I do see this:  branch            develop    -> FETCH_HEAD
19:59 grawity in recent git releases, it'll update upstream/develop (but *not* merge anything into local develop – you still need a merge/pull for that)
19:59 venmx joined #git
19:59 kulelu88 joined #git
19:59 grawity in older releases, the 4-word fetch will merely update FETCH_HEAD
20:01 uhmgawa^2 joined #git
20:01 mekeor joined #git
20:02 the-blackbeard joined #git
20:02 j7k6_ joined #git
20:03 prg3 joined #git
20:04 uhmgawa joined #git
20:05 kulelu88 how do I add SSH keys to ssh-agent/
20:05 bremner ssh-add
20:05 kulelu88 ssh-add /path/to/private-key ?
20:06 muhannad________ joined #git
20:07 bremner there's a man page, but that should work.
20:07 kulelu88 how do I then SSH into different services?
20:07 raijin joined #git
20:09 j416 kulelu88: how is that related to Git?
20:09 kulelu88 https://gist.github.com/jexchan/2351996/
20:09 Vampire0 kulelu88, ssh different-system? but what has that to do with Git?
20:10 rominronin joined #git
20:10 timetrex joined #git
20:10 j416 kulelu88: is there a question?
20:11 hashpuppy working on some instructions for our junior dev.  can this be improved:  https://gist.github.com/anonymous/4607b0f74493c5b8be0c7369d21e5b7e
20:11 kulelu88 well I guess it will be off-topic so I won't ask
20:13 MikeD_ joined #git
20:13 hashpuppy (currently on feature) git checkout develop && git pull && git checkout feature && git rebase develop
20:13 hashpuppy seems long
20:13 MikeD_ how many times per day do you switch branches ?
20:14 hashpuppy not often
20:14 hashpuppy probably 3 features a day
20:14 MikeD_ hmm... you probably have well-defined features you're coding to, huh?
20:14 Vampire0 kulelu88, if it is related to Git it is not off-topic, if it is not related to Git maybe try #ssh
20:15 warthog9 joined #git
20:16 Vampire0 hashpuppy, a feature that you develop 3 months at can also be well defined. :-D
20:16 pur3eval joined #git
20:17 hashpuppy ?
20:17 j416 !
20:17 hashpuppy ohh
20:17 hashpuppy you're saying add instructions for that?
20:18 hashpuppy also, is branching of develop that tracks upstream/develop is better than creating feature branches off upstream/develop
20:18 ahr3n joined #git
20:22 guampa joined #git
20:23 matumbo joined #git
20:23 Derperperd joined #git
20:25 thiago joined #git
20:26 Levex joined #git
20:27 sirmob joined #git
20:27 satifant joined #git
20:27 HurricaneHarry joined #git
20:28 Xenophon1 joined #git
20:29 uhmgawa^2 joined #git
20:29 HurricaneHarry joined #git
20:31 HurricaneHarry joined #git
20:32 MikeD_ left #git
20:33 fragMental joined #git
20:34 tmg joined #git
20:35 raijin joined #git
20:35 blr joined #git
20:38 levex_ joined #git
20:38 Rodya_ joined #git
20:39 Cassiopaya joined #git
20:40 nydel07 joined #git
20:40 durham_ joined #git
20:42 Sample joined #git
20:44 sirmob joined #git
20:44 fragMental joined #git
20:44 cjohnson I'm doing git diff master feature -- file and I see a subtraction
20:45 cjohnson how can I blame to determine which commit removed that line?
20:45 cjohnson it was a mistake to remove it
20:45 mekeor left #git
20:48 ask4olivia joined #git
20:49 gopar joined #git
20:49 askb joined #git
20:50 durham joined #git
20:52 raijin joined #git
20:52 _ikke_ cjohnson: git blame --reverse master..feature
20:52 Hez joined #git
20:52 kubuntu joined #git
20:52 _ikke_ something like that
20:54 jeffreylevesque_ joined #git
20:54 cjohnson git blame --reverse master..feature/intake-1.5 -- app/Model/Intake.php    shows me the same commit id for every single line in that file, did I do it wrong?
20:56 blackwind_123 joined #git
20:59 TbobbyZ joined #git
20:59 exussum cjohnson: reverse means show earliest commit first. Of course every single line points to the same commit
21:00 kulelu88 how do I do agent-forwarding for my github account so that I don't need to add SSH keys on my server? More specifically, what should my config file look like for my github account?
21:00 venmx joined #git
21:00 cjohnson exussum: so then I don't understand how that would help me to determine which commit removed a given line?
21:00 hvxgr joined #git
21:01 exussum cjohnson: git log -p and then /somethingInYourLine is how I would find that
21:01 cjohnson pattern not found
21:01 exussum log -p shows the patches to a file. /string searches for it
21:01 cjohnson when I do that
21:01 cjohnson I'm just searching for one word no special characters, Redirect
21:01 cjohnson but that block of code is clearly listed as a removal when I run the diff
21:02 cjohnson and it's not present in the file in my feature branch
21:03 exussum git log -i -S Redirect
21:03 exussum What does that show
21:03 leeN joined #git
21:05 grayjoc joined #git
21:05 cjohnson Well when I add the filename to the end of that command, nothing
21:05 raspado joined #git
21:05 exussum Then it wasnt in that file
21:06 exussum if you do it without the filename ?
21:06 exussum you can add --all to search all branches
21:06 cjohnson Well it is though, the only reason I even saw the removal was because my diff included that filename
21:06 cjohnson git diff master HEAD -- app/Model/Intake.php
21:07 cjohnson I get a bunch of commits that include the word redirect (mostly lowercase) when I do without the filename
21:07 cjohnson unrelated hunks using that word
21:07 cjohnson When I add --all I get the commit which introduced that line in the first place
21:07 hvxgr joined #git
21:08 raijin joined #git
21:08 cjohnson git log --all -i -S Redirect app/Model/Intake.php
21:08 cjohnson and when I do a blame from within master, it lists that same commit as the commit which introduced that line
21:09 col joined #git
21:09 exussum what does git branch --contains <commit ref which introduced it> show ?
21:10 cjohnson master, qa, and another feature branch
21:10 cjohnson possibly the branch it was introduced on originally
21:10 exussum odd, are you on master when you run that command ?
21:11 cjohnson nope, I'm in feature/intake-1.5
21:11 exussum ah, so feature/intake-1.5 is not listed when you do git branch --contains ?
21:11 cjohnson no
21:11 exussum if so that commit has never been merged to that branch
21:12 raijin joined #git
21:12 cjohnson Oh. Duh. so once I merge this branch to master it's not going to remove that hunk of code from master's copy
21:12 cjohnson I'm so used to reviewing in github which is smarter about hiding irrelevant changes
21:13 cjohnson Is there a better command to use for diff where I can just see the changes my branch introduces and ignore branches master introduced?
21:13 Rodya_ joined #git
21:13 cjohnson I just basically want to know what I'm going to be merging, not the complete set of differences
21:14 exussum git diff master...   assuming your on that branch
21:14 exussum 3 dots are important
21:14 peterbecich joined #git
21:14 cjohnson HA yep that's it
21:14 cjohnson so 3 dots = only show my side of the changes?
21:14 cjohnson or what specifically does that mean
21:16 brokensyntax joined #git
21:16 exussum it short hand for git diff $(git merge-base A B) B
21:17 exussum so a differnce of the merge base (where the two branches split) and whats currently there
21:17 exussum missing of the end makes b = current branch
21:18 dreiss joined #git
21:19 cjohnson aha beautiful
21:19 cjohnson thanks for clearing this up for me exussum
21:20 livingstn joined #git
21:21 aidalgol joined #git
21:24 svm_invictvs joined #git
21:25 brent__ joined #git
21:25 dsdeiz joined #git
21:25 dsdeiz joined #git
21:29 bket joined #git
21:31 exussum np
21:33 blr joined #git
21:33 ertes joined #git
21:35 [Brain] joined #git
21:35 marc_v92 joined #git
21:36 elsevero joined #git
21:37 masuberu joined #git
21:38 ejb joined #git
21:39 pur3eval joined #git
21:40 Tsutsukakushi joined #git
21:40 Junior joined #git
21:40 JelmerD joined #git
21:41 clemf_ joined #git
21:41 albel727 joined #git
21:41 rominronin joined #git
21:45 sgen joined #git
21:46 nixjdm joined #git
21:46 _flow__ joined #git
21:46 albel727 joined #git
21:46 Tsutsukakushi joined #git
21:46 Junior joined #git
21:46 JelmerD joined #git
21:47 clemf joined #git
21:48 anuxivm joined #git
21:50 durham joined #git
21:52 navidr joined #git
21:54 marianina8 joined #git
21:57 MuffinMedic joined #git
21:58 mostlybadfly joined #git
22:01 venmx joined #git
22:03 kubuntu joined #git
22:03 j7k6_ joined #git
22:03 Glowball joined #git
22:04 raijin joined #git
22:04 durham joined #git
22:05 foreal joined #git
22:06 Jellyg00se joined #git
22:06 blackwind_123 joined #git
22:06 pmatulis joined #git
22:07 jeffreylevesque joined #git
22:07 pmatulis is there any risk in running 'git gc' ? is it considered very mature and pedestrian?
22:09 kristofferR joined #git
22:09 pmatulis (specifically 'git gc --prune')
22:09 osse pmatulis: no
22:09 osse pmatulis: also no. git will do it automatically from time to time
22:10 clemf_ joined #git
22:11 m0viefreak joined #git
22:11 cdown joined #git
22:12 ISmithers joined #git
22:13 cdown_ joined #git
22:14 ChadTaljaardt joined #git
22:14 Levex joined #git
22:16 kristofferR joined #git
22:18 JelmerD joined #git
22:18 Junior joined #git
22:19 albel727 joined #git
22:19 Starky joined #git
22:20 _flow__ joined #git
22:20 Tsutsukakushi joined #git
22:20 davimore_ joined #git
22:21 pmatulis osse, perfect thanks
22:22 pmatulis i read that i shouldn't use 'git prune' directly and to use 'git gc' instead
22:23 a3Dman joined #git
22:24 hasc joined #git
22:25 osse pmatulis: when I say no to any risk, it's not literally true. you of course risk to lose loose objects older than 14 days
22:26 osse that's what it does. but it's so unlikely you would ever need to recover a loose object that older than 14 days
22:26 osse it has never happened to me the 7 years i've used git
22:28 pmatulis right ok
22:28 durham joined #git
22:29 Guest55 joined #git
22:31 b3kN joined #git
22:34 lmatteis joined #git
22:35 gugah joined #git
22:38 durham joined #git
22:39 inflames joined #git
22:42 planigan` left #git
22:42 Levex joined #git
22:42 bakers joined #git
22:42 bakers I always forgot... what is the command for "throw everything I have away and reset my staging area to [branch]"
22:43 bakers Something like git reset --hard [branch]
22:44 Schrostfutz joined #git
22:44 Noldorin joined #git
22:45 bremner do you want to reset the just the staging area or also the work tree?
22:45 bakers Uhhhhh... can you explain the difference?
22:45 mikeputnam i use      git checkout .
22:45 pmatulis left #git
22:46 bremner !index
22:46 gitinfo The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
22:46 bremner bakers^
22:46 bakers mikeputnam, but if I have new/deleted files that doesn't work
22:46 bakers I get staging area... what's the work tree?
22:46 mikeputnam ah yes.  then i usually     git stash --include-untracked       and       git stash drop
22:46 bremner the work tree is just the files
22:47 bakers bremner, Oh... then I wanna do both
22:47 bremner the stuff that's left if you rm -r .git
22:47 disi im doing a code review and the diff looks like its adding the same things its removing... is this possible in git? how do i tell if anything actually changed?
22:47 bakers I wanna go nuclear... I don't care about anything I have add/changed/modifier
22:47 disi it's*
22:47 bakers I just want "upstream/foobar"
22:47 bremner bakers: then, with the caveat there is no undo, reset --hard is what you want
22:49 dsdeiz joined #git
22:49 dsdeiz joined #git
22:50 planigan joined #git
22:50 Noodlewitt joined #git
22:50 t0by joined #git
22:50 t0by joined #git
22:57 cdown_ joined #git
22:57 planigan` joined #git
23:02 venmx joined #git
23:02 Sasazuka joined #git
23:03 Dougie187 left #git
23:06 matoro joined #git
23:09 planigan joined #git
23:09 f3r70rr35f joined #git
23:12 elsevero_ joined #git
23:13 rominronin joined #git
23:23 medeirosthiiago joined #git
23:24 medeirosthiiago joined #git
23:27 madewokherd joined #git
23:28 Levex joined #git
23:29 chachasmooth joined #git
23:29 marenz_ joined #git
23:30 Cabanossi joined #git
23:32 elsevero_ joined #git
23:33 todd_dsm joined #git
23:35 clemf joined #git
23:36 todd_dsm_ joined #git
23:41 NeverDie joined #git
23:44 dsdeiz joined #git
23:44 dsdeiz joined #git
23:44 tvw joined #git
23:45 raedah joined #git
23:46 shinnya joined #git
23:48 cqi joined #git
23:48 BackEndCoder joined #git
23:49 raijin joined #git
23:51 venmx joined #git
23:51 Rodya_ joined #git
23:53 Schrostfutz joined #git
23:56 kristofferR joined #git

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