Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-25

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

All times shown according to UTC.

Time Nick Message
00:00 orbisvicis yeah ok, 1st I have to branch master
00:03 LeBlaaanc joined #git
00:06 oftc_ftw joined #git
00:07 italoacasas joined #git
00:07 raijin joined #git
00:07 knutstru1 joined #git
00:07 oftc_ftw hello all. i just did a few "git stash -p" and stashed parts of different files. now i found the issue and want to "git stash pop" all the stashes. surprisingly, the pop does not work: "error: Your local changes to the following files would be overwritten by merge"
00:08 oftc_ftw how can i pop my stashes back into the original files?
00:09 interne7y joined #git
00:10 holodoc joined #git
00:10 ochorocho__ joined #git
00:10 mwhooker joined #git
00:13 renlo joined #git
00:13 mwhooker_ joined #git
00:14 mwhooker joined #git
00:16 User458764 joined #git
00:16 flaguy48 joined #git
00:17 jaguarmagenta joined #git
00:18 Ranhir joined #git
00:19 tristanp joined #git
00:19 d4rklit3 joined #git
00:19 jaguarma_ joined #git
00:22 Chill-Surf joined #git
00:22 tristanp_ joined #git
00:22 jaguarmagenta joined #git
00:24 SwiftMatt joined #git
00:24 tristanp joined #git
00:26 tristanp_ joined #git
00:28 trista___ joined #git
00:28 sd512 joined #git
00:30 oftc_ftw anyone please? it's not a real merge, i can't even edit the conflict. it just says "Please, commit your changes or stash them before you can merge." but i wan to pop the last stash...
00:31 tomog999 joined #git
00:31 HedgeMage oftc_ftw: hey there.
00:32 jimi_ joined #git
00:32 rpd joined #git
00:33 HedgeMage oftc_ftw: give me a  few, I'm parenting but I'll help if no one has
00:33 jaguarma_ joined #git
00:34 mwhooker joined #git
00:34 akushner joined #git
00:36 boombatower joined #git
00:37 akushner joined #git
00:38 tristanp joined #git
00:39 oftc_ftw HedgeMage: sure, thanks!
00:40 knutstrut joined #git
00:40 knutstrut joined #git
00:43 justanotheruser joined #git
00:43 fstd joined #git
00:44 tristanp joined #git
00:45 disable joined #git
00:45 disable left #git
00:45 sargas joined #git
00:45 IWishIKnew joined #git
00:46 HedgeMage oftc_ftw: Okay, so when I have problems like this, here's what I do.  No promises that it's the most efficient possible approach, but it tends not to explode and is within my modest git skill :)
00:46 oftc_ftw HedgeMage: i'm listening :)
00:46 HedgeMage 1) create a new stash with your most recent work
00:46 jaguarmagenta joined #git
00:46 HedgeMage 2) verify that your working copy is now clean via 'git status'
00:46 HedgeMage 3) create a new branch
00:47 HedgeMage 4) apply one of the stashes to the current branch, and the other to the new branch
00:47 tristanp_ joined #git
00:47 HedgeMage 5) commit to both branches, then merge
00:47 HedgeMage 6) squash commits if desired for neatness
00:47 oftc_ftw ok let me try
00:49 jaguarma_ joined #git
00:49 mwhooker joined #git
00:50 Winter_ joined #git
00:51 tristanp joined #git
00:51 oftc_ftw HedgeMage: is it possible that after "stash pop" in the temp branch followed by "git checkout master", the changed file (from the stash pop) are still tagged as modified?
00:52 oftc_ftw if so, can I safely do a checkout?
00:52 oftc_ftw i.e. are they preserved in the other branch?
00:52 oftc_ftw or do i need to commit them first?
00:52 hfp_work joined #git
00:53 dreiss joined #git
00:53 HedgeMage they should be preserved if I remember correctly, but doesn't hurt to commit to be safe.
00:53 hfp joined #git
00:53 trista___ joined #git
00:54 garethdaine left #git
00:57 tristanp joined #git
00:58 rkazak joined #git
00:58 fracting joined #git
01:01 zivester_ joined #git
01:02 zivester_ joined #git
01:03 relipse2 joined #git
01:05 zivester joined #git
01:05 dermoth_ joined #git
01:05 EvilPenguin joined #git
01:06 oftc_ftw HedgeMage: thanks a lot, it worked! now i have to get rid of 6 temp-branches. :)
01:12 anu0 joined #git
01:14 pwnz0r joined #git
01:14 NateAGeek joined #git
01:15 HedgeMage oftc_ftw: You are very welcome.
01:15 arescorpio joined #git
01:16 mizu_no_oto joined #git
01:23 thiago joined #git
01:24 rkazak joined #git
01:30 fracting joined #git
01:33 tristanp_ joined #git
01:34 Tim-SEM joined #git
01:35 tristanp joined #git
01:36 weox joined #git
01:38 devwop_ joined #git
01:38 tristanp_ joined #git
01:40 Tanger_ joined #git
01:42 SHIN__ joined #git
01:46 Tim-SEM left #git
01:46 tristanp joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and zerg rushes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | YOU MUST SUBMIT ADDITIONAL JOKES https://madeitwor.se/git-jokes
01:50 devwop joined #git
01:52 devwop joined #git
01:52 devwop joined #git
01:53 pks joined #git
01:53 rkazak joined #git
01:54 chigang_ joined #git
01:54 devwop joined #git
01:55 bronson joined #git
01:58 devwop joined #git
02:03 Kaisyu joined #git
02:04 theskillwithin joined #git
02:05 chachasmooth joined #git
02:09 interne7y joined #git
02:12 joki joined #git
02:12 ochorocho__ joined #git
02:13 liuzhen joined #git
02:13 tristanp joined #git
02:15 Tanger_ Is there an easier way to ignore filemode changes than setting core.filemode to false on every server I spin up?
02:16 _rht joined #git
02:18 mwhooker joined #git
02:19 tristanp_ joined #git
02:22 tristanp joined #git
02:23 harish_ joined #git
02:23 robbyoconnor joined #git
02:23 robbyoconnor joined #git
02:25 tristanp_ joined #git
02:25 L8D joined #git
02:27 arooni joined #git
02:28 tristanp joined #git
02:28 orbisvicis left #git
02:32 EvilPenguin joined #git
02:33 ceaucari joined #git
02:33 david007 joined #git
02:34 SwiftMatt joined #git
02:35 mizu_no_oto joined #git
02:36 hexagoxel joined #git
02:39 ensyde joined #git
02:40 boudiccas joined #git
02:40 rubyonrailed joined #git
02:41 L8D joined #git
02:41 dreiss joined #git
02:41 arand joined #git
02:42 raijin joined #git
02:44 tristanp joined #git
02:45 Orbitrix joined #git
02:45 Orbitrix joined #git
02:45 adkjsfhd joined #git
02:47 harish joined #git
02:48 FarbrorAlBot joined #git
02:49 boudicca joined #git
02:51 xbox joined #git
02:52 brofist joined #git
02:53 d4rklit3 joined #git
02:56 arooni joined #git
02:58 dstegelman joined #git
03:01 PaulCapestany joined #git
03:02 tristanp_ joined #git
03:03 aavrug joined #git
03:04 BenderRodriguez joined #git
03:04 aavrug joined #git
03:05 chachasmooth joined #git
03:06 tristanp joined #git
03:07 boudiccas joined #git
03:09 PaulCapestany joined #git
03:09 tristanp_ joined #git
03:10 a_thakur joined #git
03:12 L8D joined #git
03:12 tristanp joined #git
03:17 Goplat joined #git
03:20 k3rn31 joined #git
03:22 PaulCapestany joined #git
03:22 fracting joined #git
03:26 hekto joined #git
03:26 dreiss joined #git
03:29 mwhooker joined #git
03:30 tristanp_ joined #git
03:31 livingstn joined #git
03:34 LeBlaaanc joined #git
03:35 tristanp joined #git
03:35 bjpenn joined #git
03:35 PaulCapestany joined #git
03:36 Orbitrix joined #git
03:36 jstimm joined #git
03:38 tristanp_ joined #git
03:38 mehola joined #git
03:40 dreiss joined #git
03:40 tristanp joined #git
03:45 tristanp joined #git
03:48 JDRock joined #git
03:50 italoacasas joined #git
03:53 adkjsfhd joined #git
03:54 csd_ joined #git
03:56 rkazak joined #git
03:58 zincrokx joined #git
04:02 jaguarmagenta joined #git
04:05 maestrojed joined #git
04:06 tristanp_ joined #git
04:06 PaulCapestany joined #git
04:08 holodoc joined #git
04:09 tristanp joined #git
04:09 NeverDie joined #git
04:10 diogenese joined #git
04:11 interne7y joined #git
04:12 rscata joined #git
04:13 ochorocho__ joined #git
04:14 tristanp_ joined #git
04:18 tristanp joined #git
04:18 Orbitrix joined #git
04:20 NeverDie_ joined #git
04:23 tristanp_ joined #git
04:26 fracting joined #git
04:32 Havvy joined #git
04:34 yentup joined #git
04:35 yentup left #git
04:35 yentup joined #git
04:35 yentup left #git
04:35 settermjd joined #git
04:36 MutantMahesh joined #git
04:38 Cabanossi joined #git
04:42 milki Tanger_: why do you have issues with filemode changes?
04:45 tristanp joined #git
04:46 thiago Tanger_: why would you want to ignore file mode changes?
04:47 bjpenn joined #git
04:48 Tanger_ thiago, milki: Some guys who work on my repos use different masks on their development environments, and they’re not particularly bothered with changing it since they don’t push anything up to a server
04:48 Tanger_ And it just shits me that it clogs the status and merge screen with every single filemode change
04:49 tristanp_ joined #git
04:49 Tanger_ Yeah, I know it’s shit, but if there’s a way to just set it as a flag on the actual repo, that would be sick
04:51 fahadash joined #git
04:51 LeBlaaanc how can i check if the current checked out version has a specific tag?
04:51 LeBlaaanc I do `git ls-remote origin refs/tags/$BUILD_TAG` for remote
04:52 dreiss joined #git
04:54 sword joined #git
04:54 _28_ria joined #git
04:55 tristanp joined #git
04:57 thiago Tanger_: do you mean they set the umask to 033 or 003?
04:57 BSAlb joined #git
04:58 thiago LeBlaaanc: explain differently. Do you want to check if a tag exists?
04:58 thiago LeBlaaanc: or do you want to verify if the currently checked out commit is a descendant of a given tag?
04:58 thiago LeBlaaanc: or whether it is exactly that tag?
04:58 LeBlaaanc honestly nm -f will work fin
04:58 LeBlaaanc fine*
04:59 LeBlaaanc world won't implode or anything if i do this
04:59 thiago what does nm have to do with this?
05:00 ygeLN joined #git
05:01 kristofferR joined #git
05:02 Tanger_ thiago: Sorry, they use 0003
05:03 BenderRodriguez joined #git
05:03 thiago Tanger_: well, if they want to use something really weird, they can fix it too
05:03 thiago Tanger_: their problem
05:04 thiago there's no way you can enforce it
05:04 thiago you can tell them to set the umask to a standard value. Even 007 would work too.
05:04 Tanger_ thiago: haha, fair enough.
05:05 Tanger_ I’ll hit them up about it and leave some passive aggressive commit messages
05:05 Tanger_ Thanks!
05:05 thiago reject their commits that change permissions for no good reason
05:05 thiago once they can't get their changes through, they'll fix their systems
05:07 ojacobson If people are changing the +x bit without noticing, there are bigger practices problems than git can solve for you
05:08 ojacobson changing umask won't generally cause tools to start generating executable files - a few tools get this wrong, but most are sane and only try to set rw-rw-rw- for data, rather than allowing umask to control the x bit
05:08 ojacobson (they still allow the umask to control the r and w bits)
05:08 thiago no, but it will cause executable files to no longer be executable
05:11 NeverDie joined #git
05:12 sauvin joined #git
05:12 Orbitrix joined #git
05:12 Raging_Hog joined #git
05:13 subhojit777 joined #git
05:14 tristanp_ joined #git
05:14 NeverDie joined #git
05:14 ochorocho__ joined #git
05:15 MutantMahesh joined #git
05:15 dimi1947 joined #git
05:17 tristanp joined #git
05:21 khmarbaise joined #git
05:22 tristanp joined #git
05:24 tristanp_ joined #git
05:25 bjpenn joined #git
05:25 baba_ joined #git
05:26 trista___ joined #git
05:27 baba_ joined #git
05:30 joki joined #git
05:31 a_thakur joined #git
05:36 zeroed joined #git
05:36 zeroed joined #git
05:40 ThomasLocke joined #git
05:43 ramsub07 joined #git
05:45 tristanp joined #git
05:48 realz joined #git
05:49 tristanp_ joined #git
05:52 tristanp joined #git
05:55 LucaTM joined #git
05:56 shiriru joined #git
05:57 Werring joined #git
05:58 stonerfish joined #git
06:00 mwhooker joined #git
06:00 ig0r_ joined #git
06:02 Guest90415 joined #git
06:04 dsdeiz joined #git
06:05 mda1 joined #git
06:05 cdown joined #git
06:05 mariuscc joined #git
06:05 GavinMagnus joined #git
06:10 bhavik joined #git
06:10 cdown_ joined #git
06:11 leeN joined #git
06:15 tvw joined #git
06:16 bhavik left #git
06:16 circ-user-fbIZM joined #git
06:16 baba_ joined #git
06:17 Macaveli joined #git
06:17 Macaveli joined #git
06:19 jave joined #git
06:20 eijk joined #git
06:20 tristanp_ joined #git
06:25 jaguarma_ joined #git
06:25 cgunders3on joined #git
06:26 nilg` joined #git
06:27 encod3 joined #git
06:30 User458764 joined #git
06:32 jagob joined #git
06:32 nnyk_ joined #git
06:33 tristanp joined #git
06:37 freimatz joined #git
06:38 mase-tech joined #git
06:38 Sceorem joined #git
06:39 scarcry joined #git
06:41 troulouliou_div2 joined #git
06:42 gitnewbie joined #git
06:43 JeroenT joined #git
06:44 fwdit joined #git
06:45 a_thakur joined #git
06:45 mwhooker joined #git
06:48 PCatinean joined #git
06:49 josuebrunel joined #git
06:51 fracting joined #git
06:54 mwhooker joined #git
06:54 ahmedelgabri joined #git
06:54 qt-x joined #git
06:56 JeroenT_ joined #git
06:57 King_Hual joined #git
06:59 settermjd joined #git
06:59 tristanp joined #git
07:01 afuentes joined #git
07:02 WayToDoor joined #git
07:04 emPi joined #git
07:04 Darcidride joined #git
07:06 tristanp_ joined #git
07:07 encod3 joined #git
07:08 Macaveli joined #git
07:11 tristanp joined #git
07:11 ManDay joined #git
07:11 TomyWork joined #git
07:12 Mobutils joined #git
07:12 sesquipedalian joined #git
07:12 ManDay "git remote add X host:/X ; git pull X" and it seems to have pulled X/master but did not change my local master. What's the correct thing to do now? git-merge?
07:14 osse ManDay: yes
07:14 cbreak you shouldn't use remote names as refs, it's confusing :)
07:15 ochorocho__ joined #git
07:15 ferr joined #git
07:15 cbreak after fetching, take a look at git branch -a, and if you want to merge, one of those is probably a good candidate
07:16 jceb joined #git
07:17 ManDay you mean I should not do "git pull X" but rather "git fetch X/master"?
07:19 thiago no
07:19 thiago you should do git pull X/branchname
07:19 thiago sorry
07:19 thiago git pull X branchname
07:20 eijk joined #git
07:21 ManDay does it make a difference whether I do git pull or git fetch?
07:21 thiago yes
07:21 thiago git pull updates your local tree; git fetch doesn't
07:21 ManDay but git pull didn't update anything. I had to merge myself
07:21 ZeDestructor joined #git
07:21 thiago did you use both arguments, like I said?
07:22 mwhooker joined #git
07:22 thiago git pull remotename branchname
07:22 ManDay no. i did only "git pull remotename".
07:22 ManDay so in that case git-pull = git-fetch?
07:22 thiago I've never done that, I wouldn't expect it to work
07:22 ManDay but it did :-p
07:22 JZA joined #git
07:22 JZA hi how can I remove what I git added?
07:23 thiago ManDay: the fact that you're here asking implies it didn't work
07:23 thiago JZA: git status and read what it says
07:23 JZA well I want to get rid of the pyc files
07:23 ManDay thiago: hm? it worked in the sense that the results are there.
07:23 ManDay I'm just saying "pull" didn't merge in this case
07:23 JZA id I did a git add * but now I want to remove the pyc
07:23 thiago ManDay: so it "didn't work" :-)
07:24 thiago JZA: git status tells you how to undo that
07:24 tristanp joined #git
07:24 dopesong joined #git
07:26 a3Dman joined #git
07:29 Macaveli joined #git
07:29 Balliad joined #git
07:30 sans_s3r1f joined #git
07:32 cyan__ joined #git
07:34 ronskisika joined #git
07:34 mwhooker joined #git
07:35 nnyk joined #git
07:35 dopesong_ joined #git
07:36 tristanp_ joined #git
07:36 Gonzo89 joined #git
07:37 dopesong joined #git
07:38 saedelaere joined #git
07:39 tristanp joined #git
07:40 blackwind_123 joined #git
07:42 mikecmpbll joined #git
07:42 tristanp joined #git
07:44 mikecmpbll joined #git
07:46 kurkale6ka joined #git
07:46 tristanp_ joined #git
07:49 FilipNortic joined #git
07:51 JeroenT joined #git
07:51 trista___ joined #git
07:52 MutantMa_ joined #git
07:52 nnyk_ joined #git
07:59 ceaucari joined #git
08:00 slixpk joined #git
08:00 lindenle joined #git
08:01 tristanp joined #git
08:02 JeroenT joined #git
08:03 FilipNortic joined #git
08:03 mikecmpbll joined #git
08:03 jave joined #git
08:07 baba_ joined #git
08:08 bongjovi joined #git
08:12 elastix joined #git
08:12 interne7y joined #git
08:13 GeekNerd joined #git
08:13 GeekNerd Hello
08:13 GeekNerd git
08:13 GeekNerd git
08:13 GeekNerd gir
08:13 GeekNerd git
08:14 a_thakur joined #git
08:14 osse GeekNerd: #git is an irc channel, not Git Bash :p
08:14 GeekNerd git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git
08:14 GeekNerd git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git gitgit git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git
08:14 GeekNerd git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git gitgit git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git
08:14 GeekNerd osse: huh?
08:14 GeekNerd git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git gitgit git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git gitgit git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git git gitgit git git gi
08:14 osse Stop it
08:14 GeekNerd sorry
08:14 GeekNerd one second
08:15 GeekNerd checking info....
08:15 a_thakur joined #git
08:15 GeekNerd god fucking damnit some D-bag made you an op
08:15 GeekNerd I guess I have to shut up now
08:18 ManDay so why exactly does the spammer voice?
08:18 ManDay *have
08:18 txdv the answer is probably git
08:18 ManDay git.
08:19 ronskisika joined #git
08:19 txdv git!
08:19 GeekNerd I voiced myself
08:19 GeekNerd actually i had my buddy gitinfo do it
08:19 GeekNerd GNAA is awesome
08:20 grawity Geeks, Nerds, & Alcoholics Anonymous?
08:20 GeekNerd : LONG LIVE THE GAY NIGGER ASSOCIATION OF AMERICA
08:20 tristanp_ joined #git
08:20 GeekNerd grawity lol
08:20 GeekNerd the gnaa is an old troll group
08:20 ig0r_ joined #git
08:20 GeekNerd they wont let me in becuz I am a white straight guy
08:20 GeekNerd sorry
08:20 GeekNerd forgot you existed, osse
08:20 * GeekNerd shuts up now
08:20 zincrokx joined #git
08:20 ManDay i still don't understand how the guy is priviledged for voice...
08:20 tinyhippo joined #git
08:21 grawity it's not a privilege in #git in the first place
08:21 Mikaela ManDay: /topic
08:21 osse ManDay: gitinfo voices people who ask for it
08:21 GeekNerd ManDay, gitinfo voices anyone who ask
08:21 ManDay ah, didn't know. thanks :)
08:21 zincrokx joined #git
08:21 Arahael what does voice even do?
08:21 ManDay allows you to talk if the channel is muted
08:21 GeekNerd Arahael: if you do not have freenode nickserv acct it lets you talk
08:21 g5pw joined #git
08:21 ManDay but i guess it depends on the server what exaclty the flag does
08:22 GeekNerd it lets you talk if you are quieted
08:22 lamppid joined #git
08:22 Arahael i see.
08:22 GeekNerd and there is a quiet set that affects all non-identified users
08:22 GeekNerd so it is used to say, I am not a bot as I was able to read the topic and run the command based on it
08:22 fracting joined #git
08:23 GeekNerd so then the quiet still stops bots without requiring a nickserv account
08:23 affan joined #git
08:23 ManDay i'm not entirely convinced about the whole you-are-not-a-bot thing...
08:23 tristanp joined #git
08:23 GeekNerd I am not a bot.  if I was  I would only spam
08:24 GeekNerd and not argue
08:24 GeekNerd as bots f
08:24 grawity Arahael: generally, voice bypasses +m (if set) and matching bans/quiets (if any)
08:24 GeekNerd typi
08:24 GeekNerd typi
08:24 GeekNerd typo, sorry touch screen kybord
08:24 GeekNerd bots do not respond intelligently to your inquiries
08:24 ManDay my point exactly.
08:24 GeekNerd they spit out preset bullshit
08:24 Arahael grawity: thanks.
08:24 GeekNerd but my bull shit is not all pre set
08:25 GeekNerd if I was a bot you would need to use certain triggers to get the correct response.
08:25 GeekNerd I intelligently define new garbage based on your trolling
08:26 osse can you define something else than garbage?
08:26 GeekNerd sure
08:27 GeekNerd I can define git.  it means to git out of my way plz
08:27 GeekNerd lmfao joking
08:27 GeekNerd its a linux command
08:27 GeekNerd to git stuff from a repository
08:27 mwhooker joined #git
08:27 GeekNerd which, despite rhyming, is not the same as a suppository
08:27 GeekNerd I am off my meds tonight
08:27 GeekNerd I apologize if I am going to fast
08:28 GeekNerd for all of you non ADHD minds to keep up with
08:28 ohcibi so he can't be banned because he auto-receives voice from gitinfo?
08:28 GeekNerd ohcibi: no
08:28 Mobutils joined #git
08:28 GeekNerd I can be banned
08:28 GeekNerd quieting would require to gave gitinfo stop voicing ppl on request
08:28 GeekNerd its nothing special for me
08:28 ohcibi well... ignoring also works
08:28 cyan__ joined #git
08:29 ManDay ohcibi: ignoring what?
08:29 robotroll joined #git
08:29 GeekNerd as the /topic says, type /msg gitinfo .voice
08:29 weyer joined #git
08:29 ohcibi ManDay: exactly
08:29 GeekNerd ManDay: me, I think
08:30 GeekNerd Mikaela: dont be a rat on #freenode, you are not correct in what you are ratting about
08:31 ohcibi ManDay: though i'm still interested why he isnt getting kicked.. is he a friend of some op an actually just joking?
08:31 ManDay ohcibi: i don't think anyone actually cares enough
08:31 GeekNerd ohcibi: No.  I just discovered the channel 2day
08:31 osse ohcibi: I am suspecting some sort of hydra monster
08:31 GeekNerd or yesterday
08:31 osse but we can try
08:31 GeekNerd osse, LOL
08:31 kaiten02 joined #git
08:31 GeekNerd was kicked by osse: GeekNerd
08:32 ohcibi osse: you mean ban one, get 10 new?
08:32 osse selckin: plz explain
08:32 selckin hes been harassing freenode for over a year, very good at getting proxies
08:32 ManDay heh
08:32 selckin staff has like a million line banlist for him
08:32 AssNode joined #git
08:32 selckin just don't talk him and he gets bored
08:32 kyledr joined #git
08:32 mikecmpbll joined #git
08:32 AssNode greetings  dongs
08:33 AssNode I am a hydra monster
08:33 ohcibi selckin: i see
08:33 ManDay Well it must be a skill by itsself to a) have that many proxys b) have that much spare time
08:33 AssNode ManDay: nope. one or two free apps
08:33 AssNode search Google play store for FREE VPN
08:33 SwiftMatt joined #git
08:33 ManDay that would explains a)
08:33 AssNode and use an android irc client
08:34 ManDay as for b)... i think he must be living on social welfare or something
08:34 osse so the ignore thing is probably the way to go here
08:34 AssNode No
08:34 AssNode I have 2 part time jobs and go to school part time
08:34 AssNode and i live with my parents
08:34 osse and we should consider not having the voic thing
08:34 AssNode left #git
08:34 moritz what's the problem with the voice thing?
08:35 osse This is the problem
08:35 moritz I have the impression it works pretty well against automated drive-by spmmers
08:35 selckin poeple see voice a having some extra authority
08:36 osse moritz: i mean getting rid of the voice thing + adding the nickserv requirement
08:36 gaen joined #git
08:36 marcogmonteiro joined #git
08:36 ohcibi is he gone that fast?
08:36 a_thakur joined #git
08:36 osse he got bored I guess
08:37 ohcibi yep pretty quickly...
08:37 satbyy joined #git
08:37 moritz maybe I just have a thick skin, but a troll or two a week for a channel of this size seems to be pretty normal
08:37 JeroenT joined #git
08:37 moritz so I wouldn't raise the barrier of entry
08:38 ManDay IF not enjoyable!
08:38 Arahael /ignore is pretty easy, too.
08:38 neanderslob joined #git
08:39 ohcibi moritz: i agree but on the other hand, there are many channels that have the requirement and still have +1000 users in them... the effect seems not that big
08:39 osse I have think skin too. I was bullid into banning ;_M
08:39 osse ;_;
08:40 moritz ah well, I'll just hilight jast to see if he has a strong opinion
08:40 koltroll joined #git
08:40 moritz I wouldn't do anything about it on my own
08:41 Shashikant86 joined #git
08:43 tinyhippo left #git
08:43 flopsec joined #git
08:43 Urbany joined #git
08:43 Shashikant86 joined #git
08:44 nadim joined #git
08:46 tristanp joined #git
08:46 osse in #vim the start of the topic is: "Can't Talk? Get Registered on freenode (HOWTO: http://bit.ly/23YhaS1)" Seems to work.
08:46 harish_ joined #git
08:46 JeroenT joined #git
08:46 dopesong joined #git
08:48 JeroenT joined #git
08:49 pol123456 joined #git
08:49 GT joined #git
08:50 jaguarmagenta joined #git
08:51 Psychiatrist joined #git
08:54 ohcibi osse: yep, #vim is one of those 8-)
08:54 mwhooker joined #git
08:55 osse I'm too lazy to have strong opinions
08:56 jaguarmagenta joined #git
08:57 tristanp joined #git
08:57 moritz oh, I think joining #vim might be a good idea :-)
08:58 moritz OTOH my channel list is already too long for my taste
08:58 Zarthus for what it's worth, the audience vim targets probably don't attract many new players
08:58 Zarthus #git's target userbase is pretty broad.
08:58 rchavik joined #git
08:59 osse Zarthus: you say that. but powerline, amritie
08:59 osse :p
08:59 baba_ joined #git
08:59 Zarthus I don't think powerline exists on Windows!
09:00 ramsub07 joined #git
09:00 osse top kek
09:01 durham joined #git
09:04 ohcibi Zarthus: I disagree... git has a similar steep learning curve as vim has which often disattracts the same kind of people... those people often still use git with a gui but then again they'd get bashed in here as well..
09:04 osse IRC question: Why can't I devoice myself? Seems weird that you need privileges to *lessen* said privileges
09:05 osse huh
09:05 Zarthus osse: I think on some ircds you can, just not on chary
09:05 Zarthus the real answer probably is "nobody cared enough to implement it and /part; /join was good enough"
09:06 txdv the cross is a burden
09:06 txdv you need to carry it
09:06 osse left #git
09:06 txdv unless someone deems you are worthy to put it down
09:06 osse joined #git
09:06 osse dank
09:06 txdv lol
09:06 osse my client has a /rejoin.
09:06 Zarthus Mine too, but it's called /hop
09:07 txdv irssi doesnt have either
09:07 Zarthus most clients tend to implement it as an alias anyways
09:07 osse hmm, actually /rejoin is an alias to /cycle
09:07 osse is /cycle a "native" irc thing?
09:07 troulouliou_div2 joined #git
09:07 Zarthus nope
09:08 Zarthus (11:08:08) cycle Unknown command
09:08 Zarthus /quote cycle #git
09:08 MutantMahesh joined #git
09:08 Macaveli joined #git
09:09 gaen joined #git
09:12 sans_s3r1f joined #git
09:13 anu1 joined #git
09:14 rominronin joined #git
09:16 ochorocho__ joined #git
09:17 Psychiatrist joined #git
09:17 tristanp joined #git
09:17 netj joined #git
09:18 baba_ joined #git
09:24 BombStrike joined #git
09:24 testild joined #git
09:25 afuentes joined #git
09:27 achadwick joined #git
09:28 mwhooker joined #git
09:28 Jellyg00se joined #git
09:29 ShapeShifter499 joined #git
09:29 tristanp_ joined #git
09:29 nardev joined #git
09:29 MutantMa_ joined #git
09:30 elastix joined #git
09:31 tristanp joined #git
09:32 dsdeiz joined #git
09:38 lalalaaa joined #git
09:38 elastix joined #git
09:38 yude joined #git
09:38 yude_ joined #git
09:38 lalalaaa What's the easiest way to revert to the previous commit without `git reset --hard ??? && git push -f"?
09:39 lalalaaa Other members of my team hate it when I force push
09:39 digidog joined #git
09:41 Stummi lalalaaa, make a revert commit and push it
09:41 Stummi git reset HEAD~1, commit, push
09:42 Stummi lalalaaa, the hate for force pushes is fully justified. Don't do it if you don't have a pretty good reason to do it
09:42 baba__ joined #git
09:42 Stummi A force push will break all other team members local repositories
09:43 mahendra_ joined #git
09:45 Shashikant86 joined #git
09:45 lalalaaa thanks Stummi
09:46 cerkauskas joined #git
09:46 narendraj9 joined #git
09:48 lalalaaa Stummi: Stummi git reset HEAD~1, commit, push will delete the commit im trying to revert right? forcing me to push after all?
09:48 Stummi no, it won't delete any commits
09:48 Stummi it will add a commit which reverts the changes you did in the last commit
09:48 lalalaaa cool let me try again
09:48 baba_ joined #git
09:49 Stummi well, and you have to push anything you want to be available to your team
09:50 lalalaaa Stummi: For some reason git reset HEAD~1 deletes the commit in question :/
09:50 tobiasvl I think Stummi meant "git revert"
09:51 tobiasvl not "git reset"
09:51 lalalaaa ooh
09:51 |ifei5good joined #git
09:51 Stummi yeah, my bad. Sorry
09:51 Macaveli joined #git
09:51 lalalaaa no probs
09:52 lalalaaa Can I do the same reverting if there are other commits ahead of it? My friend just pushed some more stuff
09:52 tobiasvl yes
09:52 lalalaaa awesome
09:52 tobiasvl revert is simple: it makes a new commit that is the opposite of the commit you wish to revert
09:52 tobiasvl so all lines added in the first commit are removed in the revert commit, and vice versa
09:53 lalalaaa i never knew it was that simple
09:53 jhasse joined #git
09:53 lalalaaa asked the question before and it turned out to be so complicated
09:53 ocbtec joined #git
09:53 lalalaaa "git revert" on the other hand, damn how nice
09:53 jhasse Hi! When cloning over Smart HTTP, is the data encrypted?
09:54 diegoaguilar joined #git
09:54 csd_ joined #git
09:55 aidalgol joined #git
09:55 tobiasvl jhasse: it can, if it uses HTTPS
09:55 baba_ joined #git
09:55 tobiasvl like regular "dumb" HTTP
09:56 Shashikant86 joined #git
09:58 jhasse tobiasvl: okay, thx
09:59 Thorn joined #git
09:59 Corosauce joined #git
09:59 rewt joined #git
10:00 mdw joined #git
10:02 tristanp joined #git
10:03 shiriru joined #git
10:04 tinajohnson___ joined #git
10:05 mwhooker joined #git
10:06 algun joined #git
10:06 algun joined #git
10:07 tlaxkit joined #git
10:10 tristanp_ joined #git
10:12 lucido-cwl joined #git
10:13 tristanp joined #git
10:13 interne7y joined #git
10:15 Raging_Hog joined #git
10:16 tristanp_ joined #git
10:17 nilg joined #git
10:19 baba__ joined #git
10:19 dopesong joined #git
10:22 scribe joined #git
10:22 ramsub08 joined #git
10:22 bronson joined #git
10:23 scribe Hi guys.  I have been going a little crazy trying to figure out how to push a change to a remote branch which is not origin/master on a sourceforge project.
10:24 scribe Any pointers?
10:24 Xano joined #git
10:25 tristanp joined #git
10:25 tobiasvl scribe: hard to say, what have you tried? man git push should tell you how to push to different branches
10:25 gitinfo scribe: the git-push manpage is available at http://jk.gs/git-push.html
10:25 Xano I need to clone several private Github repos through a third-party tool. There's read-only Github account to do this with for which we have a username and password. Is there some sort of global config that we can use to set default username and password?
10:27 tobiasvl Xano: set up an ssh key for the account and clone password-less?
10:27 tobiasvl otherwise, man git credential-store perhaps
10:27 gitinfo the git-credential-store manpage is available at http://jk.gs/git-credential-store.html
10:27 tobiasvl maybe I mean man git credential-helper
10:27 gitinfo the git manpage is available at http://jk.gs/git.html
10:29 scribe yeah, I've tried a ton of stuff and all the stackoverflow posts seem like they're giving outdated info.  Here's what I've tried: I've git, cloned the repo, then I've done a git checkout remotes/origin/x (using 'x' to represent to branch I'd like to push a change to), it then informed me I was in 'detached head' mode and to create a branch from it, which I did and made my change and committed my change to my local branch, say 'y'...  The
10:29 scribe n I've done a git checkout remotes/origin/x again, a git merge y, which pulled in my changes, then a git push, which give me:
10:30 sdothum joined #git
10:30 Xano tobiasvl, Bureaucracy and no coworkers around with Github admin rights who can do this for us now :X
10:30 Xano tobiasvl, Will look at those docs. Thanks!
10:30 osse scribe: it's the wroing way to push. you should use:   git push origin y:x
10:30 scribe "fatal: You are not current on a branch. To push the history leading tothe current (detached HEAD) state now, use: git push origin HEAD:<name-of-remote-branch>
10:31 scribe osse, ok, trying...
10:31 tristanp joined #git
10:31 scribe osse, does it matter which branch I have currently checked out?  It seems like I should merge first so I can be sure my changes work.
10:32 _ikke_ You can push any branch out, doesn't matter which one is checked out
10:32 osse scribe: if you run it exactly like i wrote it then it doesn't matter
10:32 osse scribe: but the usual scenario is that you have x checked out
10:33 osse I mean have y checked out
10:33 mwhooker joined #git
10:34 scribe osse, perfect! thank you!
10:34 mehola joined #git
10:35 dopesong joined #git
10:36 osse scribe: two more things: 1) if x and y are actually the same thing (eg. bugfix) then you can simply write 'git push origin bugfix' instead of 'git push origin bugfix:bugfix').  2) If you add a -u to that command, then for all future pushes you only have to write 'git push'
10:36 osse Assuming y is checked out, and your git version is newer than really old.
10:39 zeroed joined #git
10:40 guardian hello, what's the use for adding another url to a remote?
10:40 guardian I don't understand the use case
10:41 tobiasvl is that possible?
10:41 tobiasvl oh you mean that you can have one fetch and one push
10:41 osse guardian: i think if you have two pushurls then Git will push to both
10:42 osse so you don't have to do  for r in remote1 remote2; do git push $r master; done
10:42 osse or whavets
10:43 troulouliou_divn joined #git
10:44 toogley joined #git
10:46 diegoaguilar joined #git
10:50 qis joined #git
10:50 qis Is there a way to add the git LFS extension to /usr/bin/git in MSYS2 on Windows?
10:51 tristanp_ joined #git
10:52 lite_ joined #git
10:54 Shashikant86 joined #git
10:54 fracting joined #git
10:55 tristanp joined #git
10:57 tristanp_ joined #git
10:57 a_thakur joined #git
10:57 eijk joined #git
10:58 WayToDoor joined #git
10:58 tvw joined #git
10:59 trista___ joined #git
11:00 a_thakur_ joined #git
11:01 qis Nevermind, figured it out. Had to manually add "/c/Program Files/Git LFS" to the PATH environment variable.
11:01 qis left #git
11:01 tristanp joined #git
11:02 rominronin joined #git
11:02 Guest80265 joined #git
11:03 AfroThundr joined #git
11:05 mizu_no_oto joined #git
11:05 Guest80265 left #git
11:05 tristanp_ joined #git
11:06 ojdo joined #git
11:06 AfroThundr joined #git
11:06 koltroll joined #git
11:08 Macaveli joined #git
11:08 fscala joined #git
11:10 a3Dman_ joined #git
11:10 guardian thanks osse
11:11 JeroenT joined #git
11:13 SimonNa joined #git
11:14 interne7y joined #git
11:14 mahendra_ joined #git
11:15 jeeger joined #git
11:15 dopesong joined #git
11:16 acetakwas joined #git
11:17 ochorocho__ joined #git
11:18 Lunatrius joined #git
11:18 acetakwas joined #git
11:20 cdown joined #git
11:20 acetakwas joined #git
11:22 griffindy joined #git
11:22 acetakwas joined #git
11:23 ronskisika joined #git
11:24 JeroenT joined #git
11:24 acetakwas joined #git
11:25 elastix joined #git
11:27 rnsanchez joined #git
11:28 acetakwas joined #git
11:28 tristanp joined #git
11:29 pingwindyktator joined #git
11:29 tomboy64 joined #git
11:29 Psychiatrist joined #git
11:29 tomboy64 how can i display the files that a specific commit changed?
11:29 johnmilton joined #git
11:29 tomboy64 just a file-listing, not the whole diff
11:29 pingwindyktator hey! How can I 'git add' ignored file? Let's say I've got '*.txt' in .gitignore, but this time I want to commit changes in some_file.txt
11:30 j416 pingwindyktator: the error message from git add will tell you
11:30 j416 pingwindyktator: -f
11:31 j416 tomboy64: --name-only
11:31 j416 tomboy64: more options include --stat, --name-status
11:31 nardev joined #git
11:31 j416 tomboy64: see man git-diff for info
11:31 gitinfo tomboy64: the git-diff manpage is available at http://jk.gs/git-diff.html
11:31 pingwindyktator j416: you're right, thanks!
11:32 tristanp joined #git
11:33 bjpenn joined #git
11:33 Sonderblade joined #git
11:33 tomboy64 name-status was actually what i was looking for, thanks
11:34 will_f joined #git
11:35 JeroenT joined #git
11:35 mehola joined #git
11:35 k3rn31 joined #git
11:36 a_thakur joined #git
11:37 will_f Hi.  Trying to edit 2nd commit in a repo to revert a file.  If I do 'git rebase -i <1st_commit_id>' then say I wans to 'edit' the 2nd commit then the repo appears then be in the state it was after making the 2nd commit.  Missing something obvious?
11:38 osse will_f: you make your changes, then commit --amend
11:38 osse then rebase --continue
11:38 baba_ joined #git
11:40 JeroenT joined #git
11:43 baba_ joined #git
11:44 lohfu joined #git
11:44 will_f osse: my issue is that I want to edit the state of the 2nd commit, yet after saying that I want to edit the 2nd commit the repo is reverted to the state _after_ making the 2nd commit, so I can't change which files were included in that commit.
11:45 osse yes you can
11:47 auwooo-0x71 joined #git
11:47 k3rn31 joined #git
11:47 tristanp_ joined #git
11:48 Arahael will_f: here's a tip: git's commits don't contain the diffs or changes.
11:48 JeroenT joined #git
11:48 Arahael will_f: they are a *snapshot* of the whole working directory.
11:50 cbreak will_f: man git-commit, look for --amend
11:50 gitinfo will_f: the git-commit manpage is available at http://jk.gs/git-commit.html
11:50 cbreak you can also create new commits if you want
11:50 cbreak rebase --continue will just put the remaining commits on top of HEAD
11:51 JeroenT joined #git
11:52 Shashikant86 joined #git
11:53 raijin joined #git
11:55 Rooxo joined #git
11:55 jeeger Greetings! I'm trying to merge two branches (A and B). However, the files I'm working on in B  were deleted in A, meaning all files are deleted if I merge A into B. How can I get around this?
11:55 tristanp_ joined #git
11:55 ojdo joined #git
11:55 osse deja vu
11:56 flaguy48 left #git
11:56 jeeger osse: Hm? Someone else ask this as well?
11:57 jeffreylevesque joined #git
11:57 dopesong joined #git
11:58 xelxebar joined #git
11:58 dimi1947 joined #git
11:58 wviana joined #git
11:59 osse you did
12:00 fstd joined #git
12:00 cyan__ joined #git
12:00 will_f Thanks all!  I needed to use rebaseto edit the 2nd commit then 'git checkout <1st commit> fname; git commit --amend; git rebase --continue'
12:00 jeeger osse: You remembered, how sweet. :)
12:01 will_f left #git
12:01 Eryn_1983_FL joined #git
12:01 jeeger osse: Yeah, I said I'd try to change the files, but turns out it would be a major effort for not a lot of gain, so I'm looking for another way to do this. I've tried reverting the delete commit (made on A) on B, but that somehow doesn't undo the delete.
12:02 lindenle joined #git
12:02 osse you must do the revert before the merge I think
12:03 osse or check them out again afterwards
12:03 jeeger osse: I did. But maybe I was using the revert interface wrong (do I have to add conflicts or not before doing revert --continue?)
12:04 maucar joined #git
12:04 Sceorem joined #git
12:05 wrouesnel joined #git
12:05 Lunatrius` joined #git
12:06 modin left #git
12:06 jeeger Nope, revert somehow just adds a single file after resolving a conflict in that file.
12:06 dhsanket joined #git
12:06 leeN joined #git
12:06 sdeshpande_ joined #git
12:06 cbreak jeeger: conflicts have to be resolved
12:06 cbreak resolutions have to be added to mark the conflict as resolved
12:07 osse jeeger: prolly easier to use git ''checkout commit -- file(s)'' to resurrect them
12:07 Macaveli joined #git
12:08 jeeger osse: And add them again? Urgh, it's a whole lot of files, I'll have a look.
12:08 jaguarmagenta joined #git
12:09 Samcfuchs joined #git
12:10 acetakwas joined #git
12:10 Samcfuchs hello?
12:10 gitinfo Samcfuchs: 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:11 synthroid joined #git
12:11 Lunatrius joined #git
12:12 Samcfuchs I have an issue with branches and I'm looking for help
12:12 rwb joined #git
12:13 JanC_ joined #git
12:13 inodb joined #git
12:14 bremner !ask
12:14 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
12:14 bremner i.e., more details => more chance of an answer
12:14 jeeger Oh, but doesn't everyone...
12:15 rominronin joined #git
12:15 ignas joined #git
12:15 dhsanket joined #git
12:15 Samcfuchs Yeah. So I didn't know about git bisect. So I created a new branch from an early commit and then cherry-picked commits from master onto the new branch
12:15 Samcfuchs now I have that branch working
12:15 dhsanket joined #git
12:16 InterMittent joined #git
12:16 Samcfuchs And I pretty much want that to be my master
12:16 Samcfuchs bc I don't think I can merge the two at this point
12:17 InterMittent joined #git
12:18 baba_ joined #git
12:18 InterMittent__ joined #git
12:19 cbreak Samcfuchs: so, rename the branches?
12:20 cbreak or if you want to do it without history rewriting, git merge -s ours master, then rename
12:20 mdw joined #git
12:20 Samcfuchs Yeah but my remote is a mess too
12:21 Samcfuchs I pushed my fix branch and now it has a mix of the two
12:21 Samcfuchs force pushing didn't help, it thinks it is up to date
12:21 tristanp joined #git
12:22 elastix joined #git
12:22 fmcgeough joined #git
12:24 eletuchy joined #git
12:24 settermjd joined #git
12:24 rgrinberg joined #git
12:25 kristoff_ joined #git
12:26 fracting joined #git
12:26 Raging_Hog joined #git
12:27 dimi1947 joined #git
12:28 tristanp joined #git
12:29 dopesong_ joined #git
12:31 sigma__ joined #git
12:31 import_this joined #git
12:32 NeverDie joined #git
12:32 Gamecubic joined #git
12:33 kyledr joined #git
12:33 maucar joined #git
12:33 tristanp joined #git
12:34 EY joined #git
12:35 liquidjamm joined #git
12:35 sigma__ I've made some progress since yesterday, but I still have two branches with many unique commits in each that I would like to merge, but preferably using a rebase to keep linear history.
12:35 sigma__ Doing so leads me to many conflicts, and some of them seem to repeat over and over. I'm not sure that git-rerere is the answer, but can anyone help me sort out what I should be doing here?
12:36 pingwindyktator left #git
12:36 mda1 joined #git
12:36 sigma__ I believe I could just merge one into the other, resolve the conflicts, and be done, but I don't know if that is the best way to proceed.
12:36 sigma__ Somehow, it seems sloppy?
12:39 fracting joined #git
12:41 jeeger Ah, I just had to revert *after* merging, since before the merge, the files were still available, since the delete commit hadn't even "happened" yet.
12:42 tristanp_ joined #git
12:42 selckin hodor
12:42 Gianormagantrous joined #git
12:42 Gianormagantrous joined #git
12:43 a_thakur joined #git
12:44 sigma__ I guess I'll start working through the rebase with rerere enabled and see if it takes care of the bulk of the work after the first set of conflicts are manually resolved.
12:44 nilsi joined #git
12:44 mamParra joined #git
12:45 medeirosthiiago joined #git
12:45 tristanp joined #git
12:46 nnyk_ joined #git
12:47 PCatinean joined #git
12:47 tristanp_ joined #git
12:49 yude joined #git
12:51 tristanp joined #git
12:51 cdown joined #git
12:53 tristanp_ joined #git
12:55 ciampix joined #git
12:56 fracting joined #git
12:56 garethdaine joined #git
12:56 tristanp joined #git
12:57 KeelOfSteel joined #git
12:58 acetakwas Do you just fork, clone, code and push code OR attend to issues if you find one you think you can solve?
12:59 CheckDavid joined #git
13:01 dstegelman joined #git
13:01 italoacasas joined #git
13:03 mkoskar joined #git
13:03 jimi_ joined #git
13:04 zincrokx joined #git
13:04 synthmeat joined #git
13:05 ig0r__ joined #git
13:06 happy-dude joined #git
13:06 synthmeat joined #git
13:07 zalatovo joined #git
13:07 zivester joined #git
13:11 annoymouse joined #git
13:11 flaguy48 joined #git
13:12 Gloomy joined #git
13:13 PCatinean joined #git
13:13 eletuchy joined #git
13:14 Gloomy joined #git
13:15 interne7y joined #git
13:17 bsanford joined #git
13:17 rnsanchez_ joined #git
13:18 ochorocho__ joined #git
13:18 tristanp_ joined #git
13:19 baba_ joined #git
13:19 lamppid joined #git
13:20 zalatovo joined #git
13:25 bronson joined #git
13:25 puff Good morning.
13:25 Virox Just done a git commit --amend on to a merge commit by accident. How would I go about undoing that? ;D
13:26 Rish joined #git
13:27 nivag joined #git
13:28 Virox im in a branch so I can trash and start again. I just want my work from that merge commit
13:30 tristanp joined #git
13:30 ntshetty joined #git
13:31 Gsham joined #git
13:33 peroht joined #git
13:34 chachasmooth joined #git
13:34 tristanp joined #git
13:34 Rish_ joined #git
13:35 sigma__ Is it normal for vimdiff as a mergetool to sometimes open with only 3 vertical panels?
13:35 cbreak Virox: git reflog
13:36 cbreak Virox: i.e. git reset --soft HEAD@{1}
13:36 livingstn joined #git
13:36 mehola joined #git
13:36 sigma__ There doesn't appear to be a BASE panel top and center. Instead, the center full-height vertical panel is the current file with the conflict details, e.g. "<<<<<<< HEAD" etc.
13:37 Rooxo joined #git
13:39 elastix joined #git
13:39 liamonade joined #git
13:39 zalatovo joined #git
13:39 Rish joined #git
13:40 osse sigma__: sounds like someone installed Fugitive
13:41 csd_ joined #git
13:41 chachasmooth joined #git
13:41 sigma__ osse: I certainly didn't. Not knowingly, anyhow.
13:44 JeroenT joined #git
13:44 jaafar joined #git
13:44 osse sigma__: hmm, maybe there is no base?
13:44 tristanp_ joined #git
13:44 osse are you merging orphan branches and such?
13:45 sigma__ osse: It's possible. Sorry I don't know for sure.
13:45 osse sigma__: how often is sometimes?
13:45 osse 50/50 ?
13:46 raijin joined #git
13:46 k3rn31 joined #git
13:46 dopesong joined #git
13:46 gypsymauro joined #git
13:46 gypsymauro hi
13:46 sigma__ osse: I resolved one conflict and every one since has been this way. For the last 20 minutes.
13:46 sigma__ Not that I'm moving particularly quickly.
13:46 tristanp joined #git
13:47 gypsymauro I've a project with many folder and files, I created a new git repository with git init, how can I add all files and subfolders recursively?
13:47 zalatovo joined #git
13:47 sigma__ gypsymauro: git add --all .
13:48 sigma__ From the project root.
13:48 liuzhen joined #git
13:48 chachasmooth joined #git
13:48 dopesong joined #git
13:48 Gsham joined #git
13:49 diegoviola joined #git
13:49 EY___ joined #git
13:50 Dougie187 joined #git
13:50 srcerer joined #git
13:51 tristanp_ joined #git
13:53 AaronMT joined #git
13:53 MacGyver joined #git
13:53 Tim-SEM joined #git
13:54 Virox Will look into it. Thanks cbreak
13:54 Virox I always forget about reflog
13:54 dopesong joined #git
13:55 cdg joined #git
13:55 alex1a joined #git
13:57 ash_workz joined #git
13:58 Tim-SEM left #git
13:59 prsn joined #git
13:59 k3rn31_ joined #git
14:00 boudiccas joined #git
14:00 NeverDie joined #git
14:02 iamtakingiteasy joined #git
14:03 iamtakingiteasy hi, how can i merge changes from other branch file version with current working copy?
14:03 iamtakingiteasy basically, i want the >>>>>>> ======== <<<<<<<<<< thingies for one file
14:04 iamtakingiteasy git checkout otherbranch -- filepath ; seems to be replacing contents entirely
14:04 iamtakingiteasy and what i want is a merge
14:04 dopesong joined #git
14:05 dopesong joined #git
14:06 jast iamtakingiteasy: I'm not aware of an option for that. in any case, in order to get these types of conflict markers you need three versions of the file, not two. in a normal merge git automatically figures out which three versions to use to generate the markers.
14:06 madewokherd joined #git
14:08 iamtakingiteasy aha, thanks. using that info, i think i've found an answer: https://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_manual_remerge ( which is bascially git merge-file )
14:10 mangolisk joined #git
14:11 axl_ joined #git
14:11 King_Hual joined #git
14:14 nowhereman joined #git
14:16 SwiftMatt joined #git
14:17 interne7y joined #git
14:17 tristanp joined #git
14:18 scarabx joined #git
14:18 axl__ joined #git
14:20 tristanp_ joined #git
14:21 luke_penn joined #git
14:21 phaleth joined #git
14:22 trista___ joined #git
14:22 fahadash joined #git
14:22 axl_ joined #git
14:24 L8D joined #git
14:24 clemf joined #git
14:26 tristanp_ joined #git
14:27 jgornick_ left #git
14:27 unforgiven512 joined #git
14:27 fuchstronaut joined #git
14:27 lindenle joined #git
14:28 unforgiven512 joined #git
14:28 unforgiven512 joined #git
14:29 unforgiven512 joined #git
14:29 jgornick joined #git
14:30 fuchstronaut I have to develop a new feature for which I would like to have a new branch, i.e. "new_feature". For this feature I need two classes, one that was developed on "branch_a" and one that was developed on "branch_b". Both are based on master and already pushed. What do I have to do so I can start "new_feature" on top of commits from "branch_a" and "branch_b" locally, without screwing up whatever I pus
14:30 fuchstronaut hed
14:32 Someguy123 fuchstronaut: I think that's what cherrypick is for?
14:32 dopesong joined #git
14:32 rpd you could cherry pick, but you could also just merge twice
14:32 sargas joined #git
14:32 fuchstronaut Someguy123: will cherrypick copy the commits?
14:33 Someguy123 https://git-scm.com/docs/git-cherry-pick
14:33 joki joined #git
14:33 kyledr joined #git
14:33 Someguy123 "Given one or more existing commits, apply the change each one introduces, recording a new commit for each."
14:33 fuchstronaut alright, I see
14:33 Someguy123 otherwise, you could just merge them both into the feature branch
14:33 fuchstronaut later if someone is going to merge all 3 branches, will it somehow be dirty to have these commits on another branch?
14:33 Someguy123 not sure why you wouldn't do that
14:33 dhollinger joined #git
14:34 tristanp joined #git
14:34 Someguy123 fuchstronaut: any reason you
14:34 fuchstronaut I don't know, I am afraid that merging two branches that are already pushed and then basing a new one on them might screw something up on origin
14:34 Someguy123 any reason you're not just merging in those two branches into the feature?
14:34 Someguy123 fuchstronaut: if they're already pushed, that's fine
14:34 rpd fuchstronaut: your new branch isn't going to do anything to your origin branches
14:34 Someguy123 just do a rebase
14:34 mmlb joined #git
14:34 Someguy123 git merge master; git rebase
14:35 Someguy123 that'll put any commits you made before the push, after the master's commits
14:35 fuchstronaut I am not allowed to push anything on master
14:35 rpd you don't need to push anything to master
14:35 * fuchstronaut does not know what he is doing or talking about
14:35 Someguy123 fuchstronaut: so you have two branches, are they both completely different?
14:36 Someguy123 i.e. both have diverged from master in a different way?
14:36 fuchstronaut a and b are completely different, but both are based on master
14:36 fuchstronaut now I want c based on the commits from A and B
14:36 rpd the answer you're looking for is: just try it; your local branches aren't going to affect your origin branches unless you push and a new branch isn't going to affect any other branch at all
14:36 nnyk_ joined #git
14:36 Someguy123 fuchstronaut: when those branches are done, A&B will be merged back into master right?
14:36 fuchstronaut Someguy123: they will, if the code is ok
14:36 Someguy123 if so, you can merge A and B into C, then do a rebase so A&B's commits are before C's additions from master
14:37 Someguy123 bascially, git checkout C; git merge A; git rebase; git merge B; git rebase
14:37 Someguy123 that may work ^
14:37 fuchstronaut wont merge make one branch out of A and B? and when I push this do the same to the origin versions of a and b
14:37 Someguy123 fuchstronaut: merge will not delete the old branch, or touch it
14:37 Someguy123 it'll just copy the commits
14:38 fuchstronaut Ah, now I think I get it
14:38 Someguy123 rebase will extract the commits from the "merge" commit and apply them properly
14:38 Someguy123 thus preventing conflicts with master
14:38 fuchstronaut so merge is basically the same as a series of cherry-picks?
14:39 unbalancedparen joined #git
14:39 Someguy123 yes sort-of, merge just basically copies every newer commit from that branch
14:39 cdg_ joined #git
14:39 fuchstronaut So I can create C on top of B and merge A into C?
14:39 Someguy123 that'd work too, yes
14:39 fuchstronaut than push it and origin will have 3 branches based on master, A, B, C?
14:39 Someguy123 yeah
14:39 rpd you could, but you probably want to create C on top of master and merge A and B
14:39 fuchstronaut So create C on master and merge A and B into C?
14:40 fuchstronaut sounds cleaner
14:40 Someguy123 yeah, try that
14:40 Someguy123 just remember to rebase after each one
14:40 Someguy123 or you'll get "merge" commits, which may make merging with master iffy
14:40 JeroenT joined #git
14:41 fuchstronaut So I create C. Merge B into C. Then rebase C onto what?
14:41 Vgr joined #git
14:41 Someguy123 fuchstronaut: just type "git rebase" after the merge
14:41 Someguy123 it should be automatic
14:41 fuchstronaut what will git rebase do?
14:42 fuchstronaut just so you wont have me asking this stuff again
14:42 fuchstronaut maybe i will get it :)
14:42 rpd rebase tries to replay the history of one branch on top of another, essentially
14:42 rpd places where the history diverges significantly will require you to decide manually what happened
14:42 Someguy123 fuchstronaut: tbh I don't fully understand it, but it basically turns a "Merged branch B into C" into "did this change", "fixed this", "added this"
14:42 Someguy123 fuchstronaut: ^
14:43 Someguy123 then you have real commits, rather than a merge commit which might make future merging into master have conflicts
14:43 Someguy123 i think you can just do: git merge B --rebase
14:43 Someguy123 and then git merge C --rebase
14:44 Someguy123 that's basically the same
14:44 rpd Imagine if you have branch B which modifies similar files as newer changes to master and you attempt to rebase B on master, git will try to insert B's commits in the correct place in the timelines, as if B were always in sync with master.
14:45 rpd as opposed to simply merging, which will combine the HEAD of two branches into a merging commit that now places them in sync. The difference is rewriting history versus combining history
14:46 mdw joined #git
14:46 lucido-cwl joined #git
14:47 fuchstronaut ok so I created C on top of master and did "merge B"
14:47 fuchstronaut now when I type "git rebase" it asks me to specify a branch I want to rebase against
14:48 fuchstronaut In source tree it looks like I have created C on top of B for now
14:48 tristanp joined #git
14:48 Someguy123 fuchstronaut: if you're using sourcetree, it may have already rebased
14:48 Someguy123 type "git log"
14:48 fuchstronaut I did the console thing
14:49 Someguy123 if there's no commit that says something like "merged A into B"
14:49 fuchstronaut just checked in source tree
14:49 fuchstronaut no there are non
14:49 Someguy123 then it is rebased
14:49 Someguy123 yeah then it must have rebased it
14:49 fuchstronaut might this have something todo with that fast forward thing git does
14:49 fuchstronaut ?
14:49 Someguy123 oh, that's a good point
14:49 Someguy123 when you merge A you might have to rebase then
14:50 Someguy123 since A will have commits before B's
14:50 fuchstronaut I really really dont know what I am doing :-)
14:50 fuchstronaut yep, now it is asking me to create a merge commit message
14:50 rpd eh, fast-forwarding is just saying that really the two branches don't modify similar files so there's no need to look harder at the history
14:50 sangy joined #git
14:51 fuchstronaut should I create this merge commit now?
14:51 Someguy123 rpd: I thought it was more like, you haven't made any new commits since that
14:51 Someguy123 e.g. merging A into master, A only has new commits, master hasn't changed, so it just loads them "fast forwards"
14:51 Someguy123 fuchstronaut: maybe cancel it
14:51 Someguy123 then just do "git merge --rebase A" instead
14:51 Someguy123 that's two in one right there ^
14:51 rpd yes, it also means that one branch is ahead of another entirely, so we can just put all the commits there
14:52 stonerfish joined #git
14:52 fuchstronaut will I screw something up if i do it step-by-step?
14:52 Someguy123 probably not
14:52 quenode joined #git
14:53 fuchstronaut so, there is my merge commit
14:53 jceb joined #git
14:53 fuchstronaut now rebase C on master?
14:53 Someguy123 i don't know what that would mean, I just say type "git rebase"
14:53 Someguy123 and it'll do it's thing
14:53 interrobangd joined #git
14:53 rpd ideally, you don't want a merge commit
14:54 david007 joined #git
14:55 fuchstronaut rpd, now it is too late
14:55 fuchstronaut i guess..
14:55 settermjd joined #git
14:55 Someguy123 fuchstronaut: nah it's fine
14:55 Someguy123 type "git rebase"
14:55 Someguy123 that's the point of rebase
14:55 Someguy123 it'll unwravel that merge commit into the originals
14:55 boudicca joined #git
14:56 fuchstronaut There is no tracking information for the current branch.
14:56 fuchstronaut Please specify which branch you want to rebase against.
14:57 fuchstronaut rpd: what would have been a way to get what I want without a merge commit?
14:57 stoned left #git
14:57 osse fuchstronaut: git rebase master, then
14:58 fuchstronaut osse: thank you
14:58 fuchstronaut now the merge commit is gone and I have A, B, C based on master
14:58 fuchstronaut all commits have different hashes
14:58 v0n joined #git
14:58 fuchstronaut guess that was what I wanted
14:58 fuchstronaut thank you so much!
14:59 fuchstronaut I hope merging A, B and C later into master wont be a pain
14:59 osse fuchstronaut: to be fair git's error message shouldn't be all that difficult to figure out
14:59 sbeex joined #git
15:00 sbeex hello :)
15:00 gitinfo sbeex: 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.
15:01 dreiss joined #git
15:01 sbeex I would like to ask something related to git good pratices. I have red we have develop, release and master branches. Well where am I supposed to generate my nightly builds from ? develop or rellease ?
15:01 ceaucari joined #git
15:01 Neico joined #git
15:01 mda1 joined #git
15:02 boudiccas joined #git
15:02 ocbtec joined #git
15:02 corruptmem joined #git
15:03 corruptmem anyone ever had a problem with git clean -fdX not working recursively? (no submodules or anything like that)
15:03 tinajohnson___ joined #git
15:03 sigma__ I'm trying to use fugitive in vimdiff mode with git mergetool, because most of the time it seems I just want to use the LOCAL version in its entirety.
15:03 corruptmem this is happening on my repository: https://gist.github.com/corruptmem​/f29dc990b1aab7ced53debce78f7ff63
15:04 sigma__ When I switch to the LOCAL window and run :Gwrite!, it says it writes the file, but when I exit vimdiff, it says nothing seems to have changed.
15:04 zivester joined #git
15:04 osse So you do have Fugitive
15:04 sigma__ osse: I didn't until just now.
15:06 kilo_bravo joined #git
15:06 sigma__ Maybe I need to use Gdiff instead of vimdiff?
15:07 boudicca joined #git
15:07 espindola joined #git
15:08 Slush-_ left #git
15:08 eijk joined #git
15:09 Gsham joined #git
15:10 Slush- joined #git
15:10 v0n joined #git
15:10 frem_ joined #git
15:11 eka joined #git
15:13 elastix joined #git
15:14 sigma__ Just watched a tutorial on doing exactly what I'm trying to do and it's not working as it does in the video: http://vimcasts.org/episodes/fugitive-vim​-resolving-merge-conflicts-with-vimdiff/ See 9m 50s
15:14 sigma__ Keeping one parent version in its entirety
15:15 osse As much as I dig Vim I think you better ask that in #vim
15:15 InfoTest joined #git
15:15 sigma__ When I run :Gwrite! from the LOCAL parent, it tells me that my LOCAL parent file has been written, instead of applying the change to the working copy.
15:15 sigma__ osse: Will do.
15:17 boudicca joined #git
15:17 interne7y joined #git
15:18 tvw joined #git
15:19 ochorocho__ joined #git
15:20 rafalcpp joined #git
15:21 IWishIKnew joined #git
15:21 fscala joined #git
15:23 boudiccas joined #git
15:23 tristanp joined #git
15:27 dopesong joined #git
15:27 boudicca joined #git
15:27 efco joined #git
15:28 SteffanW joined #git
15:28 kam270 joined #git
15:31 madewokherd joined #git
15:34 _28_ria joined #git
15:34 tristanp joined #git
15:34 dreiss joined #git
15:35 Darcidride joined #git
15:35 kpease joined #git
15:36 jceb joined #git
15:38 Noldorin joined #git
15:40 Virox So cbreak this is my git reflog https://gist.github.com/JamieWhite​/3d83a5ed8d1f4d96185541b03ab8161d
15:40 Virox I _think_ I want HEAD@{8}
15:41 Virox git reset --soft HEAD@{8} does nothing though
15:42 rishi joined #git
15:43 Virox Okay I think I got it with git reset --soft HEAD{9}
15:43 a_thakur joined #git
15:44 kadoban joined #git
15:47 eijk_ joined #git
15:47 watersoul joined #git
15:48 jbitdrop joined #git
15:49 brainwash joined #git
15:49 Rish joined #git
15:49 _28_ria joined #git
15:50 JeroenT_ joined #git
15:50 Urchin joined #git
15:51 thiago joined #git
15:51 hobodave joined #git
15:52 Terens joined #git
15:56 jjasinski joined #git
15:57 eletuchy joined #git
15:58 WayToDoor joined #git
15:59 hobodave_ joined #git
16:00 ciampix joined #git
16:00 tristanp left #git
16:01 d4rklit3 joined #git
16:01 netj joined #git
16:02 tristanp joined #git
16:03 rgrinberg joined #git
16:04 LionsMane joined #git
16:06 jceb joined #git
16:06 LionsMane joined #git
16:07 Vgr_ joined #git
16:11 Rish joined #git
16:12 dreiss joined #git
16:15 eletuchy_ joined #git
16:17 Xano joined #git
16:17 Cabanossi joined #git
16:18 interne7y joined #git
16:19 dmto joined #git
16:20 imachuchu joined #git
16:20 tristanp joined #git
16:20 f3r70rr35f joined #git
16:22 ahmedelgabri joined #git
16:23 subhojit777 joined #git
16:23 SimonNa joined #git
16:25 synthroid joined #git
16:27 jfran joined #git
16:27 pwnz0r joined #git
16:28 ahmed_elgabri joined #git
16:28 tristanp_ joined #git
16:29 LeBlaaanc joined #git
16:31 tristanp joined #git
16:33 algun joined #git
16:34 myndzi joined #git
16:34 bjpenn joined #git
16:34 myndzi `git clean -fdx` states "Removing <dir>/", but the directory still exists; any idea?
16:35 lolmac joined #git
16:36 afuentes joined #git
16:37 mohabaks joined #git
16:38 P4Titan joined #git
16:39 P4Titan Hello all. I have a question: if there are certain files that I would like to commit so that other developers can use, but I would like to exclude them (via .gitignore or something) from production commits, what would be the best way to approach this?
16:39 eletuchy joined #git
16:42 Guin joined #git
16:42 Hedgework P4Titan: I'm confused, why don't you want developer scaffolding in your main repo?
16:42 Hedgework What are you ultimately trying to accomplish?
16:42 P4Titan Say this is a bash script that I want other developers to access
16:42 P4Titan but I want its existance to be transparent to users
16:43 Hedgework I'm confused...end users who don't dev on your project access your repo?
16:43 P4Titan Well, on github
16:44 P4Titan or should I simply include all files
16:46 elementalest joined #git
16:46 elementalest joined #git
16:48 baba_ joined #git
16:49 Sonderblade joined #git
16:50 ferr joined #git
16:51 Hedgework I include everything.  It makes it MUCH easier for drive-by contributors and new developers to get a handle on your project. :)
16:51 P4Titan That's what I'd assume
16:51 P4Titan yes
16:51 P4Titan thanks!
16:51 Hedgework You are very welcome.
16:51 Hedgework HedgeMage: Attacking the premise of the question since 1982. :P
16:51 deadpool joined #git
16:51 Guest79606 i want to use jekyll
16:52 Guest79606 but with a subdirectory
16:52 eletuchy joined #git
16:52 Hedgework Guest79606: It would be easier to help you with more details and less enter key. :)
16:52 dars like -> www.dars.com/blog
16:53 dars How to install jekyll on a subdirectory ?
16:53 Hedgework THis sounds like a jekyll question, not a git question.
16:53 zacsek joined #git
16:53 dars so where do i ask this ?
16:54 Arahael dars: maybe the jekyll website,
16:54 tristanp_ joined #git
16:54 dars I searched already
16:54 Arahael dars: which, incidentially, gives a very clear instructions.
16:54 dars but it's not working
16:54 Hedgework dars: their website says that there is a #jekyll here on freenode
16:54 dars ohh
16:54 dars thanks
16:55 dars i will ask there
16:55 espindol_ joined #git
16:55 dars Thanks Hedgework
16:56 hashpuppy joined #git
16:57 hahuang65 joined #git
16:57 netj joined #git
16:58 zacsek joined #git
16:58 renlo joined #git
16:58 tristanp joined #git
17:02 Hello71 joined #git
17:03 tristanp_ joined #git
17:03 mikecmpbll joined #git
17:07 dars_ joined #git
17:07 edude03 joined #git
17:08 aswen joined #git
17:08 |2701 joined #git
17:11 kyledr joined #git
17:11 kyledr_ joined #git
17:11 brainwash left #git
17:12 EvilPenguin joined #git
17:12 ril joined #git
17:14 axl_ joined #git
17:14 t4nkd joined #git
17:14 nwkj86 joined #git
17:14 ahmedelgabri joined #git
17:15 ril joined #git
17:18 m_antis joined #git
17:18 aard joined #git
17:18 ilmgb joined #git
17:19 interne7y joined #git
17:19 tristanp joined #git
17:19 AaronMT joined #git
17:19 mikecmpbll joined #git
17:20 nilg joined #git
17:22 rpd left #git
17:23 josuebrunel joined #git
17:24 jimi_ joined #git
17:25 InfoTest joined #git
17:27 import_this joined #git
17:30 Psychiatrist joined #git
17:30 bronson joined #git
17:31 Sasazuka joined #git
17:31 Mobutils joined #git
17:33 Hello71 joined #git
17:33 mase-tech joined #git
17:34 synthroid joined #git
17:35 mikecmpbll joined #git
17:36 cyan__ joined #git
17:37 josue joined #git
17:40 njt joined #git
17:40 ceaucari joined #git
17:41 Bodger joined #git
17:41 koltroll joined #git
17:43 nevodka joined #git
17:43 hobodave joined #git
17:44 shinnya joined #git
17:45 tristanp_ joined #git
17:45 Bodger Hi, y'all. How do I list all my tags along with the commit hashes they point to? $(git tag -l) seems to show names only.
17:46 compeman joined #git
17:46 T4nk5bb0t joined #git
17:47 compeman joined #git
17:47 phroa Bodger: this works, there might be an official way though $ git tag -l | paste - <(git tag -l | xargs git rev-parse)
17:47 raijin joined #git
17:47 T4nk5bb0t What happens to the commits that have not been pushed when you run git reset head? Are they erased?
17:48 perlpilot no
17:48 phroa T4nk5bb0t: the commits are no longer part of the history tree you're in, but they can be retreived from man git-reflog until they are garbage collected (~30 days)
17:48 gitinfo T4nk5bb0t: the git-reflog manpage is available at http://jk.gs/git-reflog.html
17:48 T4nk5bb0t phroa, Thanks!
17:49 Bodger phroa: works for me! Thanks.
17:49 phroa Bodger: I threw that together in ten seconds, it's a real bodge ;)
17:49 phroa the 'paste' command is real swell
17:50 perlpilot paste is nice, but I've always thought that join should be able to do that in some way
17:51 Bodger Hmm. And it works to tell me I went and created a tagname/branchname collision. Guess I know what I'm fixing next!
17:51 phroa perlpilot: yeah, I've never really got the hang of join fields though
17:51 phroa Bodger: I'd confirm that manually if I were you. I don't trust me.
17:51 perlpilot phroa++  that's an excellent security position  :)
17:52 fuchstronaut joined #git
17:53 Bodger phroa: I can confirm it from memory, fortunately. And fortunately the branch is ready for deletion with the tag at its endpoint, so at least I'm consistent :)
17:54 diegoaguilar joined #git
17:54 sangy joined #git
17:55 diegoaguilar joined #git
17:56 Bodger Actually! `lam  <(git tag -l) -s": " <(git tag -l | xargs git rev-parse)` works nicely and gives me my once-every-decade excuse to use `lam`.
17:57 * perlpilot has never used lam
17:58 crose joined #git
17:58 P4Titan` joined #git
17:58 P4Titan` left #git
17:59 boombatower joined #git
18:03 axl_ joined #git
18:03 ril joined #git
18:04 bibble joined #git
18:05 renlo left #git
18:05 phroa Bodger: gee, 'lam' isn't even a program I can install. is it in a utils package?
18:06 synthroid joined #git
18:06 perlpilot phroa: lam == "laminate"  it's roughly the same as paste
18:06 EvilPenguin joined #git
18:07 perlpilot (it's a BSDism IIRC)
18:07 phroa mmm
18:07 raijin joined #git
18:09 phroa ty internet
18:09 phroa BSD Laminate Pro Sail - BALOGH™ SAIL DESIGNS (BSD)
18:09 Bodger Yeah, I think so. paste also has extra perks like, say, knowing about line endings. lam is literally "slap the characters from this file to the right of the characters from that file."
18:09 phroa Introducing BSD's new option for our Batwing™ sails LAMINATE PRO. LAMINATE PRO . Our new sail line, LAMINATE PRO is a Batwing™ sail made of laminate polyester ...
18:09 Meteorhead I'd like to delete a certain number of commits from a master branch, which one do you guys think  its better for my situation: an interactive rebase or cherry picking ?
18:10 Bodger I've always assumed it was intended as a TTY-era terminal muxer. But now we're thoroughly OT.
18:11 phroa Meteorhead: I would use rebase -i -- you can just delete a 'pick' line to remove a commit. cherry-pick is a royal mess for deleting things
18:11 phroa man git-rebase
18:11 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
18:11 nilg joined #git
18:12 Meteorhead phroa: thank you sir, thats why Id like to do this with less trouble lol
18:12 ajf- joined #git
18:13 tristanp joined #git
18:17 tristanp_ joined #git
18:17 hazelux joined #git
18:19 tristanp joined #git
18:19 bjpenn joined #git
18:20 interne7y joined #git
18:20 texasmynsted joined #git
18:23 cyan__ joined #git
18:27 Cabanossi joined #git
18:27 netj joined #git
18:27 CubiK joined #git
18:28 bket joined #git
18:29 satifant joined #git
18:31 relect joined #git
18:32 zeallo joined #git
18:33 multi_io joined #git
18:34 zeallo joined #git
18:35 relect joined #git
18:37 eletuchy joined #git
18:39 Gsham joined #git
18:41 cdown joined #git
18:43 mikecmpbll joined #git
18:44 settermjd joined #git
18:44 ToBeCloud joined #git
18:46 wieselchen joined #git
18:48 zincrokx joined #git
18:48 cyan__ joined #git
18:49 wieselchen Hi, today I stashed dirty workspace on local branch master, then fetched and merged from upstream(1 commit) and wanted to apply the stashed files, but it(egit) didn't let me.  One stashed file was modified by the merge. This should usually work, right?
18:50 _ikke_ It usually means not everything is currently comitted
18:50 _ikke_ what does git status say?
18:50 josuebrunel joined #git
18:50 kadoban wieselchen: What does "it didn't let me" mean exactly?
18:51 illusionmedic joined #git
18:51 raijin joined #git
18:52 UTAN_dev joined #git
18:52 Dyonisos joined #git
18:54 wieselchen Sorry, but I don't remember the error message. It could totally be an egit issue or we did something else involuntarily. We then listed the three stashed files and recreated them manually. But I wanted to read up on that to prevent this from happening again. I will check git status next time with the command line.
18:56 modocache joined #git
18:56 fuchstronaut joined #git
18:57 tristanp_ joined #git
18:59 raininja joined #git
18:59 kadoban wieselchen: My guess would be that it just required a merge, which isn't really problematic at all (see !eek). The other big possibility is that some file had uncommited changes and it refused because that's dangerous, so you just had to commit first or something.
18:59 gitinfo wieselchen: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
19:00 kadoban I don't know egit though, those are my guesses based on git CLI.
19:02 jaequery joined #git
19:02 PCatinean joined #git
19:03 c0ded joined #git
19:05 curvv joined #git
19:06 erichf joined #git
19:06 erichf hello
19:06 diogenese joined #git
19:07 Bodger left #git
19:08 raijin joined #git
19:08 kadoban Hi
19:08 wieselchen kadoban: I appreciate your help and will read up
19:08 erichf http://pastebin.com/feBK7jz5
19:09 erichf Everytime I run git fetch -p, I see the same branch deleted and re added
19:09 erichf What is going on here>
19:09 erichf What is going on here?*
19:09 _ikke_ git remote -v
19:10 ahmedelgabri joined #git
19:11 erichf _ikke_: ok?
19:11 eletuchy joined #git
19:11 erichf the same repo is listed for fetch and push
19:12 zalatovo joined #git
19:13 _ikke_ assuming origin is your remote: git config --get-all remote.origin.fetch
19:13 tristanp joined #git
19:16 Shentino2 joined #git
19:18 arooni joined #git
19:19 raijin joined #git
19:21 ochorocho__ joined #git
19:21 interne7y joined #git
19:21 robbyoconnor joined #git
19:21 tristanp joined #git
19:21 Balliad joined #git
19:21 erichf `+refs/heads/*:refs/remotes/origin/*`
19:21 erichf that's the output
19:21 GavinMagnus joined #git
19:21 erichf I'm not sure what it means though
19:22 osse erichf: what happens is that you
19:22 osse erichf: what happens is that you're on windows
19:22 osse and the branch has changed cases
19:22 GavinMagnus joined #git
19:23 erichf I'm on OSX
19:23 osse I managed to solve it once by navigating to .git/refs/remotes and nuke it all from orbit by hand, then fetching again
19:23 erichf some team members are on windows
19:23 erichf ok
19:23 ojacobson you have some case problems, yeah
19:24 rgrinberg joined #git
19:24 ojacobson git update-ref -d refs/remotes/origin/Defect/FOO-13950 refs/remotes/origin/defect/FOO-13950
19:24 ojacobson then fetch again
19:25 osse for some reason I managed to get the same problem with the same branch again
19:25 osse that's when I busted out my nuclear arsenal
19:27 AntiNoisyBot joined #git
19:28 tristanp_ joined #git
19:28 fuchstronaut joined #git
19:32 jagob joined #git
19:34 tristanp joined #git
19:35 tristanp joined #git
19:37 liuzhen_ joined #git
19:37 boudiccas joined #git
19:38 kill9 joined #git
19:38 mehola joined #git
19:39 tristanp_ joined #git
19:40 liuzhen_ joined #git
19:40 norc joined #git
19:41 elementaru joined #git
19:41 import_this joined #git
19:41 norc elementaru, what command did you use to revert?
19:42 elementaru hello
19:42 gitinfo elementaru: 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.
19:42 elastix joined #git
19:42 weckl joined #git
19:45 diegoaguilar joined #git
19:45 elementaru ok so I did commit A but did not push, then I did commit B but did not push. then I enternet "git revert commit_B_id"
19:46 elementaru but I do not see files and changes I made between commit A and B, any way to get them?
19:47 ojacobson you now have three new commits: A, B, and anti-B (in that order)
19:47 fstd_ joined #git
19:47 elementaru yes..
19:47 tobiasvl what changes did you make between A and B?
19:47 elementaru a few new files and some changes to existing files
19:47 _ikke_ the anti-B commit undid the changes from B
19:47 EvilPeng1 joined #git
19:48 boudicca joined #git
19:49 norc elementaru, the idea of revert is to undo the changes a specific commit (usually back in your history) did.
19:50 elementaru so if I revert anti-B I will have the changes again?
19:50 _ikke_ joined #git
19:52 norc elementaru, I would first nuke the lat commit with git `reset --hard HEAD~1' and then "reopen" the previous commit `git reset HEAD~1'
19:52 sigma__ left #git
19:53 Gsham joined #git
19:53 norc elementaru, you could also use --soft on the last to leave both the wd and the index.
19:54 norc That way the history won't look as shitty.
19:55 import_t_ joined #git
19:55 chrisgeorge joined #git
19:56 raijin joined #git
19:57 elementaru alright thanks, I think I got the gist of git
19:59 LionsMane Are there any github users here?  I'd like to completely reset a github repo, basically start from scratch.  I found an article that walked thru creating a brand new repo locally and then doing a git push —force —set-upstream origin master.
19:59 HedgeMage !github
19:59 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
19:59 norc LionsMane, strictly git-wise that should be enough. But github may do all sorts of caching
20:00 osse github lets you delete the whole effing thing
20:00 osse and you can create a new one with the same name
20:00 norc That sounds like the wiser choice.
20:00 LionsMane norc: GitHub aside, doing that push above, it'll clear out all the commits and branches?
20:00 norc From what I noticed is that removing refs can be a tough thing in github.
20:01 peepsalot joined #git
20:01 LionsMane osse, I don't admin the root account.  I just admin to the one repo.
20:01 Steadfast joined #git
20:02 osse LionsMane: isn't that enough to let you delete that one repo?
20:02 norc LionsMane, force pushing an empty repository will effectively turn the remote into the same empty repository.
20:02 tristanp joined #git
20:02 norc LionsMane, keep in mind that github may keep refs lying around through which users can still access old things.
20:02 eijk joined #git
20:03 LionsMane norc: Ah ok, I'll delete the repo and see what happens.
20:03 norc LionsMane, it shouldn't be an issue, but if there are security considerations this might be relevant.
20:04 cdg joined #git
20:04 norc LionsMane, just try to be careful with push --force as this can really cause headaches. :)
20:04 osse wouldn't he need to push --delete all the other stuff?
20:05 norc You are right.
20:06 tristanp joined #git
20:07 norc osse, branches and tags should cover it, shouldn't it?
20:08 Xano joined #git
20:09 ahmedelgabri joined #git
20:10 zincrokx joined #git
20:11 mdw joined #git
20:12 Balliad joined #git
20:12 osse norc: probably
20:13 osse norc: it in principle one should git fetch origin 'refs/*:refs/topkek/*' to see all refs
20:14 raijin joined #git
20:16 WaReZ joined #git
20:16 tristanp_ joined #git
20:18 neanderslob joined #git
20:19 afuentes joined #git
20:20 Gsham joined #git
20:24 import_this joined #git
20:27 dhollinger joined #git
20:28 fyrman joined #git
20:29 NashDev joined #git
20:29 NashDev Someone just submitted a pull request from a repo they forked of mine, how do I accept a portion of that pull request?
20:29 preaction NashDev: manually, by fetching their branch and picking out the bits you want
20:31 norc Talk about being rude.
20:32 preaction what?
20:32 tristanp joined #git
20:33 tobiasvl leaving probably
20:33 mda1 joined #git
20:33 preaction eh. that's basically how this works
20:34 jstimm joined #git
20:35 josuebrunel joined #git
20:36 milki rude would be demanding a !refund and leaving
20:36 gitinfo If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.
20:36 tristanp_ joined #git
20:38 radsy joined #git
20:40 ril joined #git
20:40 Kicer86 joined #git
20:41 tristanp joined #git
20:42 mda1 joined #git
20:47 boudiccas joined #git
20:49 bjpenn joined #git
20:49 m8 joined #git
20:52 lamont joined #git
20:52 roko joined #git
20:53 roko so I merged abranch to my master branch and used git status...It says my branch is up to date. Shouldn't there be some changes?
20:53 osse roko: git status usually lists differences between the files on disk and the latest commit
20:54 osse if the merge went well there is nothing to report
20:54 norc roko, take a look at your git log
20:54 norc I expect a merge commit to be at the top.
20:54 tristanp joined #git
20:55 norc By the way, are there git commands that a git reflog cannot recover from?
20:55 roko @norc git log does not say anything about a merge. Should it be?
20:55 osse not necessarily
20:55 osse if it was a fast-forward it won't
20:55 roko @osse how do I push the merged changes to github?
20:55 osse git push
20:56 edude03 joined #git
20:56 norc roko, it would contain a new commit at the top regardless. A specific merge commit for a three-way merge or just the commit from the tip of the branch you merged.
20:56 roko I mean I did that but the merged changes are not showing up
20:56 norc roko, what command did you use to "merge the branch" ?
20:57 baine101 joined #git
20:57 roko i had a brach called "new". I used git checkout master and then git merge new. It merged without any problems. git log does not show this merge
20:57 norc roko, were there actually commits to be merged into master?
20:57 osse then it was a fast-forward
20:58 roko @norc i think i did not commit anything in branch new
20:58 jumpman joined #git
20:58 baine101 hello i was wondering if their was a way to NOT ignore one folder thats inside another folder with hundreds
20:59 norc baine101, use ! in your gitignore at the beginning of a pattern to negate the pattern
20:59 kadoban baine101: Yes.  /parent/*  <newline> !/parent/dontignore/    should work
20:59 baine101 norc: is that really how easy it is  :p
20:59 kadoban Note that /parent/ !/parent/dontignore/  actually won't work :-/
20:59 norc baine101, yes!
20:59 norc baine101, git gets easier once you get the basic idea that branches are homeomorphic endofunctors mapping submanifolds of a Hilbert space.
20:59 baine101 im a php dev too i should of known that
21:00 baine101 norc lmao
21:00 baine101 norc: thats halarious
21:00 norc So back to my question! Are there git commands that git reflog cannot recover from?
21:00 shachaf What are homeomorphic endofunctors?
21:01 osse norc: git reflog expire :P
21:01 norc Well..
21:01 kadoban norc: Sure
21:01 baine101 norc: i just tried to "decypher
21:01 baine101 " what you said
21:01 norc baine101, good luck.
21:01 roko @osse what is fast forward merge?
21:01 norc baine101, if you manage to put any sense to it be sure to tell the author.
21:01 baine101 i got to the first word and this was what the definition was ...
21:01 baine101 In the mathematical field of topology, a homeomorphism or topological isomorphism or bi continuous function is a continuous function between topological spaces that has a continuous inverse function.
21:01 jaequery joined #git
21:02 Macaveli joined #git
21:02 shachaf I know what a homeomorphism is and what an endofunctor is.
21:02 kadoban If nothing else, you can totally delete the repo in a filter-branch if you screw up (or specifically try)
21:02 kadoban A bunch of stuff with remotes the reflog won't save you from nicely, etc.
21:02 osse roko: http://sprunge.us/HLPZ
21:02 norc kadoban, why is that?
21:04 kadoban norc: Why is what?
21:04 norc kadoban, why would a filter-branch allow me to reap the repository in a way that reflog cannot help me?
21:05 norc Basically Im trying to get the idea of what kind of things might require an actual backup before doing them.
21:05 norc If any.
21:05 IWishIKnew joined #git
21:05 kadoban norc: Because you can run arbitrary shell commands in some of them, like commit-filter
21:05 hendry joined #git
21:05 norc So far I have lived under the expectation that no matter what stupid stunts I pull that reflog will bail me out.
21:05 norc Oh well.
21:06 aidalgol joined #git
21:06 norc (Though I suppose if I happened to be incarcerated for more than 3 months that would be a problem too)
21:06 kadoban Well, it's somewhat harder to accidentally make a mistake the reflog can't save you from, but … it's not really that hard.
21:07 nickm00 joined #git
21:07 kadoban If nothing else, a backup is often much easier than trying to recover via the reflog, when you're doing something you don't quite understand 100%.
21:07 norc Well, I do have hourly time machine snapshots if everything goes bad.
21:07 adonis joined #git
21:08 layke_ joined #git
21:09 nickm00 Hi! I'm looking for a script that will check a --fixup or --squash commit before I make it to make sure that it will actually rebase correctly, and not allow me to commit it if it does.  Has somebody already written one?
21:09 nickm00 (partial solutions welcome)
21:09 nickm00 (advice for implementing it myself also welcome)
21:09 nevodka joined #git
21:09 thiago nickm00: you can use git apply --cached to test
21:10 layke_ left #git
21:10 thiago nickm00: it will give you false negatives though: --cached can't deal with new or deleted files
21:10 Layke joined #git
21:10 Layke I commited 3 times... made several mistakes. Shouldn't have. I want to get rid of them.. and set a previous commit as the HEAD. I can't fifugre it out.
21:10 tobiasvl Layke: !revert
21:10 gitinfo Layke: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
21:10 import_this joined #git
21:11 tobiasvl Layke: sounds like what you want is e) but have you pushed yet?
21:11 Layke Yes, I pushed :(
21:11 tobiasvl then !rewrite applies
21:11 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
21:11 nickm00 thiago: how does it know which ancestor to try applying against?
21:12 Layke tobiasvl, So, I'm currently on a detached HEAD.. (on the commit that I want). In order to get this back as the new HEAD on master
21:12 thiago nickm00: you tell it
21:12 thiago nickm00: you will have to write the script that finds the ancestor given the commit message (like git rebase -i --autosquash does), then try and see if that fails
21:12 tobiasvl Layke: uh well that's not how you should do it
21:13 mda1 joined #git
21:13 tobiasvl Layke: do you want to remove the commits entirely from the history? do they contain something bad? or do you just want to revert?
21:13 tobiasvl ie. do you actually need to move HEAD back or not
21:13 nickm00 thiago: hm. I want to know not only if the current changes won't apply, but also if subsequent changes will no longer apply after the rebase.
21:13 Layke tobiasvl, I commited too many errors, I ran some tool that changed line endings, and permissions on my entire repos.
21:14 tristanp_ joined #git
21:14 thiago nickm00: the only way to do that is to actually do the rebase
21:14 Layke tobiasvl, I don't care if the commits exist
21:14 Layke tobiasvl, I just want to get back to the previous commit and work from that
21:14 tobiasvl Layke: oh ok. then git checkout master again (or whichever branch it is) and then just git revert them
21:14 bsanford joined #git
21:15 nickm00 ok. Then I probably want a script that does "commit, rebase -i --autosquash, see if successful, revert if not"
21:15 nickm00 or rather "revert in either case"
21:15 nickm00 since I don't want to rebase.
21:16 nickm00 Any example scripts that do "create a temporary branch and then go back to the original state" correctly?
21:16 raijin joined #git
21:16 sangy joined #git
21:16 nickm00 also I guess I'll have to temporarily set core.editor to /bin/true so that the autosquash becomes noninteractive
21:16 mda1 joined #git
21:17 cyan__ joined #git
21:18 mellernoia joined #git
21:18 norc kadoban, thank you for your feedback.
21:19 nnyk_ joined #git
21:21 Layke tobiasvl, Thanks. I also had uncommit local changes I wanted to ditch. I wasn't sure how to do it.. but I did a git checkout (to HEAD), then I git revert HEAD~3
21:22 Layke And then I pushed..
21:22 Layke I think that did it
21:22 ochorocho__ joined #git
21:22 interne7y joined #git
21:23 realz joined #git
21:24 Guest69382 joined #git
21:25 jstimm joined #git
21:26 bollullera joined #git
21:26 tobiasvl I recommend you start looking over your commits before you push :)
21:27 tobiasvl if you wanted to revert all the three last commits I think you should've done git revert HEAD~3..HEAD~
21:29 tristanp joined #git
21:31 johnmilton joined #git
21:33 Shentino joined #git
21:35 bronson joined #git
21:37 baine101 i want to NOT ignore a file in a folder but ignore the res
21:37 baine101 ive got this
21:37 tango_ joined #git
21:37 baine101 vendor /vendor/* !/vendor/torann
21:37 baine101 norc: are you still here ?
21:38 norc Possibly.
21:38 norc One cannot say.
21:38 fuchstronaut joined #git
21:39 mehola joined #git
21:39 benteight joined #git
21:41 radsy joined #git
21:42 GavinMagnus joined #git
21:42 hazelux joined #git
21:44 shinnya joined #git
21:48 thiago baine101: and what's the problem?
21:48 FilipNortic joined #git
21:49 xall joined #git
21:50 baine101 thiago: im trying to NOT ignore a directory in another directory that has lots of other directories and folders within it
21:51 |ifei5g00d joined #git
21:51 thiago and you've tried something. What happened?
21:51 baine101 it hasnt added it to git
21:51 baine101 ive then tried git add .
21:51 fuchstronaut joined #git
21:51 Dougie187 left #git
21:51 baine101 git commit -m "foo bar "
21:51 thiago when you do git add direct/path/to/it, does it say it was ignored?
21:52 tristanp_ joined #git
21:52 baine101 thiago: aha that may be my problem gimmie a sec
21:53 thiago if there's nothing currently tracked in that dir and you ignore it, then the git won't go inside to see what it would not ignore
21:53 thiago the entire dir is ignored
21:53 baine101 The following paths are ignored by one of your .gitignore files:
21:53 thiago you need to first add something inside
21:53 baine101 thiago: their is ... its a symfony package for laravel
21:53 baine101 ive installed myself
21:54 thiago try adding a file inside that path, then check if another file inside that dir is still ignored
21:54 ochorocho__ joined #git
21:54 baine101 1 minoto
21:55 baine101 i just used git add /path/to/file -f
21:55 baine101 that seemed to work so
21:55 mablae joined #git
21:56 thiago ok, now try adding another file in taht same dir, without -f
21:56 baine101 thiago: theirs a git ignorefile within the dir nwo
21:56 baine101 now
21:57 thiago ok, now git add another file in that dir
21:57 thiago is the file also ignored?
21:57 gaen joined #git
22:02 tristanp joined #git
22:06 MattMaker joined #git
22:06 mwhooker joined #git
22:07 rewt`` joined #git
22:07 chachasmooth joined #git
22:08 sagerdearia joined #git
22:08 fuchstronaut joined #git
22:08 fuchstronaut joined #git
22:10 rkazak joined #git
22:11 clemf joined #git
22:11 clemf_ joined #git
22:12 Gsham joined #git
22:13 SwiftMatt joined #git
22:13 baine101 thiago: yes the file is still ignored
22:13 sdothum joined #git
22:13 baine101 the inner file i mean
22:13 m0viefreak joined #git
22:15 fuchstronaut joined #git
22:19 elastix joined #git
22:19 tristanp_ joined #git
22:20 jimi_ joined #git
22:22 modocache joined #git
22:24 interne7y joined #git
22:24 modocache joined #git
22:29 FilipNortic joined #git
22:30 tim-f joined #git
22:32 L8D joined #git
22:32 cyan__ joined #git
22:33 tristanp joined #git
22:34 tim-f left #git
22:34 C4ta|Work joined #git
22:35 LeBlaaanc joined #git
22:37 eletuchy joined #git
22:37 cyan__ joined #git
22:37 tristanp joined #git
22:37 Aerosonic joined #git
22:39 cbreak joined #git
22:39 diegoaguilar joined #git
22:39 kanzure joined #git
22:40 Impaloo16 joined #git
22:41 dreiss joined #git
22:43 import_this joined #git
22:43 ToBeCloud joined #git
22:45 MattMaker joined #git
22:47 son joined #git
22:49 LeBlaaanc joined #git
22:55 cyan__ joined #git
22:55 clemf joined #git
22:57 SimonNa joined #git
22:57 Ardethian\work joined #git
22:58 tristanp_ joined #git
22:59 dreiss joined #git
23:04 kam270 joined #git
23:04 Layke joined #git
23:04 t-mart joined #git
23:04 dodobrain joined #git
23:05 brillig joined #git
23:05 IjonTichy85 joined #git
23:07 SwiftMatt joined #git
23:07 tristanp joined #git
23:08 Blkt joined #git
23:08 rahtgaz joined #git
23:08 rahtgaz joined #git
23:09 Guest55 joined #git
23:10 tristanp joined #git
23:11 zalatovo joined #git
23:15 brillig left #git
23:15 fuchstronaut joined #git
23:15 jhass joined #git
23:19 ffabi joined #git
23:20 tristanp joined #git
23:21 T4nkAbb0t joined #git
23:25 preaction joined #git
23:25 cdown joined #git
23:26 Samual joined #git
23:28 cdown_ joined #git
23:31 rkazak joined #git
23:33 PaperShuttle joined #git
23:34 mablae__ joined #git
23:34 PaperShuttle joined #git
23:36 italoacasas joined #git
23:38 mablae joined #git
23:38 johnny56 joined #git
23:39 tristanp joined #git
23:40 leprechau joined #git
23:44 Sasazuka joined #git
23:44 diogenese joined #git
23:44 mwhooker joined #git
23:45 liquidjamm joined #git
23:47 macivy joined #git
23:47 cdg joined #git
23:47 fscala joined #git
23:51 GavinMagnus joined #git
23:52 mattfoo joined #git
23:53 modocache joined #git
23:53 tristanp_ joined #git
23:54 bronson joined #git
23:54 hahuang65 joined #git
23:55 c0ded joined #git
23:55 Urchin left #git
23:55 bronson_ joined #git
23:59 MacGyver joined #git

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