Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-18

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

All times shown according to UTC.

Time Nick Message
00:02 ResidentBiscuit joined #git
00:03 lvns joined #git
00:04 raijin joined #git
00:04 dhollinger joined #git
00:04 tristanp joined #git
00:07 tesuji joined #git
00:09 Shentino joined #git
00:14 tyreld joined #git
00:15 nd joined #git
00:18 dreiss joined #git
00:21 RedNifre_ joined #git
00:23 geko joined #git
00:24 nd joined #git
00:29 mar77i_ joined #git
00:29 mingrammer joined #git
00:29 Gianormagantrous joined #git
00:30 fguillot joined #git
00:32 swap joined #git
00:32 r3c0d3x joined #git
00:34 dalias joined #git
00:37 godzirra joined #git
00:37 Goplat joined #git
00:41 Sazhen86 joined #git
00:48 r3c0d3x joined #git
00:48 therealGent joined #git
00:48 therealGent joined #git
00:50 fiddlerwoaroof joined #git
00:50 tristanp joined #git
00:53 eizua joined #git
01:00 dalias joined #git
01:01 ResidentBiscuit joined #git
01:03 mingrammer joined #git
01:07 pks joined #git
01:10 moneylotion joined #git
01:11 moneylotion joined #git
01:11 moneylotion joined #git
01:13 moneylotion joined #git
01:13 moneylotion joined #git
01:14 moneylotion joined #git
01:15 finalbeta joined #git
01:15 alex1a joined #git
01:18 comps joined #git
01:21 tristanp joined #git
01:23 GT4066 joined #git
01:24 clemf joined #git
01:24 dpower joined #git
01:25 navidr joined #git
01:26 iota_pi joined #git
01:28 anonymuse joined #git
01:29 a3Dman joined #git
01:29 boombatower joined #git
01:31 Vampire0_ joined #git
01:32 j4f-shredder joined #git
01:32 j4f-shredder does someone knows if I can use the same ssh key on gitbhub for 2 different repos?
01:32 j4f-shredder Warning: Permanently added 'github.com,192.30.253.113' (RSA) to the list of known hosts. ERROR: Permission to juanlet/image-search-api.git denied to deploy key fatal: Could not read from remote repository.
01:33 j4f-shredder I created an ssh key on ubuntu
01:33 j4f-shredder and I'm adding that key on every repo that I'm creating but I don't know why it's denying me the access
01:33 j4f-shredder the other day I could push to other repo
01:33 j4f-shredder with this same key
01:33 realz__ joined #git
01:34 ojacobson j4f-shredder: your SSH key identifies your github login, not a specific repo
01:34 d^sh joined #git
01:34 j4f-shredder yeah, but why is denying me access?
01:34 j4f-shredder I think my mistake is adding that key to every repo I create right?
01:34 ojacobson A single _deploy_ key can be added to multiple repos (it provides read-only access that's not tied to a single user) but it doesn't sound like the key you're actually using (ssh -vv git@github.com) has access to the repos in question
01:35 ojacobson (and you can't use the same key as both a user key and a deploy key - it's one or the other)
01:35 Hobbyboy joined #git
01:37 dalias joined #git
01:39 cagedwisdom joined #git
01:39 j4f-shredder i did that   cat ~/.ssh/id_rsa.pub
01:39 j4f-shredder I deleted the deploy keys from every repo
01:40 j4f-shredder and now I went to settings on my account
01:40 j4f-shredder ssh keys
01:40 j4f-shredder and added that there
01:40 j4f-shredder now it should work right?=
01:40 j4f-shredder for everyoneofmy repos
01:40 j4f-shredder all of my repos
01:40 j4f-shredder I mean
01:41 j4f-shredder and do I have to use ssh protocol to use ssh jeys?
01:41 j4f-shredder or I can use those keys with the remote http url?
01:46 clemf joined #git
01:46 j4f-shredder with that change it worked perfectly
01:46 j4f-shredder thank you all
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and unnecessary bowdlerisms | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-fsck: think of the children
01:49 Gsham joined #git
01:49 psacrifice joined #git
01:51 liuzhen joined #git
01:52 raijin joined #git
01:54 tjone270 joined #git
01:55 tristanp joined #git
01:56 clemf joined #git
02:00 fstd_ joined #git
02:00 tristanp joined #git
02:01 crayon joined #git
02:02 dsdeiz joined #git
02:02 Rodya_ joined #git
02:04 clevodearia joined #git
02:06 dalias joined #git
02:07 boombatower joined #git
02:08 mycyber joined #git
02:15 ItSANgo joined #git
02:21 clemf joined #git
02:23 cqi joined #git
02:26 ojdo joined #git
02:27 jnewt joined #git
02:28 cagedwisdom joined #git
02:29 jeffreylevesque_ joined #git
02:34 mingrammer joined #git
02:34 z8z joined #git
02:38 godzirra joined #git
02:50 clevodearia joined #git
02:54 clevodearia joined #git
02:55 lagothrix joined #git
02:59 chachasmooth joined #git
02:59 clemf joined #git
03:02 hexagoxel joined #git
03:03 clevodearia joined #git
03:03 Rodya_ joined #git
03:09 clevodearia joined #git
03:14 pijiu joined #git
03:14 dalias joined #git
03:18 e14 joined #git
03:20 e14_ joined #git
03:21 tanath joined #git
03:21 sigjuice joined #git
03:23 jeffreylevesque_ joined #git
03:24 Doginal_ joined #git
03:28 xlegoman joined #git
03:28 Raed|Mobile joined #git
03:29 mingrammer joined #git
03:31 dodobrain joined #git
03:33 johnnyfive joined #git
03:41 atomicb0mb joined #git
03:42 __xor joined #git
03:46 mizu_no_oto joined #git
03:46 Jon28 joined #git
03:47 magicturtle joined #git
03:56 chrisshattuck joined #git
03:56 blahdodo joined #git
03:58 SwiftMatt joined #git
03:59 kejoma joined #git
04:05 Rodya_ joined #git
04:08 xpk joined #git
04:11 chrisshattuck joined #git
04:12 eka_ joined #git
04:12 laumann joined #git
04:14 pikajude joined #git
04:14 nopnopnop joined #git
04:14 eka joined #git
04:18 crayon joined #git
04:18 harish joined #git
04:19 crayon joined #git
04:23 daey_ joined #git
04:29 GandalfTheWizard joined #git
04:34 chrisshattuck joined #git
04:35 robogoat joined #git
04:35 ayjay_t joined #git
04:35 jgrasser joined #git
04:37 xpk joined #git
04:39 godzirra joined #git
04:40 waruqi joined #git
04:40 cyphase joined #git
04:44 NightMonkey joined #git
04:45 mycyber joined #git
04:47 languitar joined #git
04:47 evanwang joined #git
04:48 alex1a joined #git
04:49 chrisshattuck joined #git
04:51 dalias joined #git
04:52 Raedism joined #git
04:53 a_thakur joined #git
04:54 DolphinDream joined #git
04:55 sonikspin joined #git
04:56 Cabanossi joined #git
05:06 Rodya_ joined #git
05:08 mingrammer joined #git
05:09 cqi joined #git
05:11 wavis joined #git
05:12 wavis Is there an equivalent to hg cp? I want a new file to share the history of an existing file.
05:16 wavis nm. I guess git doesn't do this http://stackoverflow.com/a/1043566/1413900
05:19 ashokrajar joined #git
05:29 vuoto joined #git
05:29 rgrinberg joined #git
05:34 _ng joined #git
05:37 ShapeShifter499 joined #git
05:42 dalias joined #git
05:49 nilg joined #git
05:52 thiago wavis: cp && git add
05:54 arand_ joined #git
06:06 Rodya_ joined #git
06:10 lindenle joined #git
06:14 flavius joined #git
06:15 apotry joined #git
06:18 flavius joined #git
06:18 lvns joined #git
06:19 psprint If I commit in subdirectory, will git somehow filter commits when doing git log? Tried and it doesn't seem to work
06:20 shinnya joined #git
06:21 psprint probably the only way to group commits is a branch?
06:21 dalias joined #git
06:28 glebihan_ joined #git
06:30 phaleth joined #git
06:30 phaleth joined #git
06:31 btree joined #git
06:32 btree left #git
06:40 godzirra joined #git
06:42 subhojit777 joined #git
06:46 dsdeiz joined #git
06:46 Goplat joined #git
06:48 mehola joined #git
06:50 xpk joined #git
06:51 dsdeiz joined #git
06:51 dsdeiz joined #git
06:54 a_thakur joined #git
06:55 BSaboia joined #git
06:55 Atrumx joined #git
06:56 ap0c joined #git
07:00 fub joined #git
07:01 fub Hi. So I added a remote repository via git remote add ... When doing a "git pull" now, I get a 'There is no tracking information for the current branch.'. I can do a git pull origin master which works, but isn't it possible to set this as the default (and is it a good idea to do this?) ?
07:01 fub I'm not working with branches a lot.
07:03 mingrammer joined #git
07:04 mycelium joined #git
07:07 jknetl joined #git
07:07 Rodya_ joined #git
07:11 t0by joined #git
07:12 dreiss joined #git
07:12 dpower joined #git
07:14 sanketdg joined #git
07:14 armyriad joined #git
07:15 Salander27 joined #git
07:16 nilez joined #git
07:16 liuzhen joined #git
07:18 armyriad joined #git
07:18 a_thakur joined #git
07:22 a_thakur joined #git
07:27 BSAlb joined #git
07:29 nilez joined #git
07:33 sanketdg joined #git
07:35 desi joined #git
07:40 Gnut joined #git
07:40 dpower joined #git
07:40 bocaneri joined #git
07:46 bluepixel joined #git
07:47 grawity fub: `git branch -u origin/master`
07:47 jknetl joined #git
07:52 jost joined #git
07:55 ochorocho__ joined #git
07:58 fub grawity: thanks
07:59 elastix joined #git
08:03 mingrammer joined #git
08:06 d0nn1e joined #git
08:08 Rodya_ joined #git
08:11 lanking joined #git
08:14 napping joined #git
08:15 napping Hey, is there any way to override a [pull]\n  ff=only in .gitconfig with a command line option?
08:16 grawity --no-ff, or -c pull.ff=false (equivalent)
08:17 napping Hmm, looks like 2.1.4 is too old for that
08:17 napping wow am I out of date
08:18 napping -c works here, but --no-ff doesn't override
08:21 robotroll joined #git
08:21 anuxivm joined #git
08:21 vuoto joined #git
08:22 dsdeiz joined #git
08:23 JrCs joined #git
08:25 irqq joined #git
08:30 elastix joined #git
08:35 napping left #git
08:36 JrCs joined #git
08:38 a_thakur joined #git
08:39 cagedwisdom joined #git
08:39 ahmedelgabri joined #git
08:40 bjoe2k4 joined #git
08:40 zeroed joined #git
08:40 zeroed joined #git
08:40 godzirra joined #git
08:41 sq-one joined #git
08:48 ShekharReddy joined #git
08:51 fub joined #git
08:51 Thorn joined #git
08:52 t0by joined #git
08:52 ShapeShifter499 joined #git
08:53 quetz joined #git
08:53 a_thakur joined #git
08:57 sonikspin joined #git
08:57 Akimb joined #git
08:58 Thorn joined #git
08:58 abh joined #git
08:59 ochorocho__ joined #git
09:04 abh joined #git
09:04 tanuki joined #git
09:09 mycelium joined #git
09:09 Rodya_ joined #git
09:10 fub joined #git
09:13 satifant joined #git
09:13 inflames joined #git
09:13 a_thakur joined #git
09:16 ochorocho__ joined #git
09:18 catsup joined #git
09:18 djb-irc joined #git
09:19 Vampire0 joined #git
09:19 mingrammer joined #git
09:25 Yuki_ joined #git
09:30 Yuki__ joined #git
09:31 msonntag joined #git
09:31 Yuki__ left #git
09:36 Yuki_ joined #git
09:36 baxx joined #git
09:40 raijin joined #git
09:41 leftriver27 joined #git
09:41 ochorocho__ joined #git
09:43 mingrammer joined #git
09:43 jknetl joined #git
09:47 King_Hual joined #git
09:47 King_Hual joined #git
09:51 stuh84 joined #git
09:52 overlord_tm joined #git
09:52 stamina joined #git
09:53 moop joined #git
09:53 cdown joined #git
10:00 mehola joined #git
10:00 kingarmadillo joined #git
10:01 Groscheri joined #git
10:03 z8z joined #git
10:03 frobnic joined #git
10:03 encod3 joined #git
10:04 ahr3n joined #git
10:06 ki0 joined #git
10:08 laumann joined #git
10:10 Dyonisos_ joined #git
10:10 Rodya_ joined #git
10:12 mingrammer joined #git
10:13 dalias joined #git
10:16 nwkj86 joined #git
10:22 eMDi joined #git
10:22 a3pq51 joined #git
10:23 fuchstronaut joined #git
10:23 moop joined #git
10:24 eizua joined #git
10:27 dpower joined #git
10:34 harish joined #git
10:34 lanking joined #git
10:37 actinide joined #git
10:38 mingramm_ joined #git
10:41 godzirra joined #git
10:42 nohitall left #git
10:44 clevodearia joined #git
10:44 moop joined #git
10:44 fuchstronaut joined #git
10:45 frobnic_ joined #git
10:45 Guest1 joined #git
10:46 kingarmadillo joined #git
10:48 Akimbas joined #git
10:49 ki0 joined #git
10:50 magicbit joined #git
10:51 chele joined #git
10:51 Guest1 joined #git
10:51 izalove left #git
10:52 Guest1__ joined #git
10:53 Guest1__ left #git
10:53 Guest1__ joined #git
10:58 JrCs joined #git
10:59 frobnic joined #git
11:00 dpower joined #git
11:02 moop joined #git
11:03 AndreL joined #git
11:03 cyan__ joined #git
11:06 Guest1 joined #git
11:08 picomatic joined #git
11:09 picomatic test
11:11 picomatic hello, i have some existing git repo's and want them on a central server (bare repo's). Can i just create the repo's on the central server and then push from the existing local repo's?
11:12 ^7heo yes
11:12 dalias joined #git
11:12 ArcIV joined #git
11:13 picomatic @^7heo: thx.  Still reading the manual, but want to start in a correct way.
11:15 ^7heo git init --bare
11:16 nsh joined #git
11:17 AndreL joined #git
11:19 picomati_ joined #git
11:19 meLon joined #git
11:25 ahr3n joined #git
11:28 sdothum joined #git
11:32 leeN joined #git
11:34 Rodya_ joined #git
11:35 bibek22 joined #git
11:35 bibek22 hi everyone
11:45 fuchstronaut joined #git
11:50 kusfedora joined #git
11:57 medeirosthiiago joined #git
12:01 Lor_ joined #git
12:03 al-damiri joined #git
12:05 reim joined #git
12:09 dpower joined #git
12:14 Noldorin joined #git
12:17 robotroll joined #git
12:21 Balliad joined #git
12:22 Balliad_ joined #git
12:22 cdown joined #git
12:27 tjone270 joined #git
12:40 sdothum joined #git
12:42 godzirra joined #git
12:43 fub joined #git
12:48 sdothum joined #git
12:49 atomicb0mb joined #git
12:52 m0viefreak joined #git
12:53 dsdeiz joined #git
12:53 sdothum joined #git
12:54 jeffreylevesque_ joined #git
12:57 Balliad joined #git
12:58 jstimm joined #git
12:58 fahadash joined #git
12:58 rbern joined #git
12:59 sdothum joined #git
13:05 PioneerAxon joined #git
13:06 ahmedelgabri joined #git
13:11 jeffreylevesque_ joined #git
13:11 raijin joined #git
13:13 barteks2x joined #git
13:14 Noldorin joined #git
13:15 lmatteis joined #git
13:15 lindenle joined #git
13:15 overlord_tm joined #git
13:17 CEnnis91 joined #git
13:17 lmatteis work they use GitHub's "charts" feature to figure out how much we work. i realized that none of my commits are appearing because they're merged by senior developers, hence appears as "Merge branch foo"
13:17 lmatteis any ideas how to get around this?
13:17 atomicb0mb joined #git
13:17 grawity ;_;
13:18 osse if they are regular merges then your commits are still in the log
13:18 Gsham joined #git
13:18 osse IOW: github's feature is wrong
13:18 kusfedora joined #git
13:19 acr4 joined #git
13:20 atomicb0mb joined #git
13:21 lmatteis osse: what if they're pull requests merges
13:21 osse they are regular merges
13:22 overlord_tm joined #git
13:22 lmatteis i don't see my name in the logs though
13:23 osse then they aren't regular merges. maybe squash merges
13:23 lmatteis they just do 'git merge other-branch'
13:25 osse then either your name is in the logs or they don't do what you said
13:25 lmatteis by logs you mean the history as it appears in `git log` right?
13:26 osse yes
13:26 PioneerAxon joined #git
13:26 cisco87 joined #git
13:26 lmatteis all my branch commits appear as a single giant commit
13:27 osse then the senior developer's are screwing you over
13:27 osse merge --squash or other form of rewriting merge a regular merge
13:27 lmatteis how should it appear though?
13:28 cyan__ joined #git
13:28 osse like any other commit
13:28 osse several of them
13:29 lmatteis sometimes i get a single `Merge from branch` commit
13:29 lmatteis via a simple `git merge branch`
13:29 osse yes, but if you run git log after then you will see commits from both bracnhes
13:35 Rodya_ joined #git
13:39 nicoulaj joined #git
13:40 dsdeiz joined #git
13:40 dsdeiz joined #git
13:41 dendazen joined #git
13:45 rgrinberg joined #git
13:46 mizu_no_oto joined #git
13:51 madewokherd joined #git
13:51 clemf joined #git
13:54 nilez joined #git
13:54 Gsham joined #git
13:59 nilez joined #git
14:03 fuchstronaut joined #git
14:04 annoymouse joined #git
14:04 snowkidind joined #git
14:07 dafty joined #git
14:09 dafty Hey, can someone tell their workflow regards applying patches with git am? More specifically i'm interested in how someone gets the patches off the mailing list.
14:12 mycyber joined #git
14:13 robotroll joined #git
14:16 Hipa joined #git
14:16 lindenle joined #git
14:17 _ikke_ dafty: What e-mail client do you use?
14:17 vuoto joined #git
14:18 Silenced_v2 joined #git
14:18 dafty _ikke_, rmail in emacs
14:20 HoierM joined #git
14:20 _ikke_ I don't know rmail, but it probably has a way to save mails to disk
14:20 dafty _ikke_, sure
14:20 _ikke_ That will most likely be in a format that you can feed directly to git-am
14:20 Silenced_v2 joined #git
14:21 dafty oh it's that simple?
14:21 _ikke_ yes
14:21 dafty cool, thanks for clearing it up.
14:21 _ikke_ git-am was built exactly for this workflow
14:26 Thorn__ joined #git
14:26 clemf joined #git
14:26 e14 joined #git
14:28 Noldorin joined #git
14:33 satbyy joined #git
14:34 rbern joined #git
14:34 KeelOfSteel joined #git
14:36 kulelu88 joined #git
14:37 jokester joined #git
14:38 e14_ joined #git
14:40 dhanush joined #git
14:43 godzirra joined #git
14:43 dalias joined #git
14:44 asdofindia joined #git
14:45 fguillot joined #git
14:51 [ADN] joined #git
14:51 sdothum joined #git
14:53 DolphinDream joined #git
15:03 dalias joined #git
15:03 liquidjamm joined #git
15:04 subhojit777 joined #git
15:05 fuchstronaut joined #git
15:16 kejoma joined #git
15:22 kejoma joined #git
15:23 ahmedelgabri joined #git
15:28 fuchstronaut joined #git
15:33 clemf joined #git
15:34 mingrammer joined #git
15:34 phaleth joined #git
15:34 e14 joined #git
15:35 reim joined #git
15:36 dreiss joined #git
15:37 lucianangelus joined #git
15:40 andlabs joined #git
15:42 Vaelatern joined #git
15:43 holodoc joined #git
15:43 dinoocch joined #git
15:46 danimal2 joined #git
15:47 kejoma joined #git
15:47 YourTheBombNow23 joined #git
15:48 treehug88 joined #git
15:52 ki0 joined #git
15:53 meLon joined #git
15:55 fguillot joined #git
15:58 clevodearia joined #git
15:59 thiago joined #git
16:00 chrisshattuck joined #git
16:01 clevodearia joined #git
16:02 mingrammer joined #git
16:07 anuxivm left #git
16:07 stamina joined #git
16:09 mquin joined #git
16:11 mquin joined #git
16:12 [Anthony] joined #git
16:13 grumble joined #git
16:13 [Anthony] Hi
16:13 gitinfo [Anthony]: 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.
16:13 [Anthony] I’ve just attempted a merge between 2 rather distant branches for the 2nd time
16:14 [Anthony] After fixing all the conflicts (I’m using Intellij) I get the following message
16:14 [Anthony] Couldn't check the working tree for unmerged files because of an error.
16:14 [Anthony] error: commit is not possible because you have unmerged files.
16:14 [Anthony] hint: Fix them up in the work tree, and then use 'git add/rm <file>'
16:14 [Anthony] hint: as appropriate to mark resolution and make a commit.
16:14 [Anthony] fatal: Exiting because of an unresolved conflict.
16:14 [Anthony] *oops sorry about the line breaks
16:14 jast what command gave you that message?
16:14 [Anthony] However I can’t find any unmerged files
16:15 [Anthony] during executing git -c core.quotepath=false commit -F /Users/Anthony/Desktop/ctms/.git/MERGE_MSG --
16:15 jast is that a command generated by your IDE's git integration?
16:16 [Anthony] erm not sure
16:16 jast well is it something you typed into a terminal somewhere? :)
16:16 [Anthony] that was the last line of the error message
16:16 [Anthony] no I just select the branch I want to merge from a list and Intellij does it for me
16:16 [Anthony] usually works fine
16:17 fees joined #git
16:17 jast okay
16:18 jast if you run 'git status' on the command line for that repo, do you get any errors? the "because of an error" looks kind of weird
16:18 lindenle joined #git
16:18 jast (and rather unspecific)
16:19 [Anthony] sure
16:19 eivarv joined #git
16:19 [Anthony] yes I get a few unmerged paths and untracked files in red
16:20 chrisshattuck joined #git
16:20 quetz^^ joined #git
16:22 [Anthony] ok so regarding the unmerged paths - there are a few files that git status labels ‘both deleted’ which don’t show up in the package they should be in
16:24 diogenese joined #git
16:25 Rhonda joined #git
16:26 blackwind_123 joined #git
16:26 cdg joined #git
16:27 nd joined #git
16:27 cdown joined #git
16:28 cdg joined #git
16:28 fuchstronaut joined #git
16:33 pioiytr joined #git
16:34 therealGent joined #git
16:34 therealGent joined #git
16:35 pioiytr_ joined #git
16:35 fahadash joined #git
16:36 lolmac joined #git
16:37 sarbs joined #git
16:38 dsdeiz joined #git
16:38 dsdeiz joined #git
16:39 abit2 joined #git
16:39 fuchstronaut joined #git
16:42 e14 joined #git
16:43 [ADN] left #git
16:44 godzirra joined #git
16:44 _ADN_ joined #git
16:47 dreiss joined #git
16:48 Gitzilla joined #git
16:49 lindenle joined #git
16:49 chrisshattuck joined #git
16:49 jeffreylevesque_ joined #git
16:52 Akimbas joined #git
16:54 therealGent joined #git
16:54 therealGent joined #git
16:56 reim joined #git
16:58 mlvnd joined #git
16:59 snowkidind joined #git
16:59 mingrammer joined #git
17:00 mohabaks joined #git
17:01 SwiftMatt joined #git
17:03 dviola joined #git
17:03 fuchstronaut joined #git
17:06 rbern joined #git
17:06 BSab joined #git
17:08 BSaboia joined #git
17:09 jeffreylevesque_ joined #git
17:10 Rodya_ joined #git
17:13 SteffanW joined #git
17:13 robotroll joined #git
17:14 meadmoon joined #git
17:14 noodle joined #git
17:15 mangolisk joined #git
17:19 di11inger joined #git
17:20 di11inger joined #git
17:21 HoierM joined #git
17:22 cagedwisdom joined #git
17:22 fguillot joined #git
17:23 e14 joined #git
17:23 di11inger joined #git
17:24 fub joined #git
17:27 mquin joined #git
17:28 cdown_ joined #git
17:28 Darren__ joined #git
17:28 weltall joined #git
17:29 oldrobot joined #git
17:29 slixpk joined #git
17:29 tango_ joined #git
17:29 bratchley joined #git
17:29 kini joined #git
17:29 jab416171 joined #git
17:29 selckin joined #git
17:29 ThiefMaster joined #git
17:29 Hogofwar joined #git
17:29 lightstalker joined #git
17:29 BlackMaria joined #git
17:29 lucz joined #git
17:29 ionelmc joined #git
17:29 hecliunyx joined #git
17:29 RiPer joined #git
17:29 Guest68452 joined #git
17:29 sparetire joined #git
17:29 cebor joined #git
17:29 seitensei joined #git
17:29 musca joined #git
17:29 go1111111 joined #git
17:29 rasto joined #git
17:29 jantje joined #git
17:29 vdl joined #git
17:29 asmacdo joined #git
17:29 brendyn joined #git
17:29 sharkz_ joined #git
17:29 m1dnight` joined #git
17:29 synthmeat joined #git
17:29 salparadise joined #git
17:29 MillerBoss joined #git
17:29 thomas joined #git
17:29 SebastianFlyte joined #git
17:29 me_and joined #git
17:29 shymega joined #git
17:29 spb joined #git
17:29 hfp joined #git
17:29 Rhonda joined #git
17:29 cjohnson joined #git
17:29 maxb joined #git
17:29 Spinkzeit joined #git
17:29 HelloAtMega joined #git
17:29 pdgwien joined #git
17:29 Guest53868 joined #git
17:29 rcz joined #git
17:29 EisNerd_ joined #git
17:29 KevinMGranger joined #git
17:29 sLite joined #git
17:29 rudycane joined #git
17:29 beagleGuy joined #git
17:29 MrC joined #git
17:29 malide joined #git
17:29 Mir4g3 joined #git
17:29 sunny256 joined #git
17:29 qsx joined #git
17:29 corebits joined #git
17:29 heinrich5991 joined #git
17:29 HedgeWork joined #git
17:29 h12o joined #git
17:29 wwalker joined #git
17:29 javaJake joined #git
17:29 Boniche joined #git
17:29 qlkzy joined #git
17:29 sfix joined #git
17:29 marcaddeo joined #git
17:29 weylin joined #git
17:29 bodie_ joined #git
17:29 marlun joined #git
17:29 r4z3r joined #git
17:29 shgysk8zer0 joined #git
17:29 Mo0O joined #git
17:30 rahtgaz joined #git
17:31 Guest64580 joined #git
17:31 satifant joined #git
17:32 cmosguy joined #git
17:33 moei joined #git
17:35 Awesomecase joined #git
17:35 JackMc joined #git
17:35 evie_hammond joined #git
17:37 raijin joined #git
17:38 jost joined #git
17:38 cisco_ joined #git
17:39 dodobrain joined #git
17:40 Awesomecase joined #git
17:47 kadoban joined #git
17:49 jungsubk joined #git
17:53 Darcidride joined #git
17:54 clevodearia joined #git
17:56 picomatic joined #git
17:57 multi_io joined #git
17:57 ghostlight joined #git
17:58 Shakeel_ joined #git
18:00 dodobrain joined #git
18:02 wintrytbs joined #git
18:02 fub left #git
18:06 clevodearia joined #git
18:06 howitdo joined #git
18:07 dan2k3k4 joined #git
18:13 lindenle joined #git
18:15 dan2k3k4 joined #git
18:16 dreamyspell joined #git
18:17 clevodearia joined #git
18:19 Zageron joined #git
18:19 UTAN_dev_ joined #git
18:19 quenode_ joined #git
18:20 dreiss joined #git
18:20 ojacobson joined #git
18:21 larrybolt joined #git
18:21 jeffreylevesque_ joined #git
18:21 phroa joined #git
18:22 xai joined #git
18:22 same_ol_1eez joined #git
18:25 WayToDoor joined #git
18:26 clr joined #git
18:26 berndj joined #git
18:26 felixjet joined #git
18:26 clevodearia joined #git
18:27 kusfedora joined #git
18:27 jeffreylevesque_ joined #git
18:27 kyan joined #git
18:27 sysanthrope joined #git
18:27 Rodya_ joined #git
18:28 everamzah joined #git
18:28 bket joined #git
18:29 Lyqyd joined #git
18:30 texasmynsted joined #git
18:31 diogenese joined #git
18:32 ghostlight joined #git
18:33 Goplat joined #git
18:35 clevodearia joined #git
18:36 mehola joined #git
18:37 Nugget joined #git
18:39 CEnnis91 joined #git
18:39 therealGent joined #git
18:39 therealGent joined #git
18:39 clevodearia joined #git
18:42 Balliad joined #git
18:44 godzirra joined #git
18:45 Surfer2010 joined #git
18:48 mingrammer joined #git
18:48 SebastianFlyte joined #git
18:49 anonymuse joined #git
18:50 Fabricio20 joined #git
18:52 lucz joined #git
18:53 danimal2 hey, trying to load bootstrap library locally and in the module i dont get the dropdown that shows Load locally to show up. see http://imgur.com/a/wpTw4  any ideas?
18:54 RedneckDonut joined #git
18:55 danimal2 sorry guys wrong channel
18:55 bodie_ joined #git
18:55 wwalker joined #git
18:55 jab416171 joined #git
18:58 energizer joined #git
18:59 energizer joined #git
19:00 raijin joined #git
19:01 realz joined #git
19:10 newbie1 joined #git
19:11 shinnya joined #git
19:13 cyphase joined #git
19:13 Cabanossi joined #git
19:14 energizer joined #git
19:17 chibbol joined #git
19:21 Zageron left #git
19:21 eihabara_ joined #git
19:22 Balliad joined #git
19:23 nydel07 joined #git
19:23 lightstalker joined #git
19:23 corebits joined #git
19:23 javaJake joined #git
19:25 kyan joined #git
19:26 energizer joined #git
19:28 Jon28 joined #git
19:30 xpk joined #git
19:30 xpk joined #git
19:32 fguillot joined #git
19:37 nilg joined #git
19:39 PioneerAxon joined #git
19:40 elastix joined #git
19:41 vuoto joined #git
19:42 vuoto joined #git
19:42 kusfedora joined #git
19:44 d5sx43 joined #git
19:48 mquin joined #git
19:49 Darren__ joined #git
19:49 energizer joined #git
19:50 sangy joined #git
19:52 energizer2 joined #git
19:52 Repox joined #git
19:54 energizer joined #git
19:56 cagedwisdom joined #git
19:56 energizer joined #git
19:57 energizer joined #git
19:58 energizer joined #git
20:03 everamzah joined #git
20:05 IndigoTiger joined #git
20:07 franl joined #git
20:07 eivarv joined #git
20:09 graft joined #git
20:09 graft joined #git
20:11 jeffreylevesque joined #git
20:12 khfeng joined #git
20:12 atomicb0mb joined #git
20:13 wgrant joined #git
20:13 mingrammer joined #git
20:22 acr4 left #git
20:22 bmahe joined #git
20:22 acr4 joined #git
20:23 acr4 left #git
20:23 ShekharReddy joined #git
20:23 Cabanossi joined #git
20:24 fguillot joined #git
20:25 Limes joined #git
20:25 graft joined #git
20:25 graft joined #git
20:26 grayjoc joined #git
20:35 serialoverflow joined #git
20:36 acr4 joined #git
20:37 star_prone joined #git
20:37 jeffreylevesque joined #git
20:38 cdown_ joined #git
20:38 mns joined #git
20:40 pneuma joined #git
20:41 energizer I committed, changed some files and then deleted them by accident. Is there a way I can recover the files as they were after the changes, before the delete?
20:41 energizer i didnt stage them after changing them
20:45 godzirra joined #git
20:45 myhau joined #git
20:46 yaewa joined #git
20:47 eka_ joined #git
20:48 GodEater joined #git
20:48 GodEater joined #git
20:48 rcn joined #git
20:49 swalladge joined #git
20:53 dob1 joined #git
20:54 dob1 hi, i miss something, i put  in .gitignore  file.dat commit the modified .gitignore but every time i modify file.dat git consider it
20:54 ResidentBiscuit joined #git
20:55 grawity yes, that's not how .gitignore works
20:56 energizer from the docs: A gitignore file specifies intentionally untracked files that Git should ignore. Files already tracked by Git are not affected; see the NOTES below for details.
20:56 energizer man gitignore
20:56 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
20:57 dob1 i got it
20:57 dob1 so i have to remove it
20:57 dob1 now i remember
20:58 dob1 how do i untrack the file?
20:59 energizer http://stackoverflow.com/questions/936249/stop​-tracking-and-ignore-changes-to-a-file-in-git
20:59 Salander27 joined #git
21:01 EmeraldExplorer joined #git
21:02 dob1 ty energizer
21:05 gajus is there a way to set the current working directory to whatever has been staged
21:05 gajus ignoring all the local changes?
21:06 jalopez joined #git
21:08 Lyqyd joined #git
21:08 mingrammer joined #git
21:12 star_prone joined #git
21:12 MattMaker joined #git
21:13 Doginal joined #git
21:13 Gsham joined #git
21:17 raijin joined #git
21:17 filcab joined #git
21:18 hue joined #git
21:24 star_prone joined #git
21:24 energizer joined #git
21:25 Cabanossi joined #git
21:26 nilg joined #git
21:26 energizer joined #git
21:27 raijin joined #git
21:27 aidalgol joined #git
21:27 energizer joined #git
21:29 energizer joined #git
21:30 e14 joined #git
21:32 energizer joined #git
21:32 star_prone joined #git
21:33 ahr3n joined #git
21:33 Cabanossi joined #git
21:34 energizer joined #git
21:35 e14_ joined #git
21:38 raijin joined #git
21:38 energizer1 joined #git
21:40 energizer joined #git
21:40 ojacobson joined #git
21:41 Cabanossi joined #git
21:43 moestevens joined #git
21:46 moestevens joined #git
21:57 boombatower joined #git
21:58 fahadash joined #git
22:02 mingrammer joined #git
22:07 mycyber joined #git
22:09 d0nn1e joined #git
22:09 elastix joined #git
22:13 a3Dman joined #git
22:16 cyphase joined #git
22:18 gajus no ..
22:18 gajus ?
22:19 [ADN] joined #git
22:22 energizer Is there such a thing as a hidden branch?
22:22 energizer How does git-WIP store work in progress branches?
22:23 Rodya_ joined #git
22:23 thiago there's no such thing
22:24 thiago if you publish it, it's public
22:25 energizer thiago: if i run git reflog show wip/master, i see all these wip commits. but in git branch, there's only master. Where is wip/master stored?
22:27 thiago it may be a branch that has been deleted
22:27 thiago but I thought branch deletion removed the reflog too
22:30 energizer In dropbox, any time i create, update, or delete a file, the change is recorded and saved to the cloud. This is the behavior I want from git. is there a way to do that?
22:31 grawity only with some outside automation
22:31 grawity e.g. I think sparkleshare does exactly that
22:32 thiago energizer: git commit every time you want it recorded
22:33 energizer thiago: that is an extra step in the workflow that i'd rather avoid
22:33 thiago energizer: then don't use git
22:37 gfixler1 joined #git
22:39 Vgr joined #git
22:41 navidr joined #git
22:41 duderonomy joined #git
22:43 mellernoia joined #git
22:45 mrBen2k2k2k_ joined #git
22:46 godzirra joined #git
22:46 Sazhen86 joined #git
22:47 mrBen2k2k2k____ joined #git
22:47 NeverDie joined #git
22:52 nivag joined #git
22:55 Lor_Zzz joined #git
22:56 Lor_ joined #git
22:56 mingrammer joined #git
23:00 moei joined #git
23:02 energizer joined #git
23:03 energizer joined #git
23:05 Goplat joined #git
23:07 energizer joined #git
23:17 MattMaker joined #git
23:19 boombatower joined #git
23:23 e14 joined #git
23:23 ffabi joined #git
23:26 raijin joined #git
23:28 nilg joined #git
23:29 Gsham joined #git
23:34 energizer joined #git
23:34 energizer joined #git
23:34 pmullin joined #git
23:35 energizer joined #git
23:36 energizer left #git
23:38 diogenese joined #git
23:41 myhau joined #git
23:44 ap0c joined #git
23:47 sangy joined #git
23:47 kyan joined #git
23:48 github595 joined #git
23:49 lvns joined #git
23:51 mingrammer joined #git
23:56 justanotheruser joined #git
23:59 minot joined #git
23:59 raijin joined #git

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