Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-22

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

All times shown according to UTC.

Time Nick Message
00:00 miha_S7_ joined #git
00:03 h12o joined #git
00:04 snowkidind joined #git
00:07 NeXTSUN joined #git
00:07 parsnip joined #git
00:08 parsnip i got the message on git commit "fatal: empty ident name (for <>) not allowed"
00:08 NeXTSUN joined #git
00:08 parsnip i updated the name and email, still get message, do i have to unadd these?
00:08 MattMaker joined #git
00:08 osse parsnip: check if the local config overrides the global
00:09 parsnip --local -l has correct name and email
00:09 osse parsnip: env | grep GIT
00:09 parsnip all empty
00:09 osse !repro
00:09 gitinfo [!transcript] 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
00:09 trip joined #git
00:10 TbobbyZ_ joined #git
00:11 nezZario ok so I guess I never considered .. when I "git add" that it's actually adding the then-contents to the index
00:11 nezZario if I do git add foo.txt, then edit foo.txt, .. then suddenly realize I want to revert to the version in the index, is that possible?  or does it only store like a hash of the file ?
00:11 parsnip osse: setting COMMITER vars worked, thanks
00:12 osse shouldn't be needed though
00:12 CheckDavid joined #git
00:16 j08nY joined #git
00:18 doMynation joined #git
00:20 DolphinDream joined #git
00:21 hotpancakes joined #git
00:24 cam27 joined #git
00:31 hotpancakes joined #git
00:32 dirtyroshi joined #git
00:35 plasticle joined #git
00:38 cdown joined #git
00:38 nezZario also, why is there a "C" in the git status short format?  git status doesn't do copy detections ?
00:46 peterbecich joined #git
00:48 jimi_ joined #git
00:51 hashtagstrashtag joined #git
00:52 fstd_ joined #git
00:54 diogenese joined #git
00:54 grumble joined #git
01:01 cagedwisdom joined #git
01:06 Sein joined #git
01:07 porfiriopaiz joined #git
01:08 HoierM joined #git
01:15 bronson joined #git
01:19 Gustavo6046 joined #git
01:28 bertschn_ joined #git
01:29 finalbeta joined #git
01:30 miha_S7_ joined #git
01:34 druonysus_ joined #git
01:36 Cabanossi joined #git
01:39 Darren_ joined #git
01:42 D4R5C0D3 joined #git
01:46 h12o joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:53 chigang joined #git
01:53 lowercaseman joined #git
01:57 sunri5e_ joined #git
01:57 jameser joined #git
02:00 h12o joined #git
02:01 crankslider joined #git
02:02 neunon joined #git
02:05 relipse joined #git
02:13 SwiftMatt joined #git
02:20 hotpancakes joined #git
02:20 elsevero joined #git
02:26 dsdeiz_ joined #git
02:27 chipotle joined #git
02:31 Mavericks joined #git
02:32 Mavericks left #git
02:34 nickel_dime_look joined #git
02:35 raijin joined #git
02:36 Cabanossi joined #git
02:36 Lyqyd joined #git
02:37 nevodka joined #git
02:41 hotpancakes joined #git
02:43 Es0teric joined #git
02:43 Es0teric anybody here?
02:44 Es0teric i got this problem where i am trying to commit something in git and i get this error: fatal: cannot do a partial commit during a merge. how do i find what the partial commit is?
02:45 preaction you're not committing everything that's staged, is my guess. you're doing "git commit <file(s)>"
02:46 preaction are you in the middle of a merge?
02:46 Vortex34 joined #git
02:47 duderonomy joined #git
02:47 Raed|Mobile joined #git
02:48 alect joined #git
02:48 alect joined #git
02:48 lb1c joined #git
02:50 dviola joined #git
02:52 chachasmooth joined #git
02:52 lagothri1 joined #git
02:57 hexagoxel joined #git
02:57 dviola joined #git
02:58 alect joined #git
02:59 __main__ joined #git
03:01 SwiftMatt joined #git
03:01 miha_S7_ joined #git
03:03 ayogi joined #git
03:07 __main__ joined #git
03:07 alect joined #git
03:11 MrWoohoo joined #git
03:12 hotpancakes joined #git
03:13 col joined #git
03:13 ertes joined #git
03:13 hotpancakes joined #git
03:16 Darren_ joined #git
03:17 D4R5C0D3 joined #git
03:20 menip joined #git
03:24 htaccess_ joined #git
03:28 htaccess_ left #git
03:28 htaccess joined #git
03:30 jameser joined #git
03:32 netj joined #git
03:33 htaccess hello, i would like to run diff-index from outside any repo by giving it a repo path, is this possible? --help shows [<path>...] but i can't get it to work
03:34 htaccess specifically trying to run "git diff-index --quiet HEAD --" outside of a repo
03:41 jameser joined #git
03:41 bannakaf_ joined #git
03:45 Cabanossi joined #git
03:49 col joined #git
03:51 jimi_ joined #git
03:53 col joined #git
03:54 aidalgol joined #git
03:56 hotpancakes joined #git
03:56 jimi_ joined #git
03:58 armyriad joined #git
04:05 htaccess well "git --work-tree=/path/repo/ --git-dir=/path-repo/.git diff-index HEAD" seems to do the trick, took quite a lot of searching to find that :(
04:12 bronson joined #git
04:18 irisl joined #git
04:18 oaaao joined #git
04:21 Goplat joined #git
04:24 TbobbyZ joined #git
04:27 darkbit joined #git
04:27 wwalker joined #git
04:28 garyserj joined #git
04:29 howdoi joined #git
04:30 Cabanossi joined #git
04:30 miha_S7_ joined #git
04:32 jaziz1 joined #git
04:36 maarhart joined #git
04:37 Nilesh_ joined #git
04:37 wwalker joined #git
04:39 maarhart joined #git
04:42 bket joined #git
04:44 exotime joined #git
04:45 acetakwas joined #git
04:45 khoa joined #git
04:51 dsdeiz joined #git
04:51 maarhart joined #git
04:52 diogenese joined #git
04:56 rlogjoe joined #git
04:56 tohuw joined #git
04:56 tohuw joined #git
04:58 acetakwas joined #git
04:58 hotpancakes joined #git
05:01 Bock joined #git
05:03 Bock joined #git
05:07 Orbitrix joined #git
05:07 Orbitrix joined #git
05:08 rlogjoe left #git
05:15 Cabanossi joined #git
05:20 hhee joined #git
05:22 SwiftMatt joined #git
05:26 tohuw joined #git
05:26 tohuw joined #git
05:27 daynaskully joined #git
05:27 acetakwas joined #git
05:28 rchavik joined #git
05:29 telephone joined #git
05:29 telephone joined #git
05:35 nexemacs joined #git
05:35 miha_S7_ joined #git
05:40 CheckDavid joined #git
05:41 MineCoins joined #git
05:41 scoobertron joined #git
05:43 freimatz joined #git
05:50 Random832 joined #git
05:51 shinnya joined #git
05:52 prg318 joined #git
05:54 brent__ joined #git
05:57 SwiftMatt joined #git
05:57 no_gravity joined #git
06:00 brent__ joined #git
06:07 tnecniv joined #git
06:09 hotpancakes joined #git
06:11 tarkus joined #git
06:12 bannakaffalatta joined #git
06:15 PioneerAxon joined #git
06:25 watabou joined #git
06:26 vrach joined #git
06:27 SwiftMatt joined #git
06:27 armyriad joined #git
06:30 Cabanossi joined #git
06:39 schleppel joined #git
06:41 govg joined #git
06:42 ArchNoob joined #git
06:46 armyriad joined #git
06:47 gareppa joined #git
06:48 _ikke_ htaccess: easier: git -C /path/to/repo diff-index HEAD
06:48 dfas joined #git
06:49 cebor joined #git
06:51 MineCoins joined #git
06:57 theparadoxer02 joined #git
06:58 theparadoxer02 help somebody!
06:58 theparadoxer02 i made a project,then created a repo on github
06:58 theparadoxer02 then i intialised git in that folder and added all the files using "git init" and "git add *"
06:58 theparadoxer02 i did not commited the changes, then i ran the command git reset --hard, and my files are gone
07:00 no_gravity theparadoxer02: I'm no expert in git, but I would think that git then told your os to remove those files from the filesystem.
07:00 _ikke_ theparadoxer02: good news and bad news
07:00 _ikke_ theparadoxer02: because you did git add *, all the files are in the repository
07:00 _ikke_ theparadoxer02: but, only the contents
07:01 _ikke_ theparadoxer02: run git fsck --lost-found
07:02 no_gravity _ikke_: "only the contents"?
07:03 brent__ joined #git
07:03 _ikke_ no_gravity: yes, not that filename
07:03 _ikke_ the*
07:03 nevodka joined #git
07:03 no_gravity _ikke_: Funky. Why not?
07:04 _ikke_ no_gravity: because that's not stored in the blob
07:04 no_gravity _ikke_: Where is it stored?
07:04 _ikke_ the blob just contains the contents, and the index or tree objects contain the filename
07:04 _ikke_ but as nothing was comitted, there is no tree, and reset got rid of the index contents
07:04 no_gravity So if you add a file and then rename it, git would not notice?
07:06 _ikke_ git can track contents across renames, yes
07:06 no_gravity I tried and it seems to store the filename.
07:06 theparadoxer02 _ikke_, i ran the command , then i am getting so much lines like this
07:06 theparadoxer02 dangling blob b5024a37c7782ac74d1a8d769195c00440ba35a6
07:06 theparadoxer02 what to do next ?
07:06 no_gravity _ikke_:  mkdir test; cd test; git init; echo 123 > x; git add x; mv x y; git status; --> gives me "deleted: x"
07:06 _ikke_ cd .git/lost-found/other
07:06 onehrxn joined #git
07:07 _ikke_ check the contents of the files there
07:07 overlord_tm joined #git
07:09 theparadoxer02 _ikke_, there are lots of line like this there in that folder
07:09 theparadoxer02 548cc7c213daa537acab94f4b4e4976d79f5f9e1  aaec41d090081c5cead5b823a9d20d7b721550de  ffe892f25db3c7e2f8a57e29a7c981476a5eecf0
07:10 no_gravity theparadoxer02: what does "git status" show you?
07:11 bwn joined #git
07:12 bronson joined #git
07:14 theparadoxer02 no_gravity, should i give you the paste ?
07:14 no_gravity theparadoxer02: Sure. Is it that long?
07:14 theparadoxer02 https://pastebin.com/HgdCY4D7
07:15 theparadoxer02 no_gravity,  no that long but it will help you to understand better
07:15 Cabanossi joined #git
07:15 no_gravity Hmm... not sure what that is.
07:15 no_gravity How many files are you missing?
07:16 cam27 joined #git
07:18 acs____ left #git
07:23 llamapixel theparadoxer02:  Next time immediately git clone from github
07:24 llamapixel double posted in #git #github
07:27 marianina8 joined #git
07:27 abhi_ joined #git
07:31 Es0teric joined #git
07:37 finalbeta joined #git
07:40 dsdeiz_ joined #git
07:41 dreiss joined #git
07:45 dave0x6d joined #git
07:52 zeroed joined #git
07:52 zeroed joined #git
07:52 Es0teric joined #git
07:55 Lunatrius` joined #git
07:55 Murii joined #git
08:02 xvilka_ joined #git
08:03 sunri5e joined #git
08:05 xvilka_ left #git
08:05 xvilka_ joined #git
08:05 xvilka_ Hi! If I'll use git replace commit in github repo, will external trees be affected (pull requests, forks, etc)? like in case of git rebase?
08:06 Whiskey joined #git
08:08 JanC_ joined #git
08:09 ambro718 joined #git
08:09 tvw joined #git
08:10 h12o joined #git
08:13 kbeflo__ joined #git
08:15 King_Hual joined #git
08:15 King_Hual joined #git
08:21 watabou joined #git
08:22 Raging_Hog joined #git
08:24 tvw joined #git
08:26 ShapeShifter499 joined #git
08:27 hotpancakes joined #git
08:28 ZyX-I joined #git
08:29 troyt joined #git
08:30 ayogi joined #git
08:33 jab416171 joined #git
08:36 xaa joined #git
08:43 digidog joined #git
08:44 miha_S7_ joined #git
08:46 dsdeiz joined #git
08:49 courrier joined #git
08:50 maarhart joined #git
08:57 sarri joined #git
08:57 sarri joined #git
08:57 zerow joined #git
09:00 Lunatrius` joined #git
09:01 ter0 joined #git
09:02 YuGiOhJCJ joined #git
09:06 gopar joined #git
09:08 __builtin joined #git
09:11 elsevero_ joined #git
09:11 onehrxn joined #git
09:11 onehrxn joined #git
09:12 moei joined #git
09:13 miha_S7_ joined #git
09:15 hhee joined #git
09:18 hotpancakes joined #git
09:21 TbobbyZ joined #git
09:22 TbobbyZ_ joined #git
09:24 Lunatrius joined #git
09:26 h12o joined #git
09:30 rokups joined #git
09:35 xvilka_ joined #git
09:37 finalbeta joined #git
09:40 davimore joined #git
09:41 darkbit joined #git
09:41 zerow joined #git
09:42 Glooomy joined #git
09:44 h12o joined #git
09:44 justin3 joined #git
09:45 drodger joined #git
09:49 ispn joined #git
09:55 Muzer joined #git
10:00 mostlybadfly joined #git
10:01 XenophonF joined #git
10:03 h12o joined #git
10:05 compengi joined #git
10:10 hashpuppy joined #git
10:11 watabou joined #git
10:15 govg joined #git
10:15 satifant joined #git
10:19 freimatz joined #git
10:21 chipotle joined #git
10:24 rastos2 joined #git
10:24 dersand joined #git
10:24 h12o joined #git
10:26 maarhart joined #git
10:27 flavius joined #git
10:27 stoopkid joined #git
10:32 borkr joined #git
10:35 ayogi joined #git
10:37 leeN joined #git
10:37 maarhart joined #git
10:40 xaa joined #git
10:40 TbobbyZ joined #git
10:40 TbobbyZ joined #git
10:41 maarhart joined #git
10:41 oskarkv joined #git
10:42 TbobbyZ joined #git
10:44 h12o joined #git
10:44 paul424 joined #git
10:45 davimore joined #git
10:45 TikityTik joined #git
10:45 maroloccio joined #git
10:49 ArchNoob joined #git
10:50 elsevero joined #git
10:52 mikecmpbll joined #git
10:53 jstein_ joined #git
10:53 freimatz3 joined #git
10:55 freimatz_ joined #git
10:55 Groscheri joined #git
10:57 Lunatrius` joined #git
11:00 TbobbyZ joined #git
11:00 brent__ joined #git
11:04 h12o joined #git
11:05 childnoDe joined #git
11:08 pratham_pc joined #git
11:10 ter0 joined #git
11:12 watabou joined #git
11:13 finalbeta joined #git
11:15 gareppa joined #git
11:17 rorro joined #git
11:18 revoltingPeasant joined #git
11:19 masuberu joined #git
11:22 ok91 joined #git
11:24 h12o joined #git
11:28 TbobbyZ joined #git
11:31 fakenerd joined #git
11:43 h12o joined #git
11:45 MineCoins joined #git
11:49 gnixev joined #git
11:50 gopar joined #git
11:52 finalbeta joined #git
11:56 hotpancakes joined #git
11:57 cbreak only history you change will be affected
11:57 cbreak branches you don't rewrite will refer to the same history they do now
11:57 cbreak (this is not a good thing usually)
11:58 kbeflo_ joined #git
12:00 s1scha joined #git
12:02 enckse joined #git
12:02 SteffanW joined #git
12:04 h12o joined #git
12:05 enckse joined #git
12:06 storrgie joined #git
12:08 zeroed joined #git
12:11 ToBeCloud joined #git
12:13 watabou joined #git
12:14 kristofferR joined #git
12:18 joshb joined #git
12:19 Khisanth joined #git
12:19 finalbeta joined #git
12:19 jimi_ joined #git
12:24 mikecmpbll joined #git
12:24 h12o joined #git
12:27 Acerific joined #git
12:29 ankit01ojha joined #git
12:29 jimi_ joined #git
12:33 dvaske joined #git
12:35 overlord_tm joined #git
12:36 theoceaniscool_ joined #git
12:36 jameser joined #git
12:40 doener joined #git
12:44 h12o joined #git
12:45 hotpancakes joined #git
12:47 khfeng joined #git
12:50 overlord_tm joined #git
12:51 systemovich joined #git
12:53 bongo joined #git
12:54 bongo_ joined #git
12:57 Isla_de_Muerte joined #git
12:58 bertschneider joined #git
13:00 gugah joined #git
13:04 h12o joined #git
13:05 Es0teric joined #git
13:06 mentazoom joined #git
13:07 albel727 joined #git
13:09 dunpeal joined #git
13:10 dunpeal Hi. I have a mainline branch, and a branch for a particular platform that requires some patches on top of mainline to work. What's the proper way to manage this with Git branches?
13:10 dunpeal Right now I have branched off 'xplatform' from master, and I just keep merging from master to xplatform
13:11 dunpeal Is that the best way?
13:11 _ikke_ Probably, yes
13:12 cypt joined #git
13:14 watabou joined #git
13:15 alexggordon joined #git
13:15 Cabanossi joined #git
13:18 earnestly joined #git
13:21 Glooomy joined #git
13:22 brent__ joined #git
13:23 royal_screwup21 joined #git
13:24 anuxivm joined #git
13:27 royal_screwup21 I've just started learning git and want to see if I've got some things straightened out. So let's say I want to modify a file of some repo. I first clone into the repo. I then create a branch, make my modification, "add" it with a commit, then push it on the upstream. Then, I use the GUI  to make a pull request, asking the repo admin to merge by wr
13:27 royal_screwup21 iting a message to describe the  modifications I've made. Am I on the right track?
13:27 Tobbi joined #git
13:28 _ikke_ Yes, that's a common workflow
13:28 royal_screwup21 awesome, thanks _ikke_!
13:29 _ikke_ Depending on how big the change is, you can create multiple commist
13:29 _ikke_ commits
13:29 marianina8 joined #git
13:31 royal_screwup21 _ikke_ Let's say I'm currently inside a branch of the repo. I read that, after making changes, you can do "git merge master". That doesn't make sense to me. How can I merge my stuff with the master  without the admin's approval?
13:32 jameser joined #git
13:33 _ikke_ royal_screwup21: locally you can do everything
13:33 _ikke_ git is decentralized
13:33 _ikke_ git merge master will merge master into your branch, not the other way around
13:34 royal_screwup21 Ah, okay, that makes more sense. So it's essentially like the admin doing git pull inside the master branch, which gets them the latest updates
13:34 HoierM joined #git
13:35 ski7777 joined #git
13:36 _ikke_ royal_screwup21: in git terms, you usually talk more about the maintainer
13:36 royal_screwup21 _ikke_ Um, I'm a little confused here. What's really the point in doing "git merge master" when you're inside a branch? Why not just do "git pull"?
13:37 _ikke_ royal_screwup21: git pull = fetch + merge
13:37 physicalist joined #git
13:37 _ikke_ royal_screwup21: merging is not limited to what you get from a remote, you can also merge local branches
13:38 _ikke_ royal_screwup21: you can merge into master all you want. What you cannot always do is push master upstream
13:38 no_gravity joined #git
13:38 rgareus joined #git
13:39 royal_screwup21 _ikke_ Oh, okay. So merging with a master when inside a branch doesn't affect the master repo at all. The only way to make changes to the master repo is push, right?
13:39 _ikke_ ye
13:39 _ikke_ yes
13:39 _ikke_ all you do, comitting, merging etc is all local
13:41 h12o joined #git
13:42 rgareus Hi guys. Is it possible to negate "export-ignore" in a .gitattributes?  I've tried https://pastebin.com/V6yUWE4q and the prior catch-all clause still applies.
13:43 _ikke_ rgareus: it says -export-export
13:43 hotpancakes joined #git
13:44 rgareus yep. which should unset "export-ignore" for the README.   the goal here: exclude all files from the archive except the REDME
13:44 _ikke_ rgareus: you want -export-ignore, not -export-export
13:45 rgareus oO I was close to a facepalm..   but that mistake happened on pastebin only :)
13:46 _ikke_ d'oh
13:46 hotpancakes joined #git
13:46 vktec joined #git
13:46 rgareus README -export-ignore       and also export-ignore=false  don't overrde the previous rules
13:46 _ikke_ try git check-attr README
13:47 vktec I'm trying to find the tag of my detached HEAD for use in a script. `git show-ref --tags HEAD` doesn't seem to work, and I've tried it with the HEAD's commit hash instead of "HEAD" as well. Any suggestions?
13:48 _ikke_ rgareus: sorry, git check-attr export-ignore README
13:48 buffal0 joined #git
13:49 rgareus _ikke_: I've found it. I've simply forgot to commit the .attributes file (not using work-tree attributes). Thanks for your help and sorry for the noise.
13:49 _ikke_ np
13:51 vktec Aha! `git describe --tags` seems to work nicely
13:51 vktec Though when not on the actual commit of a tag, it's not so pretty :-/
13:52 * vktec settles on `git describe --tags --exact-match`
13:52 vktec Let me know if there's a better way :)
13:53 nedbat vktec: i didn't know about describe.  it seems to pick just one tag to show. my current commit has three tags on it.
13:53 vktec Hmm... that's not so great
13:53 vktec It'll do for now, unless there's a better way
13:54 _ikke_ well, if there are multiple tags, how should be decided what tag to take?
13:56 vktec Can't I just grab all of them?
13:59 _ikke_ git for-each-ref --points-at HEAD
14:00 _ikke_ git for-each-ref --points-at HEAD refs/tags
14:03 tarkus joined #git
14:03 dootele joined #git
14:04 rgareus left #git
14:06 Gustavo6046 joined #git
14:07 skunkz joined #git
14:08 dreiss joined #git
14:12 vktec _ikke_: With --format '%(refname:short)', that works nicely. Thanks :)
14:12 _ikke_ :-)
14:13 grayjoc joined #git
14:14 nitesh joined #git
14:15 watabou joined #git
14:16 Es0teric joined #git
14:20 Noldorin joined #git
14:23 finalbeta joined #git
14:23 definity left #git
14:24 Tobbi joined #git
14:25 robattila256 joined #git
14:26 sturner joined #git
14:26 Emperor_Earth joined #git
14:28 zeroed joined #git
14:28 zeroed joined #git
14:31 rominronin joined #git
14:33 bathtub_shark joined #git
14:36 buffal0 joined #git
14:39 hotpancakes joined #git
14:43 grayjoc joined #git
14:43 Es0teric joined #git
14:44 hotpanca_ joined #git
14:44 rorro joined #git
14:46 Es0teric joined #git
14:48 NwS joined #git
14:52 hotpancakes joined #git
14:57 zeroed joined #git
14:58 ChrisEadle joined #git
15:02 telephone joined #git
15:02 telephone joined #git
15:09 buffffal00 joined #git
15:09 armyriad joined #git
15:14 DolphinDream joined #git
15:15 Cabanossi joined #git
15:17 watabou joined #git
15:18 hotpancakes joined #git
15:18 Leafar joined #git
15:21 Es0teric joined #git
15:24 doppo joined #git
15:25 hotpancakes joined #git
15:25 adgtl joined #git
15:26 xaa joined #git
15:30 madewokherd joined #git
15:30 marianina8 joined #git
15:31 iv_ joined #git
15:31 iv_ left #git
15:33 navidr joined #git
15:34 TinkerTyper joined #git
15:34 marianina8 joined #git
15:34 Sein joined #git
15:38 flippo joined #git
15:38 Guest48456 joined #git
15:39 Isla_de_Muerte joined #git
15:43 ArchNoob joined #git
15:45 Cabanossi joined #git
15:45 robattila256 joined #git
15:46 brent__ joined #git
15:47 ayogi joined #git
15:47 cam27 joined #git
15:48 cam27 joined #git
15:48 flippo joined #git
15:48 dsdeiz joined #git
15:48 dsdeiz joined #git
15:49 j08nY joined #git
15:53 jameser_ joined #git
15:55 bitmod joined #git
15:56 ter0 joined #git
15:57 zeroed joined #git
16:06 dave0x6d joined #git
16:08 freimatz joined #git
16:12 maarhart joined #git
16:13 watabou joined #git
16:14 atomi joined #git
16:15 buffal0 joined #git
16:15 Cabanossi joined #git
16:16 shgysk8zer0 joined #git
16:17 ChrisEadle joined #git
16:18 NwS joined #git
16:19 hotpancakes joined #git
16:20 m0viefreak joined #git
16:21 linuxmodder joined #git
16:23 dsdeiz joined #git
16:23 dsdeiz joined #git
16:26 tarkus joined #git
16:28 hotpancakes joined #git
16:31 hotpancakes joined #git
16:33 dreiss joined #git
16:34 rastos3 joined #git
16:37 anuxivm joined #git
16:38 hotpancakes joined #git
16:38 DolphinDream joined #git
16:40 anuxivm joined #git
16:41 hotpancakes joined #git
16:42 pbandark joined #git
16:44 bannakaf_ joined #git
16:46 dirtyroshi joined #git
16:46 sunri5e joined #git
16:48 pks joined #git
16:48 holodoc joined #git
16:49 sammyo joined #git
16:49 DolphinDream joined #git
16:50 robotroll joined #git
16:50 Darren_ joined #git
16:52 onehrxn joined #git
16:52 diogenese joined #git
16:52 atomi joined #git
16:54 math-alpha joined #git
16:54 peepsalot joined #git
16:56 salamanderrake joined #git
16:58 gareppa joined #git
16:58 dsdeiz joined #git
16:58 dsdeiz joined #git
16:59 publio joined #git
17:00 Cabanossi joined #git
17:05 TbobbyZ joined #git
17:08 holodoc joined #git
17:08 CheckDavid joined #git
17:09 ayogi joined #git
17:10 hotpancakes joined #git
17:10 dreiss joined #git
17:14 metachr0n joined #git
17:16 MineCoins joined #git
17:17 cads2 joined #git
17:17 paul424 joined #git
17:18 overlord_tm joined #git
17:19 DolphinDream joined #git
17:20 peterbecich joined #git
17:24 Glooomy joined #git
17:24 blunaxela joined #git
17:25 Glooomy joined #git
17:26 miha_S7_ joined #git
17:26 Glooomy joined #git
17:26 Glooomy joined #git
17:27 andai joined #git
17:27 buffffal00 joined #git
17:27 Glooomy joined #git
17:31 aard joined #git
17:33 dsdeiz joined #git
17:33 dsdeiz joined #git
17:36 nowhereman joined #git
17:39 tnecniv joined #git
17:39 hotpancakes joined #git
17:40 Leafar joined #git
17:42 shadow-x joined #git
17:44 coasterz joined #git
17:44 rahtgaz joined #git
17:44 qpdb joined #git
17:49 hotpancakes joined #git
17:51 Darren_ joined #git
17:54 YuGiOhJCJ joined #git
17:54 overlord_tm joined #git
17:55 physicalist joined #git
17:57 h12o joined #git
17:57 winter1 joined #git
17:57 miha_S7_ joined #git
18:00 Cabanossi joined #git
18:01 brent__ joined #git
18:01 robotroll joined #git
18:02 miha_S7_ joined #git
18:08 ceda joined #git
18:08 dsdeiz joined #git
18:09 fahadash joined #git
18:09 ceda can anyone give me a link to a good git beginner's tutorial
18:10 _ikke_ !book
18:10 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:10 ceda thank you
18:11 ceda btw, is Pro git free or paid?
18:11 bremner free
18:12 bremner you can buy a paper copy
18:12 jaziz joined #git
18:14 ceda i have a question. i already know git and linux very well. i have to lead a school team for a website making competition. All the other members are Windows users. None of them know about git. Should i use git for version control and ask them to learn or just go for manual managment. Time allotable for git learning = 2 weeks
18:16 DolphinDream joined #git
18:16 bongo joined #git
18:17 dedicated joined #git
18:18 nd_ joined #git
18:19 r3c0d3x joined #git
18:19 r3c0d3x joined #git
18:22 Ryanar joined #git
18:22 forrestv joined #git
18:23 bariscant joined #git
18:25 LBV_User joined #git
18:26 hotpancakes joined #git
18:26 SilverBe joined #git
18:26 hotpanca_ joined #git
18:28 ZyX-I joined #git
18:39 TbobbyZ joined #git
18:41 Darren_ joined #git
18:43 JimDungo joined #git
18:43 dsdeiz joined #git
18:44 miha_S7_ joined #git
18:45 kexmex joined #git
18:45 Cabanossi joined #git
18:47 hotpancakes joined #git
18:48 ter0 joined #git
18:49 Goplat joined #git
18:52 BSaboia joined #git
18:52 maarhart joined #git
18:54 buffal0 joined #git
19:00 marianina8 joined #git
19:01 ceda any ideas?
19:09 NeXTSUN joined #git
19:10 gonhidi joined #git
19:14 hotpancakes joined #git
19:15 maarhart joined #git
19:16 dmc joined #git
19:17 i7c Yes, you should always teach git :P
19:17 i7c Oh, gone.
19:18 marianina8 joined #git
19:18 dsdeiz joined #git
19:18 dsdeiz joined #git
19:19 glebihan joined #git
19:22 hotpancakes joined #git
19:24 grayjoc joined #git
19:26 tyreld joined #git
19:27 re1 joined #git
19:30 jimi_ joined #git
19:31 gnixev_ joined #git
19:33 JimDungo joined #git
19:37 ok92 joined #git
19:38 mentazoom joined #git
19:39 gonhidi From the git-send-email documentation I understand that git credential fill can help store a password. However, on macOS 10.12 with credential.helper=osxkeychain I see nothing being stored in the Keychain. It does however seem able to retrieve items already stored there. Calling git credential-osxkeychain store actually seems to work. Am I doing something wrong?
19:40 bamdroid joined #git
19:42 ok91 joined #git
19:43 paul424 joined #git
19:51 ali1234 joined #git
19:52 dreiss joined #git
19:53 jimi_sanchez joined #git
19:53 dsdeiz joined #git
19:54 hotpancakes joined #git
19:56 rizonz joined #git
19:56 rizonz he guys
19:56 _ikke_ 8hai
19:56 borkr joined #git
19:56 rizonz when I removed a folder from a branche and want to get it back from my repo, what do I need to so ?
19:56 rizonz *do
19:56 jast if you haven't committed, 'git status' actually tells you how
19:57 acetakwas joined #git
19:57 rizonz ok
19:58 jast generally speaking, you use the second type of 'git checkout', the one where you pass a path
19:58 jast !checkout
19:58 gitinfo checkout does two different things! (1) no file/path argument: 'git checkout <ref>' = switches to a branch or commit. Uncommitted changes are carried over; if they don't apply cleanly the whole operation rolls back. (2) 'git checkout [<commit>] -- <path>' = overwrites the given files/paths with different versions, from <commit> or (if not given) from the index.
19:58 rizonz mhh
19:59 rizonz don't see the folder coming in
19:59 jast what did you do?
19:59 rizonz removed some files
19:59 rizonz locally
19:59 selckin joined #git
20:00 jast and where aren't you seeing the folder coming in?
20:00 a3Dman joined #git
20:00 rizonz nah folder is back by some other brache, can use that
20:01 rizonz I just need to get 2 deleted files back
20:01 h12o joined #git
20:03 buffal0 joined #git
20:04 Random832 joined #git
20:04 bamdroid Better way might have been `git checkout [ commit ] -- path/to/file1 path/to/file2'
20:05 bamdroid You can generally find those files in history with git log.
20:05 jimi_ joined #git
20:05 vktec left #git
20:07 jimi_sanchez joined #git
20:10 MrWoohoo joined #git
20:11 grayjoc joined #git
20:12 jeffreylevesque_ joined #git
20:17 tsdev joined #git
20:19 lukky513 joined #git
20:21 rominronin joined #git
20:22 Acerific joined #git
20:22 Acerific joined #git
20:22 MineCoins joined #git
20:23 math-alpha joined #git
20:27 CheckDavid joined #git
20:28 dsdeiz joined #git
20:28 dsdeiz joined #git
20:32 chovy_ joined #git
20:35 jaziz joined #git
20:35 gnixev_ joined #git
20:39 hashtagstrashtag joined #git
20:42 math-alpha joined #git
20:42 theiostream joined #git
20:43 TbobbyZ joined #git
20:43 m0viefreak joined #git
20:48 LaptopBrain joined #git
20:50 davimore joined #git
20:51 hotpancakes joined #git
20:52 m00n left #git
20:52 a3Dman joined #git
20:53 ivanfon joined #git
20:54 AbleBacon_ joined #git
20:58 ertesx joined #git
20:59 TbobbyZ joined #git
21:02 hotpancakes joined #git
21:02 gnixev joined #git
21:03 dsdeiz joined #git
21:03 dsdeiz joined #git
21:03 a3Dman joined #git
21:06 mquin joined #git
21:11 marianina8 joined #git
21:16 andai_ joined #git
21:18 zartu joined #git
21:18 endiruna joined #git
21:20 jrm joined #git
21:20 kbeflo_ joined #git
21:22 hotpancakes joined #git
21:22 inflames joined #git
21:23 m1k3y_b0y joined #git
21:27 LaptopBrain joined #git
21:27 hotpancakes joined #git
21:29 Gloomy joined #git
21:30 hotpanca_ joined #git
21:30 hegge joined #git
21:30 buffal0 joined #git
21:32 treehug88 joined #git
21:33 askb joined #git
21:34 jaziz1 joined #git
21:36 dsdeiz joined #git
21:37 a3Dman joined #git
21:37 marianina8 joined #git
21:38 physicalist joined #git
21:40 OMGOMG joined #git
21:40 kbeflo__ joined #git
21:42 kbeflo_ joined #git
21:44 inflames joined #git
21:45 Cabanossi joined #git
21:46 SwiftMatt joined #git
21:47 wcpan joined #git
21:48 JuPaname left #git
21:50 bongo_ joined #git
21:51 kyan joined #git
21:52 m1k3y_b0y left #git
21:53 medeirosthiiago joined #git
21:54 ski4x7 joined #git
21:57 kbeflo_ joined #git
21:59 kbeflo__ joined #git
22:03 h12o joined #git
22:05 anuxivm joined #git
22:06 watabou joined #git
22:07 gnixev joined #git
22:07 TbobbyZ joined #git
22:08 ski7777 joined #git
22:09 bronson joined #git
22:17 Goplat joined #git
22:17 EDAKIRI joined #git
22:18 ckubrak joined #git
22:19 NightMonkey joined #git
22:20 ckubrak Hi guys, how can I see all my current git config? I've setted a few things with "git config --global ..."
22:21 cbreak ckubrak: -l
22:22 ckubrak Thanks
22:27 amateur_swami joined #git
22:27 peterbec` joined #git
22:27 a3Dman joined #git
22:29 matoro joined #git
22:32 zartu joined #git
22:34 zartu joined #git
22:34 bilal joined #git
22:34 mentazoom joined #git
22:37 digidog joined #git
22:40 a3Dman joined #git
22:40 amateur_swami left #git
22:41 peterbecich joined #git
22:44 peterbecich joined #git
22:45 miha_S7_ joined #git
22:46 onehrxn joined #git
22:49 jackrandom joined #git
22:49 jackrandom joined #git
22:54 zartu joined #git
23:04 zartu joined #git
23:05 orbyt_ joined #git
23:06 Jaggz left #git
23:06 justin3 joined #git
23:14 Atm0spher1c joined #git
23:14 peterbec` joined #git
23:15 NeXTSUN joined #git
23:21 SwiftMatt joined #git
23:22 alexggordon joined #git
23:24 grayjoc joined #git
23:26 ckubrak joined #git
23:27 grayjoc joined #git
23:30 QwertyDragon joined #git
23:31 bronson joined #git
23:35 zartu joined #git
23:45 Cabanossi joined #git
23:45 zartu joined #git
23:46 Tobbi joined #git
23:46 buffal0 joined #git
23:51 zartu joined #git

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