Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-05

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

All times shown according to UTC.

Time Nick Message
00:01 crapp joined #git
00:02 sctskw joined #git
00:03 hahuang65 joined #git
00:08 dietr1ch joined #git
00:11 imMute joined #git
00:11 gsingh joined #git
00:12 WaReZ joined #git
00:15 splitlip joined #git
00:18 JanC_ joined #git
00:18 BombStrike joined #git
00:19 sargas joined #git
00:22 edude03 joined #git
00:27 Rodya_ joined #git
00:29 Literphor joined #git
00:34 sctskw joined #git
00:35 qpdb joined #git
00:38 thiago joined #git
00:39 rkazak joined #git
00:39 eletuchy joined #git
00:40 interne7y joined #git
00:45 mizu_no_oto joined #git
00:47 Literphor joined #git
00:47 nebodka joined #git
00:48 edude03 joined #git
00:48 digitalpeer joined #git
00:49 hahuang65 joined #git
00:50 nebodka joined #git
00:50 nebodka left #git
00:50 nebodka joined #git
00:52 nevodka joined #git
00:52 edude03 joined #git
00:54 JZA joined #git
00:54 kutsuya joined #git
00:56 MattMaker joined #git
00:58 Literphor joined #git
01:12 astrofog joined #git
01:13 Guest53203 joined #git
01:13 alex1a joined #git
01:13 TinkerTyper joined #git
01:15 nilg joined #git
01:15 Limes__ joined #git
01:16 jerematic joined #git
01:18 fstd_ joined #git
01:21 theskillwithin joined #git
01:21 Thorn__ joined #git
01:23 SwiftMatt joined #git
01:31 pks joined #git
01:35 hahuang65 joined #git
01:37 nvngpt31 joined #git
01:41 interne7y joined #git
01:42 jason237 joined #git
01:46 Blkt joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and hostage situations | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I will be executing hostages until there are more https://madeitwor.se/git-jokes
01:52 marchelzo joined #git
01:54 fscala joined #git
01:57 lindenle joined #git
01:59 arescorpio joined #git
01:59 m1dnight_ joined #git
02:04 MattMaker joined #git
02:12 m1dnight_ joined #git
02:14 hexagoxel joined #git
02:16 hahuang65 joined #git
02:18 MattMaker joined #git
02:21 chachasmooth joined #git
02:21 espindola joined #git
02:31 SporkWitch joined #git
02:31 SporkWitch joined #git
02:39 MattMaker joined #git
02:39 cd83x joined #git
02:41 arooni joined #git
02:42 interne7y joined #git
02:43 realz joined #git
02:47 SwiftMatt joined #git
02:48 eletuchy joined #git
02:50 italoacasas joined #git
02:57 hahuang65 joined #git
03:00 calamity_man joined #git
03:05 wxg joined #git
03:06 espindola joined #git
03:13 CheckDavid joined #git
03:14 myndzi joined #git
03:16 myndzi left #git
03:20 k3rn31 joined #git
03:23 mohabaks joined #git
03:25 Goplat` joined #git
03:28 banana_pancakes joined #git
03:29 son_ joined #git
03:31 star_prone joined #git
03:32 wiky joined #git
03:38 AndreSomers joined #git
03:38 son joined #git
03:39 venmx joined #git
03:43 interne7y joined #git
03:43 hahuang65 joined #git
03:44 jaguarmagenta joined #git
03:44 eletuchy joined #git
03:44 m1dnight_ joined #git
03:44 jaguarmagenta joined #git
03:44 GingerGeek joined #git
03:44 GingerGeek joined #git
03:46 ImJune joined #git
03:48 Korvin joined #git
03:48 Korvin joined #git
03:50 diegoaguilar joined #git
03:50 mohabaks joined #git
03:50 ohcibi joined #git
03:51 ThiefMaster joined #git
03:51 VampiricPadraig joined #git
03:51 Blkt joined #git
03:51 jaguarmagenta joined #git
03:52 gniourf joined #git
03:52 nvngpt31 joined #git
03:53 abec0 joined #git
03:54 clivejo joined #git
03:57 bauruine joined #git
03:59 sendq how can I trace the origin of a specific line of code?
04:00 franl joined #git
04:02 justanotheruser joined #git
04:02 k3rn31 joined #git
04:08 realz joined #git
04:09 cerberii joined #git
04:10 VampiricPadraig joined #git
04:10 VampiricPadraig joined #git
04:10 ohcibi joined #git
04:10 ffabi joined #git
04:11 Chinorro joined #git
04:12 clivejo joined #git
04:14 JZA joined #git
04:16 dreiss joined #git
04:18 jerematic joined #git
04:20 lindenle joined #git
04:25 Cabanossi joined #git
04:30 mizu_no_oto joined #git
04:30 claudiop joined #git
04:33 claudiop Hi. So Im working on a project with a colleague, and it happens that we're both git newbs. My colleague replaced a bunch of functions with alternative versions. I told him to use a branch, but he got it committed to master. Im working on master, and have locally like 5 commits more than the repo where his commits are
04:33 claudiop How can I move his last ~5 commits to another branch and then make mine master?
04:35 claudiop Lets say I want to move every commit from commit abcdef to the branch 'Experimental' without pulling those commits (they would override mine)
04:35 claudiop What would be the proper way?
04:36 xcesariox joined #git
04:39 ucup88 joined #git
04:41 watabou joined #git
04:41 eletuchy joined #git
04:41 nilg joined #git
04:42 franl claudiop, never dealt with that, but maybe this will help: https://git-scm.com/book/en/​v2/Git-Basics-Undoing-Things
04:43 tufflax joined #git
04:44 interne7y joined #git
04:44 claudiop franl, thanks :)
04:45 dreiss joined #git
04:47 languitar joined #git
04:47 franl A brute force kind of approach would be to save your commit diffs as patches (git diff COMMIT > COMMIT.patch), checkout the version of the repo before your friend made his commits, commit it, then apply the patches and commit again.  End result: your friend's commits are gone.
04:48 franl But your commits are there.  Do it in your local repo before you push to the remote, so you can do diffs to be sure it's right.
04:49 franl Better: do it in a copy of the local repo that you can delete before pushing in case you screw it up.
04:49 claudiop Ofc, im just being cautious because don't want any data lost. I know git has a lot of safety nets, but when my intentions are to delete I guess I'll have to be cautious
04:50 franl If you copy your local repo, and work in the copy, nothing persists until you push.  Worst case, you delete the copy and start over.
04:50 claudiop Other thing I'm thinking about is to move my commits to a branch, pull my friend's commits, move them to another branch, and move mine back to master
04:50 franl Distributed version control, FTW!
04:51 rgrinberg joined #git
04:53 _nadim joined #git
04:58 pR0Ps joined #git
05:00 jaguarmagenta joined #git
05:01 narendraj9 joined #git
05:02 MattMaker joined #git
05:10 nvngpt31 joined #git
05:13 romerocesar joined #git
05:16 eletuchy joined #git
05:18 lindenle joined #git
05:19 jerematic joined #git
05:21 romerocesar joined #git
05:25 MattMaker joined #git
05:25 jaguarmagenta joined #git
05:26 pR0Ps joined #git
05:26 jaguarma_ joined #git
05:27 Padawan joined #git
05:29 SJr joined #git
05:29 romerocesar joined #git
05:30 star_prone joined #git
05:33 hahuang65 joined #git
05:34 nilg joined #git
05:36 SJr joined #git
05:36 gau_ joined #git
05:39 _ikke_ claudiop: Did he push the changes already?
05:40 romerocesar_ joined #git
05:40 claudiop _ikke_, yeah, but I managed to fix manually by picking the commits into appropriate branches
05:41 claudiop Ofc that will require a forced push, but since this is sort of private it doesn't really matter
05:43 SJr joined #git
05:47 phanimahesh Sorry, i'm out of the loop. Why did Eugene kick _ikke_ ?
05:47 t0by joined #git
05:50 romerocesar joined #git
05:53 romerocesar_ joined #git
05:55 dietr1ch joined #git
05:55 Padawan left #git
05:57 Repox joined #git
05:58 blackwind_123 joined #git
06:00 romerocesar joined #git
06:03 romerocesar_ joined #git
06:05 _ikke_ phanimahesh: joke
06:05 _ikke_ see topic
06:07 piling joined #git
06:07 ucup88 left #git
06:07 fscala joined #git
06:07 ochorocho__ joined #git
06:09 idmistir_ joined #git
06:10 eletuchy joined #git
06:13 phanimahesh Ah. Missed it.
06:14 phanimahesh _ikke_: Thanks
06:14 toogley joined #git
06:17 phaleth joined #git
06:17 SJr joined #git
06:22 eletuchy joined #git
06:33 lindenle joined #git
06:36 shiriru joined #git
06:40 idmistir_ left #git
06:40 eletuchy joined #git
06:42 eletuchy_ joined #git
06:42 wxg joined #git
06:44 edude03 joined #git
06:44 wrouesnel1 joined #git
06:44 eletuch__ joined #git
06:45 subhojit777 joined #git
06:45 interne7y joined #git
06:47 Psychiatrist joined #git
06:47 eletuchy joined #git
06:48 faux___ joined #git
06:49 radsy joined #git
06:51 eletuchy_ joined #git
06:51 MrWoohoo joined #git
06:52 eletuch__ joined #git
06:53 nilsi joined #git
06:55 d4rklit3 joined #git
06:58 emPi joined #git
07:00 sv0 joined #git
07:00 Fijit joined #git
07:04 CJKinni joined #git
07:06 tristanp_ joined #git
07:07 nichi_ joined #git
07:07 jstimm_ joined #git
07:09 skakelaar joined #git
07:10 tvw joined #git
07:12 JZA joined #git
07:14 son joined #git
07:15 diogenese joined #git
07:16 Guest9 joined #git
07:17 CJKinni joined #git
07:19 Lynxium joined #git
07:22 linkon1 joined #git
07:24 pungi-man joined #git
07:28 settermjd joined #git
07:30 eletuchy joined #git
07:31 romerocesar joined #git
07:31 ahmedelgabri joined #git
07:32 eletuchy_ joined #git
07:33 nnyk_ joined #git
07:33 nichi_ joined #git
07:34 SwiftMatt joined #git
07:35 eletuchy joined #git
07:36 romerocesar_ joined #git
07:36 narendraj9 joined #git
07:37 nick123_ joined #git
07:43 romerocesar joined #git
07:44 slappymcfry joined #git
07:46 interne7y joined #git
07:46 romerocesar_ joined #git
07:47 eletuchy joined #git
07:48 narendraj9 joined #git
07:49 eletuchy_ joined #git
07:50 toogley joined #git
07:51 eletuch__ joined #git
07:53 King_Hual joined #git
07:53 King_Hual joined #git
07:53 cyan__ joined #git
07:54 eletuchy joined #git
07:54 romerocesar joined #git
07:55 p1k joined #git
07:55 p1k how do I show insertions/deletions with git log --pretty="format:" it doesn't seem to be in the docs here: https://git-scm.com/docs/pretty-formats
07:56 eletuchy_ joined #git
07:58 radicate joined #git
07:58 romerocesar_ joined #git
07:59 radicate I'm developing an extension for a web ecommerce system called Magento. I have tons of folders I'd like to ignore - isn't there an elegant way of doing that instead of writing millions of lines of including / excluding?
07:59 radicate I simply want to ignore everything but 3 directories
07:59 blackwind_123 joined #git
08:00 jhass * !one/ !two/ !three/ iirc
08:00 gitinfo [!anyone] Usually, it does not help to ask for someone specific to help you. Without knowing your specific problem, nobody knows if they can be of assistance. Please ask your questions and wait until somebody speaks up.
08:00 gitinfo [!doesntwork] Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...
08:00 jhass oO
08:00 jhass ignore those ;)
08:01 radicate jhass: The directories I want to track aren't at the project root but deep down specific paths
08:01 radicate For example, app/code/Radicate
08:01 hahuang65 joined #git
08:01 radicate I want to track Radicate, but not anything in the app or code directories
08:02 radicate Seems like I have to follow the path and write: app/* app/code/* and then !app/code/Radicate/
08:02 gitinfo [!cant_happen] The scenario you describe does not add up, and/or we feel it is unlikely that there is such a fundamental bug that it could have happened like this. Please provide more detail: what commands (literally!) did you run, what did they say, and what did you expect instead?
08:04 jhass yeah
08:05 radicate Why can't I just go * and then simply !app/code/Radicate/
08:05 gitinfo [!cant_happen] The scenario you describe does not add up, and/or we feel it is unlikely that there is such a fundamental bug that it could have happened like this. Please provide more detail: what commands (literally!) did you run, what did they say, and what did you expect instead?
08:05 radicate Ugh this bot
08:05 hekto joined #git
08:05 p1k can't ?
08:05 jhass git help gitignore explains ;)
08:05 jhass it'd be too slow
08:15 f3r70rr36f joined #git
08:15 timewalker joined #git
08:16 radicate p1k: can't.
08:18 p1k radicate: I was seeing whether the bought reacted on can't !I'm not sure what it's based one now
08:19 p1k random bot?
08:19 radicate Suppose so haha
08:19 star_prone joined #git
08:20 radicate Or someone is triggering it intentionally ;)
08:20 p1k radicate: anyways you want to do what jhass suggested probably
08:20 radicate Still kind of refuses to function as I want it to, I'll try to show what happens in a pastebin or something
08:21 jerematic joined #git
08:21 jhass p1k: it triggered on ! app without the space, since that's part of "cant_happen"
08:23 p1k what kind of weird regex is that?
08:24 SteffanW joined #git
08:25 cyan__ joined #git
08:25 Psychiatrist joined #git
08:29 jhass non?
08:33 piling_ joined #git
08:35 Grzerzok joined #git
08:36 phanimahesh hahahah. Tripping up gitinfo is fun.
08:37 phanimahesh And guessing why it did that
08:37 eletuchy joined #git
08:37 phanimahesh !lol
08:37 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
08:37 phanimahesh I found a new pastime.
08:38 phanimahesh !aww
08:40 eletuchy_ joined #git
08:42 eletuchy joined #git
08:42 nilsi joined #git
08:44 ciampix joined #git
08:44 wxg joined #git
08:45 radicate Any major differences between git version 1.8 and 2.7 in gitignore syntax?
08:45 radicate Well not syntax, functionality maybe
08:47 JustinHitla joined #git
08:47 interne7y joined #git
08:47 JustinHitla why is github so ubiquitous, is it because it was created by linux torwalds ?
08:47 guardian joined #git
08:48 jhass github wasn't, git was
08:48 infra-red joined #git
08:49 JustinHitla but GitHum is related to git, no ?
08:50 ffabi joined #git
08:50 romerocesar joined #git
08:50 jhass no idea what GitHum is, Github is code collaboration platform/project hosting platform using git
08:51 JustinHitla GitHub
08:51 JustinHitla so, why is GitHub so ubiquiotus ?
08:51 JustinHitla there is also BitBacket but its not as popular as GitHub right ?
08:51 VampiricPadraig joined #git
08:51 ohcibi joined #git
08:51 Chinorro joined #git
08:52 jhass right time, right place, right things at that time?
08:53 jhass happened to get a critical mass, so you also have a network effect akin to social networks
08:54 robotroll joined #git
08:54 JustinHitla so its like Linus created linus it became popular, then Linus created git and because git was made by creator of linux it become popular and because GitHub based on git it also become popular, is that a chain of reasoning behing popularity of GitHub ?
08:54 bauruine joined #git
08:54 JustinHitla Linus created linux
08:55 jhass it's probably wrong to deny an influence in that direction, but I don't anyone can pinpoint it to a single reason
08:55 jhass *don't think
08:56 jhass I mean everybody is using google, yet google died. Popularity rarely makes good measure in isolation
08:56 jhass *google code
08:58 UbuntuDude joined #git
08:59 UbuntuDude I made git rm -rf * but I still see stuff when I make git branch .. how to wipe the entire history and files of a repo?
08:59 jhass UbuntuDude: easier to just make a new one, no?
09:00 {AS} joined #git
09:00 UbuntuDude yes but I want to the delete the current
09:01 UbuntuDude isn't that possible?
09:01 jhass sure, but why?
09:01 UbuntuDude another question is it possible to create and push to a remote github repo at once?
09:01 jhass the best solution depends a bit on your exact context
09:01 linkon1 left #git
09:02 jhass write yourself an alias?
09:02 jhass or function
09:02 UbuntuDude can I push the new locally created repo directly to github without having to do anything with github page?
09:03 eletuchy joined #git
09:03 jhass https://github.com/github/hub
09:03 jhass hub create
09:05 choki joined #git
09:07 UbuntuDude jhass: I take the answer as NO since I need another application to do .. I was more into asking about git capabilities rather than finding a solution to a problem.
09:08 UbuntuDude thanks for your answer
09:08 jhass github uses git, not the other way around
09:09 Zarthus I'm not sure if Linus would survive if github was marked as a dependency of git
09:11 Psychiatrist joined #git
09:12 roentgen joined #git
09:15 dharrigan joined #git
09:17 sebhoss joined #git
09:17 catsup joined #git
09:19 clemf joined #git
09:21 narendraj9 joined #git
09:21 radicate So I have a difference in how the gitignore works between two machines, described here - http://pastebin.com/8VTBZXKQ any help is welcome
09:21 UbuntuDude jhass: since git uses github, I was thinking it's capable of push local repo directly on it without having to create from webapp interface.
09:22 jhass UbuntuDude: it does not. github uses git.
09:22 TomyLobo joined #git
09:24 jhass radicate: well the 2.8 is exactly like my git help gitignore describes it
09:25 radicate jhass: Well then what should I do for it to function as it does on 2.7?
09:25 elsevero joined #git
09:25 JustinHitla left #git
09:26 ochorocho__ joined #git
09:26 jhass /app/core/Mage/* and !/app/code/core/Mage/
09:26 jhass eh, /app/core/ and !/app/code/core/Mage/
09:27 jhass you get what I mean -.-
09:27 faux___ joined #git
09:27 faux___ joined #git
09:28 netj joined #git
09:33 mdw joined #git
09:33 ahmedelgabri joined #git
09:36 lindenle joined #git
09:37 joki joined #git
09:38 blackwind_123 joined #git
09:39 domgetter joined #git
09:40 HerrThees joined #git
09:40 mohabaks joined #git
09:42 UbuntuDude how to go about understanding this kind of git notation "@@ -0,0 +1 @@" "@@ -1 +1 @@" .. what should I read exactly?
09:43 Grzerzok joined #git
09:43 leeN joined #git
09:44 choki joined #git
09:46 romerocesar joined #git
09:46 natefur joined #git
09:47 frogonwheels UbuntuDude: for diffs?  that's probably man diff
09:47 bremner in particular, a search for "unified diff" will help
09:48 interne7y joined #git
09:49 xcesariox joined #git
09:50 ceaucari joined #git
09:50 CJKinni joined #git
09:50 UbuntuDude frogonwheels: not man pages again please ,, I'm having a hard time trying to decrypt this code from git man page to understand the difference between push and push -u
09:51 UbuntuDude -u --set-upstream .. For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands. For more information, see branch.<name>.merge in git-config[1].
09:52 nwkj86 joined #git
09:56 aard_ joined #git
09:56 Thorn__ joined #git
09:59 radicate How can I see a git status that displays all the files that are untracked under directories as well?
10:00 nidr0x joined #git
10:00 vjacob joined #git
10:01 santa-fire joined #git
10:06 domgetter frogonwheels: diff's man page doesn't talk about the @@ notation
10:07 domgetter UbuntuDude: that's just the notation for describing what's different between two versions of a file.  One of the numbers is the number line, one of the numbers is the amount of new lines, another number is the amount of removed lines.  Did you want to know which was which?  No one really reads those too closely except maybe to know what line number in the file.
10:10 j416 radicate: man git-config search for showUntrackedFiles
10:10 gitinfo radicate: the git-config manpage is available at http://jk.gs/git-config.html
10:14 phanimahesh UbuntuDude: Patience and practice.
10:15 phanimahesh UbuntuDude: The snippet you posted means this: If you use -u, for future pushes if you simply say git push, it will remember the current remote and branch targets
10:16 CJKinni joined #git
10:16 romerocesar_ joined #git
10:16 phanimahesh argument-less git-pull means simply git pull, without specifying remote and branch. similarly `git push` without remote and branch.
10:17 phanimahesh The man page is being helpful by explaining how this works. Internally, git adds a tracking reference that says this local branch is tracking this remote branch from this remote.
10:18 nnyk_ joined #git
10:19 j416 and it's not really internally either -- it just puts it in .git/config (examine it before and after)
10:20 fscala joined #git
10:20 bremner UbuntuDude: https://en.wikipedia.org/wiki​/Diff_utility#Unified_format
10:20 phanimahesh Yep. Everything in git is simple plain text. Some of it is compressed for saving space.
10:24 clivejo joined #git
10:29 romerocesar joined #git
10:30 nilsi joined #git
10:35 phanimahesh joined #git
10:38 nwkj86 joined #git
10:41 ome joined #git
10:43 leonarth_ joined #git
10:46 mangolisk_ joined #git
10:46 EmployeeNumberSe joined #git
10:47 mischat_ joined #git
10:47 robotrolll joined #git
10:49 kaendfinger_ joined #git
10:49 interne7y joined #git
10:49 nick123 joined #git
10:49 LoganG_ joined #git
10:49 paperziggurat_ joined #git
10:49 diprotic joined #git
10:49 diprotic joined #git
10:50 ffabi_ joined #git
10:50 Zoddo joined #git
10:50 leonarth_ left #git
10:50 contracode_ joined #git
10:50 moop_ joined #git
10:50 sonOfRa_ joined #git
10:50 shennyg_ joined #git
10:50 tcsc_ joined #git
10:50 ELLIOTTCABLE_ joined #git
10:50 iota_pi_ joined #git
10:50 deavidsedice joined #git
10:50 AntiNoisyBot left #git
10:50 VampiricPadraig_ joined #git
10:50 ohcibi_ joined #git
10:51 Fijit2 joined #git
10:51 Zoddo left #git
10:51 Blkt_ joined #git
10:51 Aerosonic_ joined #git
10:51 ELLIOTTCABLE_ joined #git
10:51 kjnilsson_ joined #git
10:51 BinGOs_ joined #git
10:51 attente_ joined #git
10:52 Fiouz joined #git
10:52 ELLIOTTCABLE_ joined #git
10:52 ruben-ikmaak joined #git
10:52 xai_ joined #git
10:52 mns_ joined #git
10:53 ELLIOTTCABLE_ joined #git
10:53 sitaram_ joined #git
10:53 nb-ben joined #git
10:53 brewmast1r joined #git
10:53 mwleeds_ joined #git
10:53 Seveas_ joined #git
10:53 chadi_ joined #git
10:53 Soliton_ joined #git
10:53 and_i joined #git
10:53 piling joined #git
10:53 mrkat joined #git
10:53 bittin joined #git
10:53 SporkWitch joined #git
10:53 jab416171_ joined #git
10:53 tabakhase__ joined #git
10:53 Lulzon joined #git
10:53 rasto joined #git
10:53 santa-fire what
10:53 santa-fire the
10:53 santa-fire heck is goin on
10:54 bipolar_ joined #git
10:54 ilogger2 joined #git
10:54 pR0Ps joined #git
10:54 _W_ joined #git
10:54 sim642 joined #git
10:54 boudiccas joined #git
10:54 ELLIOTTCABLE_ joined #git
10:54 toydestroyer joined #git
10:54 sebhoss joined #git
10:54 eggoez joined #git
10:54 bremner joined #git
10:54 bremner joined #git
10:55 jave joined #git
10:55 greymalkin joined #git
10:55 Cerise joined #git
10:55 Cerise joined #git
10:55 martinklepsch joined #git
10:55 biertie joined #git
10:55 bittyx joined #git
10:55 msonntag joined #git
10:55 zifnab joined #git
10:55 hahuang65 joined #git
10:55 SegFaultAX joined #git
10:55 nichi_ joined #git
10:56 Bucciarati joined #git
10:56 hide joined #git
10:56 Xe joined #git
10:56 ffabi joined #git
10:56 heinrich5991 joined #git
10:56 lunarmage joined #git
10:56 ecraven joined #git
10:56 pelegreno_ joined #git
10:57 Liam` joined #git
10:57 Internet13 joined #git
10:57 tmz joined #git
10:59 EvilDMP joined #git
10:59 bittin_ joined #git
10:59 ThiefMaster joined #git
10:59 gkatsev_ joined #git
10:59 jhasse joined #git
10:59 phanimah1sh joined #git
11:00 SupaHam joined #git
11:00 mrkat joined #git
11:00 up_the_irons joined #git
11:00 Arokh joined #git
11:00 felher joined #git
11:00 ochorocho__ joined #git
11:00 bsanford joined #git
11:00 danieli joined #git
11:00 garethdaine joined #git
11:01 SporkWitch joined #git
11:01 nickthetait joined #git
11:01 k-man joined #git
11:02 MLM joined #git
11:02 creppe joined #git
11:02 ToeSnacks joined #git
11:02 haasn joined #git
11:03 haaja joined #git
11:03 nezZario joined #git
11:03 roentgen joined #git
11:04 armenzg joined #git
11:04 illusionmedic joined #git
11:05 ahmedelgabri joined #git
11:06 leonarth_ joined #git
11:08 monoxane santa-fire, adams.freenode.net went down, probs a DDOS
11:08 santa-fire what?
11:08 santa-fire what do you say to me?
11:09 santa-fire *why do you
11:09 monoxane <santa-fire> what
11:09 monoxane <santa-fire> the
11:09 monoxane <santa-fire> heck is goin on
11:09 santa-fire ah yes
11:09 santa-fire I did
11:09 santa-fire oh
11:09 monoxane the server died
11:09 monoxane then came back
11:09 monoxane thus many join/parts
11:09 santa-fire oh gosh
11:10 spudowiar joined #git
11:10 BinGOs_ left #git
11:11 BinGOs joined #git
11:17 linuxmodder joined #git
11:19 TheBrayn joined #git
11:19 linuxmodder joined #git
11:20 fahadash joined #git
11:22 skasturi joined #git
11:23 linuxmodder- joined #git
11:24 jerematic joined #git
11:25 ohcibi joined #git
11:25 ExeciN joined #git
11:26 CJKinni joined #git
11:27 piling joined #git
11:27 clivejo joined #git
11:30 danieli joined #git
11:35 |meta joined #git
11:35 romerocesar_ joined #git
11:37 hahuang65 joined #git
11:38 Chinorro joined #git
11:38 nemesit|znc joined #git
11:40 synchronous joined #git
11:41 bauruine joined #git
11:41 gsingh joined #git
11:42 Hobbyboy|BNC joined #git
11:42 VoidFox joined #git
11:43 antispaceman joined #git
11:44 AlexanderS joined #git
11:46 romerocesar joined #git
11:48 sea-gull joined #git
11:50 interne7y joined #git
11:51 dr_lepper joined #git
11:51 synthmeat joined #git
11:51 rahtgaz joined #git
11:52 UTAN_dev joined #git
11:56 Ph_ joined #git
11:56 glandium joined #git
11:58 slappymcfry joined #git
12:00 CheckDavid joined #git
12:01 WayToDoor joined #git
12:05 xcesariox joined #git
12:06 sLite joined #git
12:06 WayToDoor joined #git
12:09 py_me joined #git
12:12 ncd|leeN joined #git
12:13 sdothum joined #git
12:17 thalleralexander joined #git
12:17 subhojit777 joined #git
12:18 hahuang65 joined #git
12:18 Ph_ joined #git
12:23 fracting joined #git
12:25 thiago joined #git
12:28 romerocesar_ joined #git
12:28 CJKinni joined #git
12:28 ensyde joined #git
12:32 Dyonisos joined #git
12:38 satifant joined #git
12:41 Orbitrix joined #git
12:42 watabou joined #git
12:43 anberg joined #git
12:47 CJKinni joined #git
12:47 calamity_man left #git
12:47 _0xbadc0de joined #git
12:48 bathtub_shark joined #git
12:49 watersoul joined #git
12:51 interne7y joined #git
12:51 espindola joined #git
12:51 m_antis joined #git
12:51 mdw_ joined #git
12:51 bibek joined #git
12:51 bibek hi everyone
12:51 gitinfo bibek: 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.
12:52 bibek so, i want to ignore files in  ~/.cache/ directory. what would the syntax be?
12:52 bibek */.cache/    this would work? it doesn't seem to
12:54 bremner bibek: is your home directory a git repo?
12:54 bremner (that's a terrible idea, IMHO, but nevermind, you didn't ask that)
12:55 bibek just for an example.
12:55 bittin_ joined #git
12:55 ImJune joined #git
12:58 bremner sorry, I can't understand the question then.
13:00 bibek supposing ~ is a git repo and i want to ignore all files within ~/.cache/ directory. what would the relevant line be on my ~/.gitignore file?
13:00 j416 bibek: .cache/
13:01 bibek okay. thanks. i could also get similar result with a line having just *  in ~/.cache/.gitignore?
13:01 j416 similar.
13:02 j416 bibek: man gitignore
13:02 gitinfo bibek: the gitignore manpage is available at http://jk.gs/gitignore.html
13:03 m1dnight_ joined #git
13:04 ahmedelgabri joined #git
13:04 bibek firefox warns me about that page. "your connection is not secure"
13:04 hahuang65 joined #git
13:05 JJM joined #git
13:05 bibek i have the manual locally. o/
13:05 m1dnight_ joined #git
13:07 romerocesar joined #git
13:11 domgetter bibek: */.cache/ would ignore everything that ends with "/.cache/" instead of everything that begins with it
13:12 bibek got it. yeah.
13:13 m1dnight_ joined #git
13:14 nwkj86 joined #git
13:15 vjacob joined #git
13:16 romerocesar_ joined #git
13:16 ynanm joined #git
13:18 m1dnight_ joined #git
13:18 hahuang65 joined #git
13:21 m1dnight_ joined #git
13:23 livingstn joined #git
13:23 m1dnight_ joined #git
13:25 jerematic joined #git
13:29 thalleralexander joined #git
13:34 m1dnight_ joined #git
13:35 howdoi joined #git
13:38 lindenle joined #git
13:40 acetakwas joined #git
13:42 m1dnight_ joined #git
13:42 livingstn joined #git
13:42 Cassiopaya joined #git
13:44 IlNominePatre joined #git
13:49 vjacob joined #git
13:49 Ph_ joined #git
13:50 m1dnight_ joined #git
13:51 interne7y joined #git
13:55 toogley joined #git
13:57 tematibr joined #git
14:02 sargas joined #git
14:03 sargas joined #git
14:05 CJKinni joined #git
14:05 son joined #git
14:07 Reda joined #git
14:08 hahuang65 joined #git
14:09 romerocesar joined #git
14:09 hikka joined #git
14:09 ahmedelgabri joined #git
14:10 madewokherd joined #git
14:10 livingstn joined #git
14:11 espindola joined #git
14:11 rgrinberg joined #git
14:14 BenderRodriguez joined #git
14:15 Reda joined #git
14:16 BSAlb joined #git
14:16 romerocesar_ joined #git
14:18 przemoc joined #git
14:19 cdown joined #git
14:19 faux___ joined #git
14:20 AfroThundr joined #git
14:21 jost_ joined #git
14:21 TomyLobo joined #git
14:23 Pulp joined #git
14:23 ajf- joined #git
14:29 Robdgreat joined #git
14:29 CEnnis91 joined #git
14:30 romerocesar joined #git
14:31 rgrinberg joined #git
14:32 desm joined #git
14:33 UbuntuDude left #git
14:36 desm anyone know of a good resource explaining the difference between subtree and submodule (examples and/or use cases would be nice too)
14:37 qsx !subrepo
14:37 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
14:42 NeverDie joined #git
14:42 GavinMagnus joined #git
14:44 espindola joined #git
14:45 Tsutsukakushi joined #git
14:47 dreiss joined #git
14:49 mns_ left #git
14:49 hahuang65 joined #git
14:50 italoacasas joined #git
14:50 hikka joined #git
14:50 mns joined #git
14:51 pungi-man !subtre
14:51 gitinfo [!subtree] 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-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
14:51 pungi-man !subtree
14:52 GavinMagnus joined #git
14:52 interne7y joined #git
14:53 edude03 joined #git
14:55 nnyk_ joined #git
14:56 romerocesar_ joined #git
15:03 Tsutsukakushi joined #git
15:04 circ-user-ioOlp joined #git
15:04 lolo_ joined #git
15:05 hikka joined #git
15:05 CJKinni joined #git
15:06 santa-fire joined #git
15:06 hikka joined #git
15:06 romerocesar joined #git
15:08 hikka joined #git
15:09 Tecan joined #git
15:16 Limes__ joined #git
15:17 diegoviola joined #git
15:19 GavinMagnus left #git
15:21 cdown joined #git
15:21 jab416171 joined #git
15:22 toogley joined #git
15:23 xorox90 joined #git
15:27 jerematic joined #git
15:31 hahuang65 joined #git
15:31 diegoaguilar joined #git
15:32 elastix joined #git
15:33 Padawan joined #git
15:35 unbalancedparen joined #git
15:35 ajf- joined #git
15:36 Padawan Hey, i cloned this repo from github and i have been using it. Now i see there is a pull request on github, do i have access to that commit?
15:36 romerocesar_ joined #git
15:37 Padawan I i wish to use a pull request that havent been merged yet, is that possible, and how?
15:39 synthmeat joined #git
15:40 jhass Padawan: you can add the fork the PR originates from as a remote (git help remote) and fetch it (git help fetch), or use https://github.com/github/hub and hub checkout url_to_pr
15:41 koro according to github you can do git fech origin pull/ID/head:BRANCHNAME where ID is the pull request id
15:41 koro s/fech/fetch
15:42 livingstn joined #git
15:43 Panacea joined #git
15:44 Tecan left #git
15:44 raijin joined #git
15:45 watabou joined #git
15:46 santa-fire joined #git
15:49 mdw joined #git
15:52 Reda joined #git
15:54 interne7y joined #git
15:55 elastix joined #git
15:56 ynanm joined #git
16:00 phanimahesh joined #git
16:00 Gitzilla joined #git
16:02 phanimah1sh joined #git
16:03 JSharpe joined #git
16:04 screamingFemales joined #git
16:06 screamingFemales left #git
16:06 cyan__ joined #git
16:06 Reda joined #git
16:06 CJKinni joined #git
16:08 Lunatrius joined #git
16:08 franl joined #git
16:08 nnyk joined #git
16:09 xorox90 joined #git
16:11 wwwald joined #git
16:11 dharrigan joined #git
16:12 Ahmed90 joined #git
16:14 ahmedelgabri joined #git
16:15 jaguarmagenta joined #git
16:16 acetakwas joined #git
16:16 romerocesar joined #git
16:17 xorox90 joined #git
16:19 pflanze joined #git
16:19 pflanze Hey. If I want to pull from say 'origin' but push to 'foo' by default, what do I need to change in the config?
16:21 Lynxium[] joined #git
16:24 pflanze ah found http://stackoverflow.com/questions/20425333​/how-to-set-default-push-repository-in-git
16:24 pflanze pushurl = ...
16:24 eric joined #git
16:26 hardenedapple joined #git
16:26 col joined #git
16:28 jerematic joined #git
16:28 hardenedapple Does anyone know what the error "More than one commit to dig from" means? A quick google search didn't pick anything up.
16:29 npo1 joined #git
16:30 hardenedapple nvm -- a better google search did pick something up
16:31 leeN joined #git
16:31 charolastra_____ joined #git
16:31 hardenedapple I was using the -L option that apparently needs to start from one commit, while I was using an alias for log that used the '--all' option.
16:32 edude03 joined #git
16:32 JZA joined #git
16:35 m0viefreak joined #git
16:35 zivester joined #git
16:37 romerocesar_ joined #git
16:38 aard_ joined #git
16:38 CJKinni joined #git
16:38 SwiftMatt joined #git
16:39 Limes_ joined #git
16:41 edude03 joined #git
16:43 eletuchy joined #git
16:45 edude03 joined #git
16:46 lolo_ joined #git
16:46 SteffanW joined #git
16:47 romerocesar joined #git
16:48 tgies joined #git
16:52 edude03 joined #git
16:54 tgies joined #git
16:55 diogenese joined #git
16:56 dfr33zy joined #git
16:56 timewalker joined #git
16:57 timewalker joined #git
16:58 dietr1ch joined #git
16:58 jaguarmagenta joined #git
16:58 tgies joined #git
16:59 tgies joined #git
17:01 TiagoEDGE joined #git
17:02 livingstn joined #git
17:02 tiagoedge_ joined #git
17:02 anberg joined #git
17:03 Limes__ joined #git
17:03 santa-fire How to update my cloned repo from remote repo?
17:03 santa-fire in github desktop or terminal.
17:04 jhass git pull
17:04 tgies joined #git
17:05 santa-fire thanks
17:05 Limes_ joined #git
17:07 sv0 joined #git
17:08 catsup joined #git
17:08 romerocesar_ joined #git
17:09 cyan__ joined #git
17:09 tgies joined #git
17:09 {AS} joined #git
17:11 cdown joined #git
17:11 toogley joined #git
17:13 irco joined #git
17:13 mehola joined #git
17:14 mdw joined #git
17:15 Noldorin joined #git
17:15 tgies joined #git
17:15 mdw_ joined #git
17:17 romerocesar joined #git
17:17 GavinMagnus joined #git
17:17 ahmedelgabri joined #git
17:20 tgies joined #git
17:21 mdw joined #git
17:22 _vyscond joined #git
17:23 watabou joined #git
17:23 katharee joined #git
17:25 Gloomy joined #git
17:25 Reda joined #git
17:27 waldowalden joined #git
17:29 ajf- joined #git
17:30 tgies joined #git
17:30 illusionmedic left #git
17:31 romerocesar joined #git
17:33 _vyscond joined #git
17:35 tgies joined #git
17:36 d4rklit3 joined #git
17:36 netj joined #git
17:37 romerocesar_ joined #git
17:37 denimsoft joined #git
17:37 slick joined #git
17:39 GavinMagnus joined #git
17:42 dreiss joined #git
17:43 sv0 joined #git
17:43 mdw_ joined #git
17:44 edude03 joined #git
17:44 mdw_ joined #git
17:45 tgies joined #git
17:45 romerocesar joined #git
17:45 Padawan koro: the id is the long id righ?
17:46 mischat joined #git
17:46 CEnnis91 joined #git
17:47 Padawan So i have this pull request and i wish i coudl see it locally: https://github.com/zsh-users/​zsh-autosuggestions/pull/150
17:48 romerocesar_ joined #git
17:49 thiago download it and see it locally
17:49 osse Padawan: the id is 150
17:50 tgies joined #git
17:51 ahmedelgabri joined #git
17:54 eletuchy joined #git
17:54 Padawan ty osse
17:55 HenriettaSalt joined #git
17:55 tgies joined #git
17:55 interne7y joined #git
17:57 Goplat joined #git
17:58 romerocesar joined #git
17:59 zarel joined #git
17:59 mehola joined #git
18:00 tgies joined #git
18:02 Sleepy63 joined #git
18:03 mehola joined #git
18:05 Grimm_ joined #git
18:05 tgies joined #git
18:07 claudiop joined #git
18:09 _nadim joined #git
18:10 tgies joined #git
18:12 zincrokx joined #git
18:13 ajf- joined #git
18:13 c0ded joined #git
18:14 reim joined #git
18:15 miahuoe joined #git
18:15 Gitzilla joined #git
18:17 netj joined #git
18:17 rkazak joined #git
18:19 nilsi joined #git
18:20 tgies joined #git
18:21 noodle joined #git
18:22 mellernoia joined #git
18:25 tgies joined #git
18:27 Fr4n joined #git
18:27 CJKinni joined #git
18:28 mdw joined #git
18:30 dreiss joined #git
18:30 tgies joined #git
18:34 miahuoe left #git
18:34 multi_io joined #git
18:35 star_prone joined #git
18:35 tlolczyk joined #git
18:35 tgies joined #git
18:36 FunkyAss joined #git
18:37 tlolczyk Anyone make a recommendation of a git prompt for bash and zsh?
18:37 qsx git has something for bash in contrib
18:37 tlolczyk Well something that is similar in bash and zsh.
18:39 eletuchy_ joined #git
18:41 lindenle joined #git
18:41 eletuchy joined #git
18:43 eletuch__ joined #git
18:45 tgies joined #git
18:46 stevenbenner joined #git
18:46 eletuchy joined #git
18:48 eletuchy_ joined #git
18:50 d4rklit3 joined #git
18:50 tgies joined #git
18:50 paul424 joined #git
18:50 eletuch__ joined #git
18:53 nitin joined #git
18:54 eletuchy joined #git
18:54 osse tlolczyk: looks similar or *is* similar?
18:55 tgies joined #git
18:56 eletuchy_ joined #git
18:56 tlolczyk osse, likes similar but doesn't have to be the same.
18:56 interne7y joined #git
18:56 thiago why do you need it to be the same? Do you switch between the shells?
18:58 tlolczyk thiago, sometimes different accounts use different shells. In particular i use zsh for most accounts, but bash for root.
18:59 eletuchy joined #git
18:59 synthmeat joined #git
19:00 tlolczyk s/likes/looks/
19:02 d4rklit3 joined #git
19:02 eletuchy_ joined #git
19:04 Guest9 joined #git
19:04 eletuchy joined #git
19:05 tgies joined #git
19:06 romerocesar_ joined #git
19:06 eletuch__ joined #git
19:06 osse tlolczyk: take a look at vcs_info in man zshcontrib
19:06 osse there's a quickstart section
19:07 thiago tlolczyk: then it's a good reason NOT to have the same prompt
19:07 thiago you should never be confused that you're using root
19:07 thiago and you should probably not use git as root
19:08 franl joined #git
19:09 tlolczyk thiago, but some programs I develop have to be run as root. It's nice to know the status of what I am teting.
19:09 thiago right
19:09 thiago but don't commit as root
19:09 thiago therefore, the prompt is not useful
19:09 romerocesar joined #git
19:10 eletuchy joined #git
19:11 wald joined #git
19:11 osse tlolczyk: here's mine: https://asciinema.org/a/dwz0w1kq9yznlysuluaosu2tr  https://github.com/Osse/dotfil​es/blob/master/.zshrc#L56-L80
19:13 eletuchy_ joined #git
19:14 exarch joined #git
19:15 qsx thiago: what about keeping stuff in /etc under git?
19:15 qsx surely you don’t tell me that you edit around in /etc as user.
19:15 tgies joined #git
19:16 BenderRodriguez joined #git
19:16 eletuchy joined #git
19:16 katharee left #git
19:18 romerocesar joined #git
19:18 eletuch__ joined #git
19:20 eletuchy_ joined #git
19:20 tgies joined #git
19:21 romerocesar_ joined #git
19:23 thiago qsx: etckeeper
19:23 kus joined #git
19:23 qsx meh, yet another tool to learn
19:23 qsx i even keep some of the stuff in RCS
19:24 qsx ;; $Header: /var/nsd/zones/master/RCS/t23h.de.zone,v 1.4 2016/05/28 17:10:46 qsx Exp $
19:24 thiago rcs is fine
19:24 thiago cvs isn't
19:25 tgies joined #git
19:25 ajf- joined #git
19:27 nnyk joined #git
19:27 eletuchy joined #git
19:27 CJKinni joined #git
19:29 dreiss joined #git
19:30 cdown joined #git
19:30 jerematic joined #git
19:30 tgies joined #git
19:30 eletuchy_ joined #git
19:31 romerocesar joined #git
19:32 fracting joined #git
19:33 eletuchy joined #git
19:34 liquidjamm joined #git
19:35 tgies joined #git
19:36 eletuchy_ joined #git
19:38 eletuch__ joined #git
19:40 edude03 joined #git
19:40 barteks2x joined #git
19:40 tgies joined #git
19:42 Waskeend joined #git
19:44 barteks2x I somehow ended up with "Unmerged paths" when runnign git status, I was just going to add files to commit. What should I do with this and what does it actually mean? I didn't merge enything
19:44 Rodya_ joined #git
19:45 bremner did you run git pull?
19:45 tgies joined #git
19:45 barteks2x I checked status after runnign git pull, everything was up to date
19:46 phanimahesh try git merge --abort
19:46 bremner *shrug*, ok, no idea then, pretty hard to guess without an actual log of the commands you typed.
19:46 barteks2x fatal: There is no merge to abort (MERGE_HEAD missing).
19:46 phanimahesh you shouldn't get unmerged paths without a merge head
19:46 phanimahesh !transcript
19:46 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
19:48 barteks2x I think I found the reason myself, when runnign "git stash pop" there was a conflict
19:48 barteks2x is it safe to just add and commit it?
19:50 barteks2x Transcript wouldn't be very readable as I ran git diff and a few other command with large output in the meantime
19:50 tgies joined #git
19:52 phanimahesh Trim the transcript by removing the diffs?
19:52 phanimahesh Depends on what the file contains and what you want done.
19:52 phanimahesh add and then do git diff --staged
19:53 phanimahesh if it looks good, go ahead and commit
19:53 NeverDie joined #git
19:54 Rodya_ joined #git
19:54 barteks2x I resolved the conflict manually, and then forgot about it and went on writing more code. And now I want to commit it.
19:55 tgies joined #git
19:56 barteks2x Or is the transcript still needed to decide what to do with it?
19:57 interne7y joined #git
19:57 b1tchcakes joined #git
19:59 CJKinni joined #git
20:00 tgies joined #git
20:01 yqt joined #git
20:08 sdothum joined #git
20:10 santa-fire joined #git
20:12 phanimahesh ifyou resolved it manually then add it and commit it.
20:12 phanimahesh check diff --staged before committing to make sure you got it right.
20:12 phanimahesh barteks2x: ^
20:12 barteks2x for some reason git thinks that I added ^M character at the end of a line in one file and I can't figure out how o remove it
20:13 barteks2x (I already added these files, not viewing the diff)
20:14 barteks2x the diff literally looks like this: https://gist.github.com/Barteks2x​/48b951c219c591e2b2a100c9298edde7
20:15 tgies joined #git
20:18 realz__ joined #git
20:18 phanimahesh edit the file, delete couple of lines around it and re-type?
20:18 phanimahesh or selectively ignore that hunk.
20:19 phanimahesh (around it as in you'll have to remove a char from end of that line, the newline, and a char from the beginning of the next line.)
20:20 tgies joined #git
20:21 realz joined #git
20:25 tgies joined #git
20:25 Eryn_1983_FL joined #git
20:28 domgetter joined #git
20:29 _rgn joined #git
20:30 tgies joined #git
20:31 netj joined #git
20:32 dreiss joined #git
20:33 romerocesar_ joined #git
20:33 f3r70rr35f joined #git
20:35 nilg joined #git
20:35 axiom_1 joined #git
20:35 tgies joined #git
20:39 boombatower joined #git
20:40 ojdo joined #git
20:40 romerocesar joined #git
20:40 realz joined #git
20:40 cdown joined #git
20:42 apotry joined #git
20:43 cdown joined #git
20:45 tgies joined #git
20:46 cdown joined #git
20:46 tomog999 joined #git
20:50 tgies joined #git
20:51 nhawdge Is Gitolite designed to be as frustrating as possible for idiots like me? I've followed 2 tutorials and neither seem to be helpful. Does anyone know a good resource for the initial setup?
20:51 italoacasas joined #git
20:51 bremner will you be mad if I say, read the official docs?
20:52 nhawdge not at all, I'm mad at me for not being able to understand them. They link around a lot and I'm losing my place like a blind sherpa
20:54 lindenle joined #git
20:54 faux___ joined #git
20:55 nnyk joined #git
20:55 MiiikeK joined #git
20:56 tgies joined #git
20:58 italoacasas joined #git
20:58 interne7y joined #git
21:00 nhawdge could my gitolite problems be because I am trying to set the server up under a git user, and the admin user is on the same machine?
21:01 knutstrut joined #git
21:01 tgies joined #git
21:01 bremner nhawdge: that should work ok, if you still use ssh to access the repos
21:02 Shentino joined #git
21:02 amdi_ joined #git
21:03 nhawdge Okay, so I'm 40% sure I have this right, but when I try to use 'git clone git@localhost:gitolite-admin' I get 'fatal: 'gitolite-admin' does not appear to be a git repository'
21:03 mizu_no_oto joined #git
21:05 bremner and what does "ssh git@localhost info" report?
21:06 tgies joined #git
21:06 santa-fire How to update my fork repo in github.
21:07 santa-fire to follow recently version upstream repo?
21:09 cdown joined #git
21:10 CJKinni joined #git
21:10 santa-fire nevermind. I solved.
21:10 Robdgreat joined #git
21:11 uhmgswa^2 joined #git
21:11 edude03 joined #git
21:12 realz joined #git
21:13 realz_ joined #git
21:13 Noldorin joined #git
21:14 romerocesar joined #git
21:17 dreiss joined #git
21:17 blackthorne joined #git
21:17 nhawdge bremner: It reports a ton of stuff about ssh and what not, what should I be looking for?
21:18 blackthorne hi
21:18 gitinfo blackthorne: 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.
21:18 blackthorne is there a way to uniquely identify a git repository?
21:19 blackthorne i.e. like a random UUID within a file in the git repository that should be persist through time?
21:19 bremner nhawdge: can you pastebin the output? it should list some repos you have access to
21:20 mase-tech joined #git
21:20 blackthorne (even for repositories without commits)
21:20 nhawdge I sure will, but I don't think it's what I need
21:20 realz_ joined #git
21:21 tgies joined #git
21:21 bremner it might be what _I_ need, to point you in the right direction.
21:21 nhawdge bremner: http://pastebin.com/ReF4FW4A
21:22 bremner nhawdge: ok, that's not gitolite. You've got non-gitolite keys in your .ssh/authorized_keys
21:23 nhawdge bremner: you're awesome. I don't know how you do the voodoo that you do, but I appreciate it.
21:24 HenriettaSalt joined #git
21:24 nhawdge so I'm logged in as nhawdge, and I have user git running the gitolite, Should I take my rsa_id and put it into git/.ssh/?
21:25 qsx blackthorne: no
21:26 tgies joined #git
21:26 qsx i wonder what you want to use it for, i cannot imagine anything useful
21:26 bittin joined #git
21:27 Tsutsukakushi joined #git
21:27 dietr1ch joined #git
21:28 blackthorne qsx: i'm developing a tool that leverages git repositories. In some cases I need to know if a repository has changed its locations or if I am looking at two different repos with the same name
21:29 blackthorne i can use "git remote -v" though, it's good enough
21:30 twblamer joined #git
21:30 qsx blackthorne: i don’t think the concept of a unique repository id is applicable to git, as you could have two repositories with exactly the same content but one commit—are they different or the same?
21:30 qsx you can clone around and have the repos differ or not
21:30 qsx or you can keep one repo and rewrite all of it
21:30 toogley joined #git
21:31 tgies joined #git
21:31 interne7y joined #git
21:31 jerematic joined #git
21:32 blackthorne qsx: i see that as two repositories in two different states that refer to the same project. The ID i was after would be just to identify the project
21:33 PaulCapestany joined #git
21:33 blackthorne commits already have their own IDs
21:33 qsx what if a project forked?
21:33 qsx they’d have the same id.
21:33 qsx or wouldn’t they because they’d clone the repo and be done with it?
21:33 qsx but yeah, as i already said, git does not have such a thing
21:35 ajf- joined #git
21:35 blackthorne that would be a fork ID, but i don't really need it in my context
21:36 tgies joined #git
21:37 alex1a_ joined #git
21:37 |2701 joined #git
21:37 dietr1ch joined #git
21:39 ncthom91 joined #git
21:39 przemoc joined #git
21:39 przemoc joined #git
21:40 tanuki joined #git
21:42 edude03 joined #git
21:46 tgies joined #git
21:47 dietr1ch joined #git
21:49 eletuchy joined #git
21:50 _rgn joined #git
21:50 droidicus joined #git
21:51 eletuchy_ joined #git
21:51 tgies joined #git
21:54 eletuchy joined #git
21:56 eletuch__ joined #git
21:56 tgies joined #git
21:58 elastix1 joined #git
21:58 Noldorin joined #git
21:59 anberg joined #git
21:59 eletuchy joined #git
22:00 CEnnis91 joined #git
22:01 edude03 joined #git
22:01 MiiikeK left #git
22:01 tgies joined #git
22:01 eletuchy_ joined #git
22:03 eletuch__ joined #git
22:03 edude03 joined #git
22:04 GandalfTheWizard joined #git
22:05 dreiss joined #git
22:05 nwkj86 joined #git
22:06 diegoviola joined #git
22:06 edude03 joined #git
22:06 eletuchy joined #git
22:06 dietr1ch joined #git
22:06 GavinMagnus joined #git
22:08 dietr1ch joined #git
22:09 italoacasas joined #git
22:10 sctskw joined #git
22:10 eletuchy_ joined #git
22:10 CJKinni joined #git
22:11 tgies joined #git
22:11 edude03 joined #git
22:13 rgrinberg joined #git
22:13 SwiftMatt joined #git
22:13 eletuchy joined #git
22:14 edude03 joined #git
22:15 eletuch__ joined #git
22:15 MattMaker joined #git
22:15 stonerfish joined #git
22:16 _nadim joined #git
22:16 pwnz0r joined #git
22:16 domgetter joined #git
22:18 eletuchy joined #git
22:20 eletuchy_ joined #git
22:21 tgies joined #git
22:23 edude03 joined #git
22:24 eletuchy joined #git
22:24 pwnz0r joined #git
22:25 raijin joined #git
22:25 edude03 joined #git
22:26 garethdaine joined #git
22:26 tgies joined #git
22:27 eletuchy_ joined #git
22:28 cdown joined #git
22:28 eletuch__ joined #git
22:31 tgies joined #git
22:32 eletuchy joined #git
22:33 King_Hual joined #git
22:34 edude03 joined #git
22:35 eletuchy_ joined #git
22:36 tgies joined #git
22:38 eletuchy joined #git
22:38 edude03 joined #git
22:38 sword joined #git
22:40 eletuchy_ joined #git
22:40 stonerfish joined #git
22:42 eletuch__ joined #git
22:43 nhawdge joined #git
22:46 eletuchy joined #git
22:46 przemoc joined #git
22:46 tgies joined #git
22:47 dietr1ch joined #git
22:47 Rodya_ joined #git
22:48 SwiftMatt joined #git
22:49 eletuchy_ joined #git
22:51 Rodya__ joined #git
22:51 tgies joined #git
22:51 bollullera joined #git
22:52 dietr1ch joined #git
22:52 eletuchy joined #git
22:54 Rodya__ joined #git
22:54 eletuch__ joined #git
22:55 raijin joined #git
22:56 r00t66 joined #git
22:56 tgies joined #git
22:56 blackthorne left #git
22:57 eletuchy joined #git
22:57 edude03 joined #git
22:58 danieli joined #git
23:00 dietr1ch joined #git
23:00 eletuchy_ joined #git
23:01 tgies joined #git
23:06 Guest9 joined #git
23:06 tgies joined #git
23:07 edude03 joined #git
23:08 rkazak joined #git
23:10 Grimm_ joined #git
23:11 CJKinni joined #git
23:11 Rodya_ joined #git
23:13 rvsjoen joined #git
23:14 nwkj86 joined #git
23:16 tgies joined #git
23:17 FrostCandy joined #git
23:18 arooni joined #git
23:19 nettoweb joined #git
23:20 Corosus joined #git
23:20 diegoaguilar joined #git
23:21 tgies joined #git
23:26 ash_workz joined #git
23:27 gsingh joined #git
23:28 d4rklit3 joined #git
23:29 interne7y joined #git
23:29 tabakhase__ left #git
23:29 tabakhase joined #git
23:30 god joined #git
23:31 rewt joined #git
23:31 drodger joined #git
23:31 tgies joined #git
23:32 god hey guys... I was on a branch (lets call it B) that had uncommitted changes. I needed to check something on master, but the branch wasn't ready for a commit, so I ran git stash as recommended by git. I switched back to B, but how do I unstash the commits?
23:33 jerematic joined #git
23:33 i7c depends if you want to keep them on the stash or not.
23:33 i7c git stash apply if so, and git stash pop if not
23:33 god oh ty
23:33 Lyqyd joined #git
23:33 eletuchy joined #git
23:34 i7c You're welcome, almighty.
23:34 god you're doing the lords work, son
23:35 i7c :D
23:35 * i7c laughs.
23:35 bastelfreak joined #git
23:35 arescorpio joined #git
23:36 m1dnight1 joined #git
23:36 tgies joined #git
23:36 przemoc joined #git
23:36 przemoc joined #git
23:39 mattfoo joined #git
23:40 franl The help for 'git commit' seems to say that when a FILE is given, the file is committed but not staged (see #3 under DESCRIPTION).  Doesn't that leave the index's copy of the file out-of-date?
23:41 dreiss joined #git
23:41 tgies joined #git
23:42 star_prone joined #git
23:44 i7c Ha, that's actually a good question.
23:44 i7c I just tried it, it behaves like adding the file to the index right before it performs the commit.
23:44 i7c Which practically overwrites anything you added to the index before, I suppose.
23:44 franl OK, just poor wording, I guess.
23:44 i7c yup
23:45 m1dnight_ joined #git
23:46 tgies joined #git
23:52 tgies joined #git
23:53 nick123_ joined #git
23:55 ToBeCloud joined #git
23:55 drodger joined #git
23:55 ToBeCloud joined #git
23:56 ToBeCloud joined #git
23:56 ToBeCloud joined #git
23:57 ToBeCloud joined #git
23:57 tgies joined #git
23:57 ToBeCloud joined #git
23:57 lindenle joined #git
23:58 ToBeCloud joined #git
23:58 ToBeCloud joined #git
23:59 ToBeCloud joined #git
23:59 ToBeCloud joined #git

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