Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-22

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

All times shown according to UTC.

Time Nick Message
00:00 ollien s/something like/something like this/
00:00 Kallis joined #git
00:00 EvilPenguin joined #git
00:01 kadoban ollien: Er, #vim, possibly? Or maybe I missed something
00:01 ollien shoot
00:01 ollien thank you
00:01 kadoban 'welcome
00:01 ollien today is very far from my day
00:02 horse joined #git
00:03 ajf- joined #git
00:03 texinwien joined #git
00:06 ajf- joined #git
00:08 romerocesar joined #git
00:10 qpdb joined #git
00:10 Rodya_ joined #git
00:12 JackFruh joined #git
00:12 mdw_ joined #git
00:13 diablerouge joined #git
00:16 aidalgol joined #git
00:16 horse joined #git
00:18 nettoweb joined #git
00:19 aidalgol joined #git
00:19 Lyqyd joined #git
00:20 tesuji_ joined #git
00:20 mdw joined #git
00:21 semantipc joined #git
00:24 tgunr joined #git
00:25 mehola joined #git
00:25 Kaisyu joined #git
00:28 rubyonrailed joined #git
00:29 fuchstronaut joined #git
00:29 horse joined #git
00:30 mdw joined #git
00:32 skirk joined #git
00:33 jeffreylevesque joined #git
00:37 guardianJ joined #git
00:38 nettoweb joined #git
00:42 d0nkeyBOB joined #git
00:43 horse joined #git
00:43 aidalgol Where is the alias "!f()" syntax documented?  All I can find are various blog posts with examples.
00:44 ojacobson git help config
00:44 ojacobson or man git-config
00:44 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
00:44 ojacobson > If the alias expansion is prefixed with an exclamation point, it will be treated as a shell command.
00:45 ojacobson the rest is in your shell of choice's documentation
00:45 diablerouge left #git
00:45 aidalgol Ah, thanks.  I missed that.
00:46 LeBlaaan_ joined #git
00:46 aidalgol So what advantage does "!f() { ... }; f" have over just "..."?  (i.e. the body of the function directly)
00:47 aidalgol (This is assuming Bash.)
00:47 ojacobson it has to do with the way bash expands arguments to aliases
00:47 ojacobson er, git expands
00:48 ojacobson alias.foo = … will run 'git foo bar baz --monkey' as 'git … bar baz --monkey', which may not be appropriate
00:48 ojacobson using a shell function lets you use $1, $2, etc, or loop over arguments, or…
00:48 ojacobson it also lets you run multiple Git commands
00:48 ojacobson passing the same args to all of them, for example, rather than only to the last one
00:49 aidalgol Ah, that makes sense when you want to use arguments, but && outside of a function seems to work just fine.
00:49 aidalgol Er, I meant to say as opposed to just "!..." earlier.  So still a shell invocation.
00:50 ojacobson Sure. Even so, if you have any arguments, an && chain will send them all to the last operation, unmodified and unfiltered
00:51 ajf- joined #git
00:53 thiago joined #git
00:54 eka joined #git
00:54 ojacobson I have prune-merged = "!f() { git for-each-ref refs/heads/* --merged | while read hash type ref; do branch=\"$(git rev-parse --abbrev-ref \"${ref}\")\"; git branch -d \"${branch}\"; done; }; f" for example
00:54 ojacobson I never want to deal with arguments, and rather than keeping that in my head, the shell function protects me from myself
00:54 _August_ joined #git
00:55 aidalgol But for something more trivial and without variables, such as "!git stash && git pull && git stash pop", just ! is safe?
00:55 ojacobson define safe
00:55 hahuang65 joined #git
00:56 ojacobson I mean, if you pass it any args, they're going to `git stash pop`, regardless of wheher that makes any sense
00:56 aidalgol I'm not going to get bitten by expansion or substitution bugs.
00:56 fstd_ joined #git
00:56 aidalgol ah, then no, not safe.
00:56 horse joined #git
01:00 Dougie187 joined #git
01:02 ajf- joined #git
01:02 zivester joined #git
01:03 hahuang65 joined #git
01:08 guardianJ joined #git
01:10 ome joined #git
01:10 FuzzySockets joined #git
01:10 horse joined #git
01:11 johnflux joined #git
01:12 GandalfTheWizard joined #git
01:12 johnflux In my project, if I do:  git submodules init && git submodules update          I get a permission denied error.  I have to then edit  .git/config   and edit the submodule url = ssh://....       to add my username like:  url = ssh://johnflux@...
01:12 ajf- joined #git
01:12 johnflux is there another way that I should add the username for ssh?
01:13 dreiss joined #git
01:13 bluepixel joined #git
01:14 btree joined #git
01:15 btree left #git
01:17 eletuchy joined #git
01:17 BombStrike joined #git
01:18 felixjet joined #git
01:21 eletuchy_ joined #git
01:23 GandalfTheWizard joined #git
01:24 horse joined #git
01:25 eletuchy joined #git
01:26 Asiajey joined #git
01:27 lindenle joined #git
01:28 d0nn1e joined #git
01:29 eletuchy_ joined #git
01:32 eletuchy joined #git
01:35 eletuchy_ joined #git
01:37 fracting joined #git
01:37 horse joined #git
01:37 eletuchy joined #git
01:38 eletuch__ joined #git
01:39 cqi joined #git
01:40 david007 joined #git
01:41 eletuchy_ joined #git
01:41 jaguarmagenta joined #git
01:46 eletuchy joined #git
01:46 gkatsev joined #git
01:46 eletuch__ joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
01:50 eletuch__ joined #git
01:50 Wulf4 joined #git
01:50 liuzhen joined #git
01:51 horse joined #git
01:53 EvilPenguin joined #git
01:54 fracting joined #git
01:56 eight58 joined #git
01:57 pks joined #git
01:58 backnforth joined #git
02:00 _28_ria joined #git
02:01 mns joined #git
02:01 drbean_ joined #git
02:03 gkatsev joined #git
02:04 horse joined #git
02:07 DolphinDream joined #git
02:10 Lye383r7 joined #git
02:13 chachasmooth joined #git
02:16 Lye383r7 left #git
02:17 sagerdearia joined #git
02:18 xall joined #git
02:18 horse joined #git
02:18 mda- joined #git
02:20 _August_ joined #git
02:20 nettoweb joined #git
02:20 safe joined #git
02:22 st0opkid joined #git
02:26 mehola joined #git
02:28 Motoko joined #git
02:28 Motoko joined #git
02:30 fuchstronaut joined #git
02:31 xall joined #git
02:31 horse joined #git
02:32 pwnz0r joined #git
02:35 dreiss joined #git
02:35 lindenle joined #git
02:39 durham joined #git
02:44 hexagoxel joined #git
02:45 mmlb joined #git
02:45 horse joined #git
02:46 tristanp joined #git
02:46 Goplat joined #git
02:46 Kronuz joined #git
02:47 jbu joined #git
02:49 jbu all: I'd like to undo a lot of uncommitted deletes in a folder (lazy to do each file one by one) so I'd like to do it recursively or interactively.  I see that I can do this using git reset -- ./, but this removes it from index, but doesn't undo the delete on the filesystem.  Anyone know what I ought to do?
02:49 kadoban jbu: Are the deletes the only uncommited changes?
02:50 jbu kadoban, they are uncommited and currently in my "changes not staged for commit"
02:50 kadoban jbu: Are they the *only* changes though? There's nothing else you want to keep, right?
02:51 jbu kadoban, no, there are other changes I wish to keep, so I don't want to just blow away the whole local branch
02:51 kadoban jbu: Are the other changes you want to keep all commited, or are some uncommited?
02:52 jbu kadoban, the files I wish to keep I've managed to keep in the "committed" section, and the ofiles I wish to undo-delete are in my not-staged-to-delete section
02:53 kadoban jbu: Make a backup just in case (just make a copy of the entire directory). And then you can do something like 'git checkout .' should work
02:54 jbu kadoban, I appreciate your help.  This assumes that I have a manageable number of files localized to a small number of folders, right?  Just for future knowledge, what if I had many many files I wished to keep spreading across many many folders making it really annoying to physically copy?
02:54 xaviergmail joined #git
02:55 kadoban jbu: You can make a backup of any repository by just copying the whole thing, it's just files. It doesn't really assume they're a manageable number. I guess it assumes that you have enough hard drive space to double the size of the thing, but it's only temporary.
02:56 axiom_1 joined #git
02:56 kadoban I asked you to make a backup just because if you misunderstood what I was asking above (about uncommited changes), the checkout command can lose you a lot of work
02:56 kadoban I think we are understanding each other, but I wouldn't 100% bet on it, so ... it's a safety measure.
02:56 jbu kadoban, and then I copy the changed files one by one back into the new local repository, right?
02:57 jbu ah!
02:57 kadoban jbu: No, the backup is just so if something goes wrong you have it. The only command you actually need is the checkout one, that'll bring back the deleted files from the current commit.
02:57 jbu kadoban, I did misunderstand what you said...I didn't notice the period in git checkout...yes this worked perfectly
02:57 jbu I didn't realize checkout worked on folders
02:57 jbu kadoban, thanks a lot!
02:57 kadoban Ah, good. Yep, it does. 'welcome
02:59 horse joined #git
03:00 NeXTSUN joined #git
03:03 rgrinberg joined #git
03:03 zumba_ad_ joined #git
03:04 aavrug joined #git
03:05 nettoweb joined #git
03:06 italoacasas joined #git
03:07 espindola joined #git
03:08 howdoi joined #git
03:10 romerocesar joined #git
03:10 go1111111 joined #git
03:12 horse joined #git
03:14 digidog_ joined #git
03:16 mda1_ joined #git
03:18 Gsham joined #git
03:20 mehola joined #git
03:20 k3rn31 joined #git
03:22 xlegoman joined #git
03:24 ShekharReddy joined #git
03:26 horse joined #git
03:27 durham joined #git
03:28 dreiss joined #git
03:31 Dougie187 left #git
03:32 xall joined #git
03:32 mikecmpbll joined #git
03:33 arescorpio joined #git
03:33 eletuchy joined #git
03:34 rkazak joined #git
03:36 sangy joined #git
03:36 hyperair joined #git
03:36 eletuchy_ joined #git
03:37 nnyk_ joined #git
03:38 jaguarmagenta joined #git
03:39 horse joined #git
03:40 romerocesar joined #git
03:43 diegoaguilar joined #git
03:43 watabou joined #git
03:50 romerocesar joined #git
03:53 dimi1947 joined #git
03:53 horse joined #git
03:55 sebbu joined #git
03:57 eletuchy joined #git
04:00 Lunatrius joined #git
04:00 romerocesar joined #git
04:01 tesuji joined #git
04:07 horse joined #git
04:08 dopesong joined #git
04:11 romerocesar joined #git
04:11 User458764 joined #git
04:13 xaviergmail joined #git
04:14 rscata joined #git
04:15 pwnz0r joined #git
04:19 eletuchy joined #git
04:20 horse joined #git
04:21 romerocesar joined #git
04:22 maestrojed joined #git
04:26 k3rn31 joined #git
04:28 moei joined #git
04:29 glebihan joined #git
04:31 romerocesar joined #git
04:31 fuchstronaut joined #git
04:34 horse joined #git
04:37 mikecmpbll joined #git
04:39 eletuchy joined #git
04:41 yaewa joined #git
04:42 zumba_addict joined #git
04:46 stephaneyfx joined #git
04:46 xall joined #git
04:47 a_thakur joined #git
04:47 horse joined #git
04:50 gkatsev joined #git
04:52 boombatower joined #git
04:52 User458764 joined #git
04:54 nettoweb joined #git
04:55 subhojit777 joined #git
04:56 stephaneyfx joined #git
04:57 netj joined #git
05:01 horse joined #git
05:02 Cabanossi joined #git
05:03 GandalfTheWizard joined #git
05:05 rf__ joined #git
05:10 Codfection joined #git
05:11 romerocesar joined #git
05:14 stephaneyfx Hi all. Sorry if this is a silly question... Why does the "git filter-branch" man page state that variables need to be re-exported for --env-filter? From what I understand in the (ba)sh man page, changing the value of an environment variable does not require to re-export it for the change to appear in subsequent child processes. I guess unless "export -n" is used. What am I missing?
05:14 nilg joined #git
05:14 horse joined #git
05:18 leeN joined #git
05:18 a_thakur joined #git
05:21 romerocesar joined #git
05:26 sauvin joined #git
05:28 inflames joined #git
05:28 horse joined #git
05:28 gkatsev joined #git
05:30 stuh84 joined #git
05:31 Guest55 joined #git
05:34 eletuchy joined #git
05:34 fahadash joined #git
05:36 DirtyCajun joined #git
05:36 ThomasLocke joined #git
05:38 dsantiago joined #git
05:39 User458764 joined #git
05:40 stephaneyfx left #git
05:41 moei joined #git
05:42 horse joined #git
05:43 Jck joined #git
05:43 qt-x joined #git
05:44 cyphase joined #git
05:45 cyphase joined #git
05:45 lordjancso joined #git
05:45 Jck left #git
05:49 retropikzel joined #git
05:51 stonerfish joined #git
05:53 carell joined #git
05:55 horse joined #git
05:56 jason237 joined #git
05:56 Oebele joined #git
05:56 rkazak joined #git
05:57 harish joined #git
05:58 netcrime joined #git
05:59 gkatsev joined #git
06:01 Raging_Hog joined #git
06:02 Repox joined #git
06:03 zumba_addict joined #git
06:05 Guest55 joined #git
06:05 DirtyCajun joined #git
06:07 emPi joined #git
06:09 horse joined #git
06:10 romerocesar joined #git
06:10 drbean joined #git
06:10 netcrime Hi. I´m new to GIT and having trouble Pushing my code. I´m working on Masters branch. Other dev joined and my commit became ahead of origin/master branch (screen: http://prntscr.com/bjfesy). When I try to pull code from git I get an error (screen: http://prntscr.com/bjffxy) Same error when I try to Push my code. How can I fix it? Thank you
06:11 Omen joined #git
06:11 TomyLobo joined #git
06:12 kadoban netcrime: Did you read the error? It tells you what's wrong, and unless I'm badly mistaken, it even gives you options for how to proceed near the bottom.
06:13 reim joined #git
06:13 d0nkeyBOB joined #git
06:13 jceb joined #git
06:14 drbean_ joined #git
06:14 Sucks joined #git
06:15 ShekharReddy joined #git
06:15 netcrime kadoban: Yes I see the error but I don´t know how to fix it. I´m perfectly fine with overwriting these files as they are same on my local branch as in origin. I don´t see options to fix it
06:15 ResidentBiscuit joined #git
06:16 netcrime kadoban: You mean this is the options ? http://prntscr.com/bjfhxt
06:16 kadoban No
06:17 netcrime kadoban: then everything else is just an error output
06:18 a_thakur joined #git
06:19 Sucks joined #git
06:20 apotry joined #git
06:20 D-Boy joined #git
06:21 milki joined #git
06:21 MrMojito_Busy joined #git
06:21 zeroed joined #git
06:22 MrMojito_Busy left #git
06:22 Sucks joined #git
06:22 horse joined #git
06:23 MrMojito_Busy joined #git
06:24 opal joined #git
06:25 MrMojito joined #git
06:25 MrMojito joined #git
06:27 vuoto joined #git
06:27 cordova joined #git
06:28 eletuchy joined #git
06:28 FuzzySockets joined #git
06:30 cyan__ joined #git
06:32 fuchstronaut joined #git
06:33 TheHackOps joined #git
06:33 TheHackOps Quick question, I have a feature branch which is some 300+ commits ahead of master but is perfectly in sync with master
06:33 TheHackOps My idea was to just make that branch master
06:33 TheHackOps Is there a safe way to do said thing
06:34 JeroenT joined #git
06:34 kadoban TheHackOps: What does it mean that it's perfectly in sync with master?
06:35 yuhlw joined #git
06:35 TheHackOps Is 0 commits behind master
06:35 TheHackOps but 340 ahead
06:35 TheHackOps Lesson learned, terrible idea
06:35 TheHackOps But here we are
06:36 TheHackOps kadoban,
06:36 kadoban TheHackOps: Oh, you can either just merge it into master (which will fast-forward), or you can simply point master where the branch currently does with 'git reset --hard'
06:36 horse joined #git
06:36 kadoban TheHackOps: The merge is probably "safer", you can do --ff-only I believe is the right one to make sure it doesn't do an actual merge, just in case you're mistaken or type the wrong thing somehow.
06:37 TheHackOps kadoban, So the idea is, master will now effectivly point to the latest commit of feature-branch
06:38 kadoban TheHackOps: Yep.
06:38 TheHackOps Hmm
06:38 TheHackOps I cant even tell you how scary this is :D
06:38 kadoban TheHackOps: !backup helps aleviate anxiety, heh
06:38 gitinfo TheHackOps: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
06:38 thiago yes, you must have done some really scary work
06:39 TheHackOps thiago, omg hey o/
06:39 kadoban You can almost always undo stuff without a backup, but a backup makes it trivial, so it's not a bad idea.
06:39 TheHackOps Eh we kinda let a feature branch get away from us
06:39 thiago probably rebased commits that weren't yours, then reverted stuff, checked out older versions and committed, etc.
06:39 thiago feature branches with 300 commits are ok, nothing to be scared about, by itself
06:39 TheHackOps The idea was when it diverged was to be merged back into master after 10 commits
06:40 TheHackOps 300 or so commits later
06:40 kadoban Er? I hope not, that's not my understanding of the situation. If that happened ... ignore everything else.
06:40 thiago 300 commits that do nothing ("is perfectly in sync") is very scary
06:40 TheHackOps thiago, Nah its a whole new module of the app
06:40 Sceorem joined #git
06:40 TheHackOps We need to get that module back into master
06:41 thiago "is perfectly in sync" = "has exactly the same content"
06:41 thiago git diff shows nothing
06:41 TheHackOps thiago, Sorry
06:41 thiago is that what you meant?
06:41 TheHackOps no
06:41 TheHackOps ahhaha
06:41 TheHackOps One sec, Ill visually show what I mean
06:41 thiago ok, so you have 300 commits that implement something
06:41 thiago you want to merge. Do it. What's the issue?
06:41 fracting joined #git
06:42 nettoweb joined #git
06:43 TheHackOps http://imgur.com/bHducZr
06:43 TheHackOps thiago, erm resolving that many merge conflicts
06:43 TheHackOps gives me nightmares
06:43 thiago that doesn't say absolutely anything
06:44 thiago well, you have one other choice only:
06:44 kadoban TheHackOps: There won't be any conflicts, there can't be (if I'm understanding the situation). You can make sure with --ff-only, if there would be even the chance of a real merge, it'll bail out.
06:44 thiago abandon all work done in master since the feature branch was created
06:44 thiago what do you choose?
06:45 TheHackOps Im going to try kadoban's idea in a copy of the repo
06:45 TheHackOps I think its exactly what i want
06:45 thiago you said it's 0 commits behind
06:45 thiago so there won't be any conflicts
06:45 perlpilot_ joined #git
06:45 thiago the slowest part of the merge will be checking out all of the files
06:45 dharrigan joined #git
06:46 TheHackOps thiago, I have never had a good way with words
06:46 TheHackOps Not when i asked in C++ and not here :(
06:46 romerocesar_ joined #git
06:46 ki0 joined #git
06:46 nickthetait1 joined #git
06:47 djh_ joined #git
06:47 TheHackOps Wow
06:47 TheHackOps That worked rly rly rly well
06:48 RichardJ joined #git
06:48 TheHackOps Thanks guys
06:48 kadoban Yay
06:48 TheHackOps It just moved it to where I expected no issues
06:48 TheHackOps some extra files created
06:48 thiago you said it was 0 commits behind
06:48 TheHackOps but thats it
06:48 TheHackOps thiago, I get nervous
06:48 TheHackOps :(
06:48 thiago conflicts were impossible
06:48 TheHackOps thiago, I know that now
06:49 boshhead_ joined #git
06:49 BlaXpirit_ joined #git
06:49 PaulePan1er joined #git
06:49 and_i joined #git
06:49 Soliton joined #git
06:49 kanzure_ joined #git
06:50 horse joined #git
06:50 hyperair joined #git
06:50 the_ktosiek joined #git
06:50 GrayShade joined #git
06:51 ketas- joined #git
06:51 Orphis_ joined #git
06:51 zeemz joined #git
06:51 harleypig_ joined #git
06:51 gingitsune joined #git
06:51 attente_ joined #git
06:51 jchonig_ joined #git
06:51 GrayShade why could a "git fetch" hang? the remote is an http url which i can clone otherwise. there's no network filtering that i'm aware of.
06:51 GrayShade it says "POST git-upload-pack (gzip 2638 to 1342 bytes)", then stays like that
06:52 thiago networking problem or server problem
06:53 thiago use tcpdump on both sides (client and server) to see if packets being sent are arriving
06:53 thiago if packets are not arriving, it's a network problem (probably MTU setting)
06:53 GrayShade server is github
06:53 thiago if all packets sent are arriving, then it's likely the server is hung
06:53 GrayShade ipv4
06:54 yossarian joined #git
06:54 thiago so it's unlikely to be a problem with github's server or github's network
06:54 thiago it must be yours
06:54 Guest42010 joined #git
06:54 bodie__ joined #git
06:54 Werring` joined #git
06:54 uidzer0 joined #git
06:55 APK joined #git
06:55 GrayShade suppose so, but it's strange since a clone of the same remote works (i get the same POST message, the "remote: counting objects")
06:55 Ankhers_ joined #git
06:55 fugiman joined #git
06:55 CentaurW- joined #git
06:55 canton7_ joined #git
06:55 thiago that's why I think it's an MTU problem
06:55 thiago try lowering yours
06:56 Atlantic778 joined #git
06:56 HarryHallman joined #git
06:56 HelloAtMega joined #git
06:56 elastix joined #git
06:58 pR0Ps_ joined #git
06:59 AustinIncognito joined #git
06:59 Marbug_ joined #git
07:00 GrayShade ah, the remote isn't github :D
07:00 tolland_ joined #git
07:00 ki0 joined #git
07:00 tomzx_ joined #git
07:00 SirFunk_ joined #git
07:01 hhee joined #git
07:01 ThomasLocke_ joined #git
07:01 KellerKatze joined #git
07:01 tomog999_ joined #git
07:01 reizuki_ joined #git
07:02 Silex^^ joined #git
07:02 tenc joined #git
07:02 GrayShade "traceroute to [...], 30 hops max, 65000 byte packets[1]    47105 segmentation fault" sigh.
07:02 markmark joined #git
07:02 tomzx_ left #git
07:02 nwf_ joined #git
07:02 tomzx joined #git
07:03 rewt`` joined #git
07:03 dreiss joined #git
07:03 varx joined #git
07:03 horse joined #git
07:03 retropikzel_ joined #git
07:04 encod3 joined #git
07:04 satbyy_ joined #git
07:04 spudowiar1 joined #git
07:05 Sonderblade joined #git
07:05 _August_ joined #git
07:06 nettoweb joined #git
07:07 Hounddog joined #git
07:07 mikecmpbll joined #git
07:07 SebastianFlyte joined #git
07:09 drbean joined #git
07:10 eletuchy joined #git
07:12 Macaveli joined #git
07:13 xall joined #git
07:13 newlifer joined #git
07:14 bgamari joined #git
07:14 deltab joined #git
07:14 BlackMaria joined #git
07:14 bcc joined #git
07:14 jab416171 joined #git
07:15 neanderslob joined #git
07:15 Kicer86 joined #git
07:16 flobin joined #git
07:16 leandrosansilva joined #git
07:16 flobin hi everyone
07:16 flobin I'm getting an error that I don't understand, namely:
07:16 flobin remote: fatal: pack has 99 unresolved deltas
07:16 flobin error: unpack failed: index-pack abnormal exit
07:16 flobin when trying to "git push origin master"
07:16 flobin more here: https://gist.github.com/Flobin/c10fa2133b281329186a8f0ed511e9cf
07:16 milki flobin: either corrupted repo, disk space issues, or filesystem errors
07:16 milki probably
07:17 flobin ah
07:17 BlaXpirit joined #git
07:17 milki flobin: o, that ones different. you misseed the reason for the failure
07:17 horse joined #git
07:17 milki flobin: line 7
07:17 milki flobin: are you perhaps playing with sparse repos?
07:17 flobin oh, right
07:17 flobin no, this is just a regular repo as far as I know
07:17 milki wierd
07:18 milki well it sounds like either the remote ran out of compute power or its missing data
07:18 larsss left #git
07:18 ensyde joined #git
07:18 milki ait
07:18 milki its github...
07:18 flobin the remote in this case is github, so it would probably be the latter
07:18 milki github probably has issues hten
07:18 milki flobin: i would just try later >.>
07:18 flobin right
07:19 flobin this was yesterday so I'm trying again right now
07:19 nb-ben that's like time traveling
07:19 milki github does custom things to git
07:19 milki so they could have other issues
07:20 zeroed joined #git
07:20 zeroed joined #git
07:20 feignix joined #git
07:21 eletuchy_ joined #git
07:21 ahmedelgabri joined #git
07:22 flobin well dang, it worked now
07:22 romerocesar joined #git
07:23 gkatsev joined #git
07:23 eletuch__ joined #git
07:25 eletuchy joined #git
07:27 Balliad joined #git
07:28 eletuchy_ joined #git
07:30 romerocesar_ joined #git
07:30 eletuch__ joined #git
07:30 horse joined #git
07:31 pwnz0r joined #git
07:31 cdown_ joined #git
07:32 GrayShade left #git
07:32 eletuchy joined #git
07:33 texinwien joined #git
07:33 dsdeiz joined #git
07:33 dsdeiz joined #git
07:34 apotry joined #git
07:36 eletuchy_ joined #git
07:36 astrofog joined #git
07:38 eletuchy joined #git
07:39 ahmed_elgabri joined #git
07:40 TomyWork joined #git
07:40 eletuch__ joined #git
07:42 cordova joined #git
07:42 fees joined #git
07:42 eletuchy_ joined #git
07:43 absence joined #git
07:44 horse joined #git
07:44 cordova left #git
07:44 eletuchy joined #git
07:45 jceb joined #git
07:45 absence when doing an interactive rebase and editing commits, is it possible to edit the actual patch rather than the file data? i think it would be easier in some cases
07:46 _August_ joined #git
07:46 kedare joined #git
07:46 multi_io joined #git
07:47 aax joined #git
07:47 feignix joined #git
07:49 eletuchy_ joined #git
07:50 romerocesar joined #git
07:50 eletuchy joined #git
07:54 eletuchy_ joined #git
07:54 garethdaine joined #git
07:55 flobin joined #git
07:55 jbitdrop joined #git
07:56 eletuch__ joined #git
07:57 netj joined #git
07:58 horse joined #git
07:58 eletuchy joined #git
07:59 a_thakur joined #git
08:01 eletuchy_ joined #git
08:02 jknetl joined #git
08:02 ahr3n joined #git
08:02 dminca joined #git
08:02 dminca Hi guys
08:02 gitinfo dminca: 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.
08:03 dminca Everyone seems to have problem with `git init`
08:03 dminca meaning that, you can do `git init` in an already initialized Git project
08:03 peem I have a repo that needs certain things happening on every commit, like "puppet module build" for example. I thought that I can add it to pre-commit hook, but it seems to be false logic, as I need to do git add first, then run that again in hook script to cover new files generated by puppet. Is there a better vay of doing such thing ?
08:03 eijk_ joined #git
08:04 eletuchy joined #git
08:04 dminca all the files that were in .gitignore appear as Untracked,
08:05 dminca sorry, files that weren't in .gitignore appear as Untracked.
08:05 a_thakur joined #git
08:05 dminca I think this is a bug, where can I file this one?
08:06 eletuch__ joined #git
08:07 kurkale6ka joined #git
08:08 faiz joined #git
08:09 ToBeCloud joined #git
08:09 eletuchy joined #git
08:11 horse joined #git
08:11 mikecmpbll joined #git
08:12 zeemz joined #git
08:12 cdown joined #git
08:13 eletuchy_ joined #git
08:13 Lvjasha joined #git
08:14 faiz joined #git
08:14 ramsub07 joined #git
08:14 ocbtec joined #git
08:15 circ-user-aKdA0 joined #git
08:16 netcarver joined #git
08:16 flobin left #git
08:16 horse joined #git
08:16 imjacobclark joined #git
08:17 Calrik joined #git
08:17 User458764 joined #git
08:17 dimi1947 joined #git
08:18 nnyk_ joined #git
08:19 marcogmonteiro joined #git
08:20 horse left #git
08:22 Lynxium joined #git
08:23 FrontPsych joined #git
08:25 ams__ joined #git
08:26 gelei007 joined #git
08:27 dminca left #git
08:29 dminca joined #git
08:32 muthu joined #git
08:32 fuchstronaut joined #git
08:33 mithenks joined #git
08:34 qsx !list
08:34 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
08:34 qsx dminca: ^
08:34 eletuchy joined #git
08:36 ph88 joined #git
08:36 ph88 how can i find out when git version 1.7.4.4 was released ?
08:37 cyan__ joined #git
08:39 texinwien joined #git
08:39 i7c Date:   Wed Apr 6 10:50:06 2011 -0700
08:39 dminca thanks gsx
08:39 i7c git show v1.7.4.4
08:39 ph88 oki thx
08:40 lindenle joined #git
08:41 i7c show -s to not get run over by the output ;)
08:41 sanketdg joined #git
08:41 programmerZhou joined #git
08:44 JeroenT joined #git
08:44 mikecmpbll joined #git
08:44 Arban joined #git
08:45 programmerZhou left #git
08:45 drbean_ joined #git
08:50 Didac joined #git
08:52 * qsx wonders what kind of fonts people have who always mistake qsx for gsx
08:52 _August_ joined #git
08:52 iLembus joined #git
08:52 SimonNaa joined #git
08:53 notebox joined #git
08:54 monokrome joined #git
08:56 i7c I tab complete even three letter nicks. :)
08:57 Gsham joined #git
08:57 gkatsev joined #git
08:58 troulouliou_div2 joined #git
08:58 qsx yeah
08:58 qsx this can lead to problems.
08:59 qsx (i’m in a channel where we have a js and a jn, and both get the same color …)
08:59 qsx i7c: https://www.youtube.com/watch?v=KZ9roZAYDok
09:00 yuhlw_ joined #git
09:01 barteks2x joined #git
09:01 grindhold joined #git
09:02 yuhlw joined #git
09:03 yuhlw_ joined #git
09:04 yuhlw__ joined #git
09:04 ph88 hey guys, i compiled git from source and it compiled but now i get this error:   fatal: Unable to find remote helper for 'https'
09:05 liuzhen joined #git
09:05 horse joined #git
09:06 yuhlw_ joined #git
09:06 horse hi git gurus.  i have a server which i use to pull down switch config files.  i would like to upload these files in to a remote gitbab instance, however, i dont want to clone the entire project and have it sat on this server.
09:06 horse so is it possible to just clone and use a subfolder of a project?
09:06 grawity no
09:07 ahmed_elgabri joined #git
09:07 horse grawity: that seems a bit sub optimal?
09:07 grawity you can limit a clone to individual branches, or you can limit the *checkout* to specific files/folders (sparse checkout), but it'll always download at minimum the whole branch
09:08 Raging_Hog joined #git
09:08 i7c qsx, oh well. :P
09:08 liuzhen joined #git
09:10 qsx ph88: did you forget to link against libcurl?
09:10 i7c qsx, I guess we're brothers then.
09:10 qsx \o/
09:10 horse grawity: so i'd always need to clone the entire porject?
09:11 dopesong joined #git
09:11 grawity yes
09:11 ph88 qsx, yes .. but i´m going to take an alternative route .. install another vbox where i have root
09:11 horse thankyou, that answers my question at least
09:11 qsx er
09:12 qsx if that solves the problem for you …
09:12 Raging_Hog joined #git
09:13 kontoo before I go insane: if I want to incorporate changes from master into a feature branch f1 by rebasing, this is called "rebasing f1 *onto* master", right?
09:14 kontoo I read conflicting statements on what gets rebased on what
09:15 grawity yeah, you use master as the base, and re-apply your branch's commits on top of it
09:15 grawity resulting in a rewritten f1
09:17 kontoo is this called "rebasing f1 onto master" or "rebasing master onto f1"?
09:17 kontoo that is my question
09:19 gkatsev joined #git
09:19 i7c You walk back branch A until you meet with branch B, walk branch B till you reach the tip and then apply all commits that you walked back on A. That's rebasing A onto B.
09:19 eijk joined #git
09:19 drbean joined #git
09:19 fahadash joined #git
09:20 i7c To make things more fun, there's an --onto option which may confuse you further. :)
09:20 feignix joined #git
09:21 i7c rebase --onto C B A: walk back A until you meet B (remember those commits), walk back until you meet C, walk to the tip of C and apply remembered commits.
09:22 imjacobclark joined #git
09:26 digidog joined #git
09:27 keltvek joined #git
09:29 kontoo i7c: isn't the last thing you wrote just "incorporate changes from branch A into branch C"?
09:29 endiruna joined #git
09:29 kontoo hmm actually "incorporate the changes introduces from branch A in relation to branch B into C"
09:30 tvw joined #git
09:31 jmpp joined #git
09:32 mikecmpbll joined #git
09:33 jaguarmagenta joined #git
09:34 mase-tech joined #git
09:35 artemisart joined #git
09:36 dimi1947 joined #git
09:41 dsdeiz joined #git
09:43 shay- joined #git
09:43 Raging_Hog joined #git
09:44 ntonjeta joined #git
09:44 achadwick joined #git
09:45 drbean- joined #git
09:45 shay- hey guys, I want to add a submodule to my project but I want to checkout a specific tag. The tag is named v3.0.1, I tried to add branch = v3.0.1 to the .gitmodules file, but the git submodule update --remote commands keeps failing with "fatal: Cannot update paths and switch to branch 'v3.0.1' at the same time." any suggestions?
09:45 liuzhen joined #git
09:46 fracting joined #git
09:46 aavrug joined #git
09:46 qsx cd submodule; git checkout v3.0.1; cd ..; git add submodule; git ???; git PROFIT
09:46 drbean joined #git
09:48 tvw joined #git
09:48 drbean_ joined #git
09:49 Sly1986 joined #git
09:49 eletuchy joined #git
09:50 drbean- joined #git
09:51 guardian hello, it seem there's something I didn't understand with git stash: I have 30 files modified in the index, among those 2 files have more modifications in the working tree
09:51 guardian when doing git stash --keep-index, I expected the stash to contain only additional modifications for those 2 files
09:51 romerocesar joined #git
09:51 guardian but git stash show --stat lists the 30 files
09:52 guardian what did I miss? :/
09:52 fscala joined #git
09:52 _ikke_ guardian: --keep-index only says that changes that are staged are not removed
09:52 _ikke_ not that it should not stash staged changes
09:52 drbean joined #git
09:55 rawtaz could someone shed some light on https://pastebin.mozilla.org/8878838 for me? ive read that this could be due to the repo not allowing non-fast-forward push, but im puzzled because i have done this many times before to remote repos that were set up (afaik) the same way as this one is.
09:55 mdw joined #git
09:56 rawtaz is there a problem with how the commit history looks? afaik i should be able to push this (if the repo allows it of course)
09:58 rawtaz yeah the repo has denyNonFastforwards=true. odd that i havent encountered this before..
09:58 gkatsev joined #git
10:00 CheckDavid joined #git
10:01 rawtaz might be that the other repos i thought of werent bare, after all
10:01 stratos joined #git
10:03 imjacobclark joined #git
10:06 cdown joined #git
10:07 izabera joined #git
10:07 phanimahesh joined #git
10:08 son_ joined #git
10:09 dsdeiz_ joined #git
10:10 mofai joined #git
10:12 drbean joined #git
10:12 guardian _ikke_: is "do not stash index" a thing?
10:13 i7c kontoo: no.
10:13 absence when doing an interactive rebase and editing commits, is it possible to edit the actual patch rather than the file data? i think it would be easier in some cases
10:13 i7c kontoo: it rebases A, so the only branch that is changed is A.
10:13 mofai joined #git
10:14 grawity absence: commits aren't patches
10:14 i7c kontoo: C and B remain the same. So unless I don't get your "incorporate" formulation, it appears to be wrong to me. ;)
10:14 grawity absence: that said, you could `git reset`, then `git add -p`, and adjust the diff there
10:15 toogley joined #git
10:16 mofai left #git
10:16 zeroed joined #git
10:17 cwillu_at_work joined #git
10:18 j416 grawity: --keep-index
10:18 j416 ah, didn't read scrollback, apologies
10:18 j416 and not grawity; guardian.
10:19 k3rn31 joined #git
10:19 j416 guardian: commit instead, might be esier
10:19 j416 easier, even.
10:23 acetakwas joined #git
10:23 lou_ joined #git
10:23 davisonio joined #git
10:24 acetakwas joined #git
10:24 davisonio joined #git
10:24 vicente_ joined #git
10:25 vicente_ Hi
10:25 gitinfo vicente_: 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.
10:27 vicente_ I have a perforce repository that I can not mix with anythng else. But I was wondering if it's possible to have git on my repository without touching any of the files there. Like scanning all those folders/files but doing the writting operations in a different independent folder. Is that possible?
10:27 allcentury joined #git
10:28 selckin GIT_DIR & friends
10:29 vicente_ selckin: that's the answer for my question, right? I'm going to check
10:29 selckin if the question was if you can store .git outside of the working directory
10:29 shirafuno joined #git
10:32 shirafuno Hi guys, currently trying to add a git repository to a GoCD pipeline. The repository is held on BitBucket. putting the https://bitbucket/shirafuno/repo.git doesn’t work as I think it’s because its the overview and not the repo(?) and when going on source it gives a long af url which it also doesn’t like. Would anybody know how to add a repo url to a pipeline.
10:32 vicente_ selckin: I think that will work for me, thanks
10:32 selckin find a button that says clone and use the url that gives you
10:33 fuchstronaut joined #git
10:34 shirafuno Found it, put https://shirafuno@bitbucket.org/shirafuno/repo.git and now it’s saying it could not read the password for :repo: No such device or address
10:35 selckin that no longer sounds like a git problem
10:35 shirafuno right okay
10:35 shirafuno thank you
10:36 JeroenT joined #git
10:41 phanimahesh absence: Technically you can, by marking commits edit instead of pick. rebase stops just after it, so you can amend the commit and continue the rebase
10:42 ahr3n joined #git
10:46 KnightsOfNi joined #git
10:47 choki joined #git
10:48 ramsub07 joined #git
10:49 fuchstronaut joined #git
10:49 absence grawity: they may not BE patches, but they're often presented that way. git add -p asks me a bunch of "stage this hunk?" questions, i'd prefer to edit the "patch" in a text editor (just for simple stuff like moving lines)
10:49 ferr1 joined #git
10:50 moei joined #git
10:50 grawity sure, press 'e' in git add -p
10:54 absence grawity: oh, nice
10:56 jimi_ joined #git
10:56 jottr joined #git
10:57 afuentes joined #git
10:58 GuKKDevel_ joined #git
10:58 d0nkeyBOB joined #git
10:59 rahtgaz joined #git
11:00 ensyde joined #git
11:03 _August_ joined #git
11:04 mdw joined #git
11:06 crs left #git
11:09 Yatekii joined #git
11:09 Yatekii hey guys
11:09 Yatekii I have a very weird problem:
11:10 shay- joined #git
11:10 guardian j416: yep ended up doing that
11:10 guardian thanks for caring
11:10 sdothum joined #git
11:12 Yatekii I am (sadly) on Windows. I have the cygwin git bash. When I do a git status it says everything is up2date with origin and stuff and latest commit is the one from yesterday with a variable changed from false to true. when I do vim changed_file.c it shows me that this variable is now true as expected. when I open that file in other editors, say eclipse (yes I hate myself) or Atom, it shows the variable to be FALSE. very weird, yes? when I change that
11:12 Yatekii variable to be true again in Atom and save and do a git status, it now shows me that the variable was changed to true. but when I do checkout what was changed in the commit from yesterday it says it was changed to true as well. how can this even be?
11:13 Yatekii I am very confused right now and hope someone can help me :)
11:13 aard joined #git
11:13 Macaveli joined #git
11:13 djb-irc joined #git
11:14 nettoweb joined #git
11:14 selckin eclipse and friends will often cache the file etc, try restarting everything
11:16 cdown joined #git
11:16 Yatekii selckin: I tried that already.
11:17 Yatekii also atom does cache them as well but once I close them the cache is gone. so no way it's the cache.
11:17 Yatekii also: git recognizes the change
11:17 aguimaraes1986 joined #git
11:17 Yatekii so something is seriously broken :S
11:17 selckin well if you don't touch git, and 2 editors show you a differend result, either the editor is broken or your disk is magicly so broken its swapping those exact 4 chars
11:18 Yatekii well I can provide you a sceen to show you that is REALLY as I say
11:18 Yatekii sec
11:18 bruce_lee joined #git
11:18 selckin i know for example notepad++ will cache the content if it can't safe the file due to premission issues, and show the old if you reopen it
11:18 selckin its the most retarded editor in the world
11:19 Yatekii I know and it is not like that as I stated 3 time snow
11:19 selckin you stated 4 bytes magicly change, its not that either
11:19 gkatsev joined #git
11:20 phanimahesh I don't know, I have seen a similar bug recently. Multiple editors opening the same directory showed different stuff. On a mac.
11:20 acetakwas joined #git
11:20 mdw joined #git
11:20 selckin mac doesn't have a filesystem
11:21 phanimahesh Mac uses HFS, a case insensitive filesystem.
11:21 selckin it caches everything
11:21 grawity wat
11:21 selckin git had to work around many problems for mac
11:21 phanimahesh selckin: Wut? Mac doesn't have a filesystem? what do you mean?
11:21 selckin +working
11:21 mdw joined #git
11:21 fuchstronaut joined #git
11:22 phanimahesh The problem was very specific. GUI stuff thinks something, consistent with all Graphical editors. vim and nano in terminal think it's something else.
11:22 phanimahesh Scratched my head for a while, and convinced myself it's a waste of time to investigate.
11:22 phanimahesh I would have laughed if not for the fact that I have seen it with my eyes.
11:24 ensyde joined #git
11:26 Yatekii http://i.imgur.com/oNNtCGI.png here is the shot. Either I am missing sth. or it is beyond broken
11:26 ravenzz joined #git
11:27 Yatekii normal windows notepad says it's false too btw
11:27 Yatekii and it sure as hell doesn't cache
11:27 Yatekii pc was also restarted so I assume the FS didn't cache it either.
11:27 stonerfish joined #git
11:29 gkatsev joined #git
11:30 ravenzz left #git
11:30 feignix joined #git
11:30 johnmilton joined #git
11:30 settermjd joined #git
11:31 rnsanchez joined #git
11:31 Sceorem_ joined #git
11:33 Sceorem__ joined #git
11:33 DolphinDream joined #git
11:33 shinnya joined #git
11:34 _August_ joined #git
11:34 jaguarmagenta joined #git
11:34 wiensa joined #git
11:35 wiensa left #git
11:36 k3rn31 joined #git
11:36 Junior joined #git
11:38 circ-user-bgUQR joined #git
11:38 eletuchy joined #git
11:39 espindola joined #git
11:40 imjacobclark joined #git
11:40 ensyde__ joined #git
11:43 shirafuno joined #git
11:46 a_thakur_ joined #git
11:47 virus joined #git
11:47 shirafuno left #git
11:48 a_thakur joined #git
11:48 zeroed joined #git
11:49 a_thakur joined #git
11:49 drbean joined #git
11:51 a_thakur_ joined #git
11:52 a_thakur joined #git
11:53 d0nkeyBOB joined #git
11:55 a_thakur_ joined #git
11:57 fwdit joined #git
11:57 mdw joined #git
11:57 Chill_Surf joined #git
11:58 FrontPsych joined #git
11:58 mdw joined #git
11:58 User458764 joined #git
12:00 feignix joined #git
12:01 gkatsev joined #git
12:02 mariuscc joined #git
12:04 drbean joined #git
12:04 synthroid joined #git
12:05 crose joined #git
12:05 Sceorem__ joined #git
12:06 ramsub07 joined #git
12:08 zivester joined #git
12:09 dan2k3k4 joined #git
12:10 fahadash joined #git
12:11 drbean_ joined #git
12:11 dopesong joined #git
12:12 virus left #git
12:13 infra-red joined #git
12:14 dsdeiz joined #git
12:14 davisonio joined #git
12:19 diegoviola joined #git
12:22 rwb joined #git
12:22 noteness joined #git
12:24 skasturi joined #git
12:25 sulky_ joined #git
12:25 dopesong joined #git
12:28 cxz joined #git
12:28 liquidjamm joined #git
12:28 pfsmorigo joined #git
12:29 FrontPsych joined #git
12:29 fwdit joined #git
12:32 d0nkeyBOB joined #git
12:33 vuoto joined #git
12:33 eletuchy joined #git
12:33 jeffreylevesque joined #git
12:35 drbean joined #git
12:36 rgrinberg joined #git
12:37 a_thakur joined #git
12:37 mykespb joined #git
12:38 dan2k3k4 joined #git
12:38 CJKinni joined #git
12:40 carell joined #git
12:45 theskillwithin joined #git
12:45 DolphinDream joined #git
12:46 rbr joined #git
12:46 FeersumEndjinn joined #git
12:47 cdg joined #git
12:47 efdetonator joined #git
12:47 FeersumEndjinn joined #git
12:49 FeersumE_ joined #git
12:50 acetakwas joined #git
12:52 sleezd joined #git
12:52 Soliton joined #git
12:52 ujjain joined #git
12:52 ujjain joined #git
12:52 deepy joined #git
12:53 introsp3ctive joined #git
12:53 iLembus_ joined #git
12:54 FeersumEndjinn joined #git
12:54 Learath2 joined #git
12:54 kfunk joined #git
12:55 jknetl joined #git
12:55 satbyy joined #git
12:55 DolphinDreamm joined #git
12:55 avar joined #git
12:56 mischat joined #git
12:57 likewhoa joined #git
12:57 kloeri joined #git
12:57 gechr joined #git
12:58 docnvk joined #git
12:59 musca joined #git
12:59 acetakwas joined #git
13:00 feignix joined #git
13:00 piattino joined #git
13:00 settermjd joined #git
13:00 piattino hi. how can i get a list of modified files using git diff, like this but without the M prefix? git status --porcelain --untracked-file=no --no-column
13:01 flopsec joined #git
13:01 piattino preferably, null-separated, to feed into a script, but anything will do
13:01 grawity git diff-tree --name-only
13:02 rominronin joined #git
13:02 FeersumEndjinn left #git
13:03 piattino grawity: thanks man. still have a "spurious" first line.. (git diff-tree --name-only @) -> sha1\nfile1\nfile2..
13:03 CEnnis91 joined #git
13:03 grawity wait, I probably suggested the wrong one
13:05 User458764 joined #git
13:05 happy-dude joined #git
13:06 piattino git diff --name-only -z
13:07 piattino grawity: thanks for pointing me in the right directoin
13:09 gechr joined #git
13:11 segment-fault joined #git
13:11 texinwien joined #git
13:11 italoacasas joined #git
13:12 KnightsOfNi joined #git
13:12 italoacasas joined #git
13:13 dougquaid left #git
13:13 gechr joined #git
13:13 PHPanos joined #git
13:14 mmlb joined #git
13:15 binaryplease joined #git
13:16 doktori joined #git
13:16 binaryplease Hi, I understand the correct workflow to contribute to a opensource project is: create fork, make changes, commit, push, create pull request. If I want to contribute again after some time, how do I update my fork? or should I delete it and create a new fresh fork?
13:17 grawity piattino: I actually meant diff-index but I guess it's mostly the same
13:17 grawity binaryplease: the same way you'd merge a branch
13:17 ePirat left #git
13:18 someone_ joined #git
13:18 grawity well, usually you'd keep 'master' in your fork untouched, and make changes in new branches
13:18 italoacasas joined #git
13:18 ramsub07 joined #git
13:18 grawity so you could update master without having to mess up the old pull requests
13:19 grawity binaryplease: more specifically, if you cloned your fork, then `git remote add` the original repo
13:19 grawity and vice versa
13:19 grawity then you can just merge upstream/master or whatever
13:19 someone_ Hello, a branch on gitlab has some commits that were squashed, but i want to get the state of the branch before the squash happened..  i can't seem to check out that commit sha since i don't have that git history locally.. how do i get the history or the sha?
13:20 someone_ I tried git fetch origin <sha> with no luck
13:20 binaryplease grawity: Thanks , addig the original repo to my fork as remote was the missing piece of the puzzle\
13:20 grawity it's not required – you can fetch/pull/push with a URL directly – but having both repos as remotes makes things more convenient
13:20 grawity someone_: you cannot fetch objects that aren't referenced
13:20 grawity someone_: (it's partly a security feature, since such rewrites might be intentional)
13:21 someone_ i mean the objects are there in the gitlab repo, i can see the code on there
13:21 grawity well, if gitlab web UI allows browsing them, *shrug*
13:21 grawity I suppose github does as well
13:21 someone_ the repo has the history, i just can't fetch it then?
13:21 grawity but they still run mostly regular git-daemon, which doesn't.
13:22 Urbany joined #git
13:22 rewt someone_, do you see the actual commits, or just the code that was committed?
13:22 grawity right, you can ask the original author to push it into a temp branch or something, but you can't fetch 'stale' objects directly
13:22 someone_ rewt: the commits
13:23 someone_ i see the 6 commits, their shas, and the commit that replaced them with the force update
13:23 rewt in the network graph?
13:23 someone_ just can't seem to fetch the state of that branch before the force update
13:23 rewt or the activity list?
13:23 grawity you cannot fetch the state of that branch before the force update.
13:24 someone_ well i can view the commits in gitlab, but i suppose that's just the activity list, not really sure what you mean by network graph
13:24 rewt there's a graph tab where you can click network and it shows vertical lines of the branches
13:24 rnsanchez_ joined #git
13:24 ash_workz joined #git
13:24 BigWillie joined #git
13:25 dan2k3k4 joined #git
13:25 rewt the activity list stays forever, so any discarded commits will stay linked there... but when gc is run, those links will no longer work
13:25 vuoto_ joined #git
13:25 someone_ just in bitbucket, so it's different
13:25 rewt same as when you discar a commit locally; you can still get at it for some time if you know the hash, but not after a gc
13:26 Sceorem joined #git
13:26 rewt bitbucket is not gitlab :/
13:26 ramsub08 joined #git
13:26 garethdaine_ joined #git
13:27 eletuchy joined #git
13:27 someone_ yeah my bad
13:27 rewt this is what gitlab's network graph looks like:  https://about.gitlab.com/images/press/screenshots/network_graph.png
13:27 someone_ we used to be on gitlab, moved to bitbucket
13:28 arand joined #git
13:28 notebox joined #git
13:28 rewt bitbucked has plugins to provide something similar
13:28 crameth joined #git
13:29 vuoto joined #git
13:29 _rnsanchez_ joined #git
13:31 carell joined #git
13:31 davisonio joined #git
13:32 ramsub07 joined #git
13:32 anup108 joined #git
13:32 someone_ yeah, definitely ain't possible.. thanks
13:34 _rht joined #git
13:35 LeBlaaanc joined #git
13:35 jaguarmagenta joined #git
13:36 mbrzuzy joined #git
13:36 WizJin joined #git
13:38 Asiajey joined #git
13:40 ramsub08 joined #git
13:40 User458764 joined #git
13:40 f3r70rr35f joined #git
13:41 jimi_ joined #git
13:42 lpapp joined #git
13:42 lpapp hi, git log A --not B and git log A..(.)B return something different than I expect. Why could that happen?
13:43 lpapp I expect commits from the 25th of May onwards, but I get them from the 15th of April onwards.
13:43 allcentury joined #git
13:43 lpapp basically from a different tag (release) than A. What could cause this?
13:44 mikecmpb_ joined #git
13:44 Dougie187 joined #git
13:44 MrMojito joined #git
13:44 MrMojito joined #git
13:45 vuoto joined #git
13:46 LionsMane joined #git
13:48 brandonw joined #git
13:48 MrMojito1 joined #git
13:49 vuoto joined #git
13:51 remitamine joined #git
13:52 lpapp perhaps it is because of branching off
13:52 _ikke_ lpapp: has something from that tag been merged into A?
13:52 lpapp from the moment of branching it lists all the commits
13:52 lpapp not only the commits after that particular tag in that branch.
13:53 mmlb joined #git
13:54 diegoviola joined #git
13:55 lpapp _ikke_: I think so.
13:55 GodGinrai joined #git
13:56 phaleth joined #git
13:57 CJKinni joined #git
13:58 fuchstronaut joined #git
13:59 ehuuwj joined #git
14:00 liuzhen joined #git
14:00 GandalfTheWizard joined #git
14:01 cyan__ joined #git
14:01 tabrez joined #git
14:01 AaronMT joined #git
14:02 Spacew00t joined #git
14:03 kfpratt joined #git
14:03 Ahmed90 joined #git
14:04 GandalfTheWizard joined #git
14:04 k3rn31 joined #git
14:05 FrontPsych joined #git
14:05 Softeisbieger joined #git
14:06 romerocesar joined #git
14:10 diegoviola joined #git
14:10 steadystatic joined #git
14:13 User458764 joined #git
14:14 venmx joined #git
14:15 cdg joined #git
14:18 attente_ left #git
14:19 dsdeiz_ joined #git
14:20 eletuchy joined #git
14:20 mns How would I find out all the config settings and their values for a particular module ?  git-p4 is the module in question.
14:21 mns --list will only give me what is in the .git/config file.
14:21 Raven667 left #git
14:22 osse mns: try git config --get-regexp p4
14:24 cdg joined #git
14:24 mns osse: that will only list what I have in the config file.
14:24 leandrosansilva joined #git
14:24 garethdaine joined #git
14:24 sangy joined #git
14:25 osse mns: where else would they be?
14:25 moritz in the cloud!
14:26 cdg_ joined #git
14:26 mns osse:  what I would like to know is what are the config options available to me.  a list of all git-p4 config settings.  They must have default values, besides however one configures them in git/config
14:26 MrMojito1 joined #git
14:26 osse ah
14:27 osse i don't know.  man git-config doesn't list them so man git-p4 is my best guess.
14:27 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
14:27 MrMojito2 joined #git
14:27 StuartMI joined #git
14:29 osse turns out man git-p4 is a really good guess.
14:31 italoacasas joined #git
14:32 mns duh, yes it does seem like that.  should've looked there first.
14:32 notebox joined #git
14:33 a_thakur_ joined #git
14:34 marc_v92 joined #git
14:35 Trinity joined #git
14:35 Phylock joined #git
14:35 Trinity has anyone tried out git-lfs?
14:35 lpapp left #git
14:35 selckin !ask
14:35 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.
14:35 Trinity How was your experience, what did you like about it, what did you dislike about i t?
14:35 zivester joined #git
14:36 segment-fault left #git
14:37 happycoder joined #git
14:38 vuoto_ joined #git
14:40 happycoder In my dotfiles git repo, I was experimenting with antigen and zgen. I deleted all files related to zgen and installed antigen. I did not commit anything. The git status lists a bunch of files I deleted and added in red. Meanwhile, I modified my vimrc, did `git add vimrc` and `git commit "message"`. I now need to restore all those files showing in red to their versions commited in the repo. what to do?
14:40 remitamine joined #git
14:40 Gsham joined #git
14:41 piattino joined #git
14:41 GodGinrai happycoder: Use git-checkout to checkout the version of those files in HEAD
14:41 happycoder GodGinrai, shall I list all files manually?
14:41 happycoder or a `git checkout` or `git checkout *` would do?
14:42 lindenle joined #git
14:43 dminca happycoder what does it say if you do a git status
14:43 GodGinrai happycoder: or you could do something like this: `git status | awk '/deleted/ { print "git checkout -- " $2 }' | bash`
14:43 happycoder GodGinrai, cool
14:44 happycoder GodGinrai, done! thanks
14:44 GodGinrai yw
14:44 happycoder dminca, thanks anyway :)
14:44 dminca cool :)
14:44 dminca next time use git clean -f
14:44 dminca if you didn't commit the files you wanted to test
14:44 imjacobclark joined #git
14:44 happycoder oh.. I see
14:45 dminca git clean -fd (if you also have directories in staging)
14:45 mmlb joined #git
14:45 _ikke_ git clean only handles untracked files..
14:46 dminca it's very useful when you solve merge conflicts, after the conflict is solved , meld leaves some crappy *.orig files
14:46 _ikke_ git does that itself
14:46 dminca _ikke_ right
14:46 happycoder It shows this now: HEAD detached at 999c0e9
14:46 dminca do git checkout -
14:47 _ikke_ git config --global mergetool.keepBackup false
14:47 ResidentBiscuit joined #git
14:47 dminca _ikke_ got that enabled but it still keeps them , I don't know why
14:47 dminca I think it's from meld
14:47 dminca I got a ~/.gitconfig
14:47 happycoder done
14:47 happycoder thanks dminca
14:48 dminca yw happycoder
14:50 crose joined #git
14:51 vuoto joined #git
14:53 ResidentBiscuit joined #git
14:53 makinen joined #git
14:54 jknetl joined #git
14:54 marc_v92 joined #git
14:54 makinen how do I set the account name which is be used in pushing to the remote repo
14:55 romerocesar joined #git
14:55 grawity http(s) or ssh?
14:55 grawity also, github ssh or 'plain' ssh?
14:55 IrishPrime joined #git
14:56 makinen I'm not sure. I can log into our gitlab server
14:56 makinen ssh I guess
14:57 grawity ok then, what remote URL is shown in `git remote -v`?
14:57 IrishPrime joined #git
14:58 makinen origin  git@dev.roidu.com:aeniinik/safe.git (fetch)
14:58 visualshock joined #git
14:58 visualshock What does ** mean in paths?
14:58 jhass smells like xy to me. makinen, what's your actual problem? Try to describe without any assumptions made
14:59 jhass visualshock: it expands to any file or directory below, recursively
14:59 visualshock jhass, thanks!
15:00 lindenle joined #git
15:00 mmlb joined #git
15:00 happycoder I have a cache folder in my dotfiles repo. I added it to gitignore only after initial commit. How to remove cache from the repo completely?
15:01 grawity happycoder: filter-branch
15:01 acetakwas joined #git
15:02 dminca joined #git
15:03 rkazak joined #git
15:03 ReenignE joined #git
15:03 ReenignE joined #git
15:04 yx_ joined #git
15:04 ResidentBiscuit joined #git
15:05 makinen jhass: I copied a working git branch directory from another computer.  Now git asks for a password for 'git@dev..' instead of the user name I'm using to log into gitlab
15:05 jhass makinen: copy your SSH key too
15:05 jhass or add this machines SSH key to your gitlab account
15:06 makinen ah
15:06 mmlb joined #git
15:06 grawity for gitlab, the ssh username is always 'git', you're recognized entirely based on your pubkey
15:07 davisonio joined #git
15:07 Matrixiumn joined #git
15:07 sonOfRa_ joined #git
15:07 noteness_ joined #git
15:07 moritz secret key, actually
15:08 jhass debatable semantics
15:08 grawity keypair, let's say
15:08 jhass I'll stick to keypair
15:08 paul424 joined #git
15:08 grawity IMHO when one says 'secret key' it tends to be more about symmetric keys
15:08 grawity like with HMAC
15:09 QshelTier joined #git
15:09 jhass you're recognized by proving ownership of a public key, to do that you do need the corresponding private key. So both are involved and keypair is probably really the best term
15:09 grawity so calling SSH publickey auth 'secret key'-based would be more ambiguous than not
15:09 grawity yeah, I guess
15:09 wagle_ joined #git
15:10 dr_leppe1 joined #git
15:10 ocbtec_ joined #git
15:10 vmiklos joined #git
15:10 diegoaguilar joined #git
15:10 Karunamon|2 joined #git
15:10 uidzer0 joined #git
15:10 LiENUX joined #git
15:10 nocbreak joined #git
15:10 kisonecat_ joined #git
15:10 e-dardl joined #git
15:10 BombStrike joined #git
15:10 pks joined #git
15:10 SirFunk joined #git
15:10 NotTheFBI joined #git
15:10 tjone270 joined #git
15:10 hexagoxel_ joined #git
15:10 iLembus_ joined #git
15:11 Cyclohexane joined #git
15:11 lss8 joined #git
15:11 ph88 joined #git
15:11 synthmeat joined #git
15:11 gsingh93 joined #git
15:11 tilpner joined #git
15:11 NeverDie joined #git
15:11 wrksx joined #git
15:11 TomyWork joined #git
15:11 wrksx hey guys
15:11 osse hey joe
15:11 Timvde joined #git
15:12 flopsec joined #git
15:12 wrksx wondering, when merging a feature branch in the master branch, do you personalize the merge commit message ?
15:12 sauvin joined #git
15:12 jast not if the branch name is descriptive enough
15:12 Hello71 joined #git
15:12 jast in fact git used to default to not prompting you for a commit message for merges
15:13 haasn` joined #git
15:13 wrksx I was thinking 'in case someone is not clear about the content they can check history
15:13 Motoko joined #git
15:14 jason237 joined #git
15:14 bango2 joined #git
15:15 wrksx (sorry interrupted by phone call)
15:15 wrksx but I wondered if any of you had experience with that workflow =)
15:15 FrontPsych joined #git
15:15 JRHaigh joined #git
15:17 TooLmaN joined #git
15:17 TooLmaN left #git
15:19 diegoaguilar joined #git
15:19 zumba_ad_ joined #git
15:20 osse I customize it often, to pretend my branch had a better name that what it actually had :p
15:20 abra0 joined #git
15:20 ToBeFree joined #git
15:21 tyreld joined #git
15:21 paul424 joined #git
15:22 _ng joined #git
15:24 mariuscc joined #git
15:26 thiago joined #git
15:26 wrksx Lets say I tried to merge branch A into master, but a conflict occur. Now I want to fix the conflict. But the conflict is a pain in the ass to solve, and I got something else to do urgently, and I need to get a clean master before checking out to another "unrealated" branch. What method would you recommend?
15:26 Pegasus_RPG joined #git
15:27 carell joined #git
15:28 Pegasus_RPG Hello. I've messed up a subdirectory in my repo and need to pull a copy from the upstream repo I cloned. How can I do that? git checkout <directory> seems to only pull from my fork
15:28 wrksx I used to reset hard master to the previous commit to fix that. is that ok? Is there any better way? I'm think of the revert stuff specially, not sure how revert is different from that reset.
15:29 sweatsuit joined #git
15:29 fracting joined #git
15:29 nettoweb joined #git
15:30 acetakwas joined #git
15:30 _August_ joined #git
15:31 mib_0ye joined #git
15:31 wrksx Pegasus_RPG, Beware, I'm not a pro. That beeing said, I know checkout is only retreiving stuff from your local repo. "Pull" is what you actually use to retreive stuff from a remote.
15:32 wrksx Pegasus_RPG, now even if you messed things in your branch, what was in it before you mess it up should still be retreivable from your local copy.
15:33 jhass Pegasus_RPG: git checkout upstream/master -- folder
15:33 jhass or whatever your remote is named
15:34 nettoweb joined #git
15:34 ReenignE wrksx: Revert applies commit patches in reverse, it makes new changes which are simply the opposite of the patches. This is ideal when you have to revert commits that are already being tracked remotely, allowing you to make new commits which reverse the changes without changing the history.
15:35 ReenignE wrksx: `git merge --abort` could have been used if you're using git >= 1.7.4
15:36 jaguarmagenta joined #git
15:37 wrksx ReenignE, right thanks for the detailled info.
15:37 DieguezZ joined #git
15:38 Pegasus_RPG jhass: great, thank you!
15:38 Pegasus_RPG oops I omitted the --
15:38 weckl joined #git
15:38 mib_0ye joined #git
15:38 nitin joined #git
15:38 doktori joined #git
15:39 sweatsuit joined #git
15:40 GodGinrai Pegasus_RPG: `git checkout <commit_hash> file`.  Just provide the commit hash of the upstream and you should be good.
15:41 vuoto joined #git
15:42 mib_0ye http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5
15:42 zeroed joined #git
15:42 toogley joined #git
15:42 remitamine joined #git
15:43 Pegasus_RPG left #git
15:43 kadoban joined #git
15:46 Trinity joined #git
15:47 Electrometro joined #git
15:48 wrksx I've read somewhere that reset --soft can be undone
15:48 wrksx So I set up a test repo, couples of commit, and reset soft.
15:48 Phylock joined #git
15:48 wrksx Now I'm wondering how to 'undo' the soft reset =)
15:48 wrksx Let me know if you know how =)
15:49 ReenignE wrksx: Likely said because a soft reset leaves the changes in the working copy and only resets the local git index to the ref provided. Meaning the working copy remains untouched.
15:49 wrksx ouch
15:50 wrksx ReenignE, So you mean my commit is gone?
15:50 i7c git reset --soft HEAD@{1}
15:50 Gsham joined #git
15:50 ReenignE ^
15:50 ReenignE reset again
15:50 wrksx lol
15:50 wrksx reset forward wth
15:50 ReenignE You can see the point before your reset in `git reflog`
15:50 ReenignE Even resets are additive wrt your local reflog.
15:50 kpease joined #git
15:51 wrksx let's check reflog, learnin is nice
15:51 King_Hual joined #git
15:51 King_Hual joined #git
15:51 akushner joined #git
15:51 ochorocho__ joined #git
15:51 ReenignE The HEAD@{1} in the command i7c mentioned is the format seen in the reflog.
15:52 wrksx So this actually is not literally a reset forward. I's a reset to the state before the first reset. Well done git u smart
15:52 m0nkmaster joined #git
15:52 i7c wrksx, reset is nothing like revert. You can even reset a branch to a totally unrelated commit with no common ancestry.
15:52 wrksx And you guys are so helpful thanks a lot
15:52 i7c It just goes to another commit, it does not care about forward, backward, or none of those.
15:53 jh3 joined #git
15:54 synthroid joined #git
15:54 annoymouse joined #git
15:55 dsdeiz joined #git
15:55 dsdeiz joined #git
15:56 irco joined #git
15:56 scoobert1on joined #git
15:56 wrksx Men, git is simply one of the best piece of software I ever seen
15:57 _ikke_ Nice to hear that :-)
15:57 cyan__ joined #git
15:57 wrksx It can do *everything*
15:58 jhass git make me a pizza
15:58 jhass git: 'make' is not a git command. See 'git --help'.
15:58 jhass don't get my hopes up like that :(
15:58 wrksx lulz
15:58 osse wrksx: except tracking empty directories
15:58 osse KEK
15:59 fuchstronaut joined #git
16:00 wrksx osse, hum yeah... Looks like there are still room for improvement =)
16:01 fmcgeough joined #git
16:01 EvilPenguin joined #git
16:01 TomyLobo joined #git
16:02 reim joined #git
16:02 wrksx oh shit I was about to leave the office when "the sound of silence" started
16:03 wrksx gotta work a few minutes more =)
16:03 efdetonator joined #git
16:04 clemf joined #git
16:04 javster joined #git
16:04 dokma joined #git
16:05 clemf joined #git
16:05 dokma git status says there are 5 moded files. However only 1 has actual changes, the others seem to just have the modification time changed. What's best in this case?
16:05 reim joined #git
16:05 aarobc joined #git
16:07 phanimahesh joined #git
16:09 eletuchy joined #git
16:11 _August_ joined #git
16:11 romerocesar joined #git
16:12 mmlb joined #git
16:12 xaviergmail joined #git
16:14 _ikke_ git update-index --refresh
16:14 _ikke_ ?
16:15 efdetonator joined #git
16:15 k3rn31 joined #git
16:16 durham joined #git
16:17 AaronMT_ joined #git
16:18 tomog999 joined #git
16:18 davisonio joined #git
16:21 carell joined #git
16:23 dreiss joined #git
16:23 nidr0x joined #git
16:25 AaronMT joined #git
16:25 netcarver joined #git
16:26 durham joined #git
16:27 ahmed_elgabri joined #git
16:27 M-ou-se joined #git
16:28 invisbl joined #git
16:28 King_Hual joined #git
16:28 vuoto joined #git
16:29 ramsub07 joined #git
16:29 FuzzySockets joined #git
16:29 Phylock joined #git
16:30 samson joined #git
16:30 settermjd joined #git
16:31 vuoto joined #git
16:31 maestrojed joined #git
16:31 vuoto joined #git
16:32 vuoto joined #git
16:32 vuoto joined #git
16:33 ochorocho__ joined #git
16:34 NightMonkey joined #git
16:34 rkazak joined #git
16:35 vuoto joined #git
16:36 blackpajamas joined #git
16:37 clemf joined #git
16:38 dminca joined #git
16:38 subhojit777 joined #git
16:41 xall joined #git
16:41 EduardoMartins joined #git
16:42 realz joined #git
16:44 vuoto joined #git
16:45 mbrzuzy joined #git
16:45 mase-tech joined #git
16:48 Gsham joined #git
16:48 vuoto_ joined #git
16:53 DevAntoine joined #git
16:53 DevAntoine hi
16:53 DevAntoine I need to remove the last commit from develop which is a merge from another branch
16:53 DevAntoine (and it's already been pushed)
16:53 User458764 joined #git
16:54 DevAntoine can I simply git resert --hard HEAD^1 and force push or considering it's a merge it's more complicated?
16:55 milki the only "complicated" part is how you undo it. which you seem to have a handle on already
16:56 taylorm joined #git
16:58 clemf joined #git
16:59 GodGinrai DevAntoine: https://git-scm.com/blog/2010/03/02/undoing-merges.html
16:59 mmlb joined #git
16:59 crater2150 joined #git
17:00 DevAntoine yeah, reset hard will do the trick
17:02 carell joined #git
17:02 steadystatic joined #git
17:03 eletuchy joined #git
17:04 madewokherd joined #git
17:05 ResidentBiscuit Or you can do a revert commit
17:05 ResidentBiscuit If you dont want to have to force push
17:07 romerocesar joined #git
17:07 EvilPenguin joined #git
17:08 clemf joined #git
17:08 eijk joined #git
17:10 rbern joined #git
17:10 jceb joined #git
17:11 netcarver joined #git
17:12 elastix joined #git
17:12 kwizart joined #git
17:12 d0nkeyBOB joined #git
17:13 romerocesar_ joined #git
17:14 vuoto_ joined #git
17:14 StuartMI joined #git
17:14 jimi_ joined #git
17:14 vuoto joined #git
17:14 vuoto joined #git
17:16 romerocesar joined #git
17:16 Arban joined #git
17:17 dreiss joined #git
17:17 DieguezZ joined #git
17:18 realz joined #git
17:18 clemf joined #git
17:19 diegoaguilar joined #git
17:19 d5sx43 joined #git
17:20 refried_ joined #git
17:22 refried_ I've been using git stash -k -u to prepare to test whether the thing i'm about to commit builds correctly —then when I ran into a build issue, I did git stash pop to undo the stashing, with the intent to fiddle with the index some more to get exactly the right thing in there
17:22 refried_ but, when i stash pop I get a bunch of conflicts
17:22 refried_ luckily I made a backup in anticipation of this;  but does the thing I'm trying to do make sense, and is there a safe way to do it?
17:22 WizJin joined #git
17:23 refried_ e.g. to do a stash and then undo it to the pre-stash state if you don't like the outcome?  without creating conflicts
17:23 refried_ *i.e.
17:24 Gsham joined #git
17:25 a_thakur joined #git
17:28 dminca1 joined #git
17:29 lindenle joined #git
17:29 arand joined #git
17:30 uhmgswa^2 joined #git
17:31 milki refried_: either stop making conflicting changes while your stash is stashed
17:31 milki refried_: or use real branches
17:32 satbyy joined #git
17:33 hahuang65 joined #git
17:33 nwkj86 joined #git
17:36 jorelc joined #git
17:36 italoacasas joined #git
17:36 jaguarmagenta joined #git
17:38 reim joined #git
17:40 flopsec joined #git
17:43 thiago joined #git
17:43 d0nn1e joined #git
17:44 User458764 joined #git
17:45 alex1a joined #git
17:47 Repox joined #git
17:49 cyan__ joined #git
17:49 basiclaser joined #git
17:50 italoacasas joined #git
17:51 pipegeek joined #git
17:51 w00tner joined #git
17:51 w00tner hello!
17:52 paul424 joined #git
17:52 w00tner i have several repo that got forked . I did a bug fix. but i only want to send that commit to other repos. do i have to use patch in this case ?
17:55 refried_ joined #git
17:55 jhass at least I don't understand your situation. Could you try to describe it differently again? If possible with some real values (I did a clone of https://foo and then a commit on the master branch... something like that)
17:57 davisonio joined #git
17:57 diogenese joined #git
17:58 eletuchy joined #git
18:00 clemf joined #git
18:00 nocbreak refried_: git stash pop will not make conflicts unless you changed something from where it was stashed
18:00 refried_ nocbreak hmm it really seemed to
18:00 fuchstronaut joined #git
18:02 refried_ milki I didn't edit any of the files externally
18:02 refried_ i had files with some changes staged and some changes not staged
18:02 refried_ i did git stash -k -u to hide the unstaged changes
18:02 zjaffee joined #git
18:02 refried_ and when I did git stash pop, the files had conflicts
18:03 refried_ I didn't edit any source in between
18:03 refried_ just compiled them, which doesn't affect any tracked files
18:03 fii joined #git
18:03 carell joined #git
18:05 moei joined #git
18:06 nocbreak did you really get a conflict? with conflict markers?
18:08 jason237 joined #git
18:09 texinwien joined #git
18:09 Pegasus_RPG joined #git
18:09 Urbany joined #git
18:09 refried_ cbreak: I dunno about conflict markers; I got as far as this https://gist.github.com/refried/c95a1033d7a4b84952beccbbccb1c246 before restoring from backup
18:10 cbreak git status / git diff should tell you what conflicts
18:10 leeN joined #git
18:10 cbreak refried_: if you really didn't change anything, just nuke away the index with git reset --hard
18:10 fuchstronaut joined #git
18:11 refried_ did you look at the gist
18:11 cbreak yes
18:11 refried_ git status showed unmerged paths: "both added"
18:11 cbreak yes, because you kept the index
18:12 cbreak so you had changes that added some file
18:12 cbreak and you had that change stashed too
18:12 cbreak so it seems to have conflicted
18:12 m0viefreak joined #git
18:12 refried_ i guess it was an added file that was partially staged and partially not
18:12 refried_ then the unstaged part stashed away
18:13 refried_ then it conflicted with itself
18:13 fscala joined #git
18:13 refried_ i don't remember what the inside of the file looked like, or if I even checked it, but I would've expected git stash and git stash pop to be inverses
18:14 refried_ given that there were no other changes
18:14 remitamine joined #git
18:14 cbreak refried_: they are
18:14 cbreak but you used -k
18:14 cbreak that leaves debries behind
18:14 refried_ right, but that doesn't change my expectation
18:14 cdg joined #git
18:14 ajf- joined #git
18:15 refried_ it's not debris, it's a view of what the commit will look like
18:15 refried_ is there a safer way to do that?
18:16 refried_ my goal is to test whether a commit i'm preparing will compile
18:16 Sucks joined #git
18:16 refried_ so stash -k -u will make my working dir look like the commit
18:16 crayon joined #git
18:17 refried_ but then stash pop immediately after creates conflicts 0_o
18:17 cbreak just nuke the changes away when you're done
18:17 cbreak git reset --hard HEAD should kill everything uncommitted
18:17 refried_ i don't wanna kill everything uncommitted, i had uncommitted, unstaged work that i didn't want to lose
18:17 cbreak so?
18:17 cbreak you stashed those away
18:18 anth0ny joined #git
18:18 refried_ right, but when i applied the stash i got conflicts — which lead me to believe that that wasn't a safe way to save those changes
18:18 mablae joined #git
18:18 refried_ *head
18:18 refried_ *led
18:18 refried_ heh
18:18 refried_ don't want conflicts
18:19 Pegasus_RPG left #git
18:19 dstarh joined #git
18:19 joshc joined #git
18:19 refried_ just want to restore the working dir to the pre-stash state
18:20 ToxicFrog refried_: wait, what actually happened here? You stashed, then made a bunch of changes, then did "stash apply" without committing the changes you just made?
18:20 cbreak refried_: so, do what I told you
18:20 remitamine left #git
18:21 refried_ ToxicFrog: no, i stashed -k -u, made no changes, did stash pop, which resulted in a bunch of conflicts
18:21 ToxicFrog Ooooh. You stashed with --keep-index.
18:21 elastix joined #git
18:21 refried_ *nod*
18:22 uhmgawa joined #git
18:22 zjaffee joined #git
18:22 refried_ wondering if there's a way to do something similar without generating conflicts
18:25 refried_ so that i can run tests on the working dir as it will appear in the commit (this is why i did stash -k -u), and then continue working with the unstaged changes in tact (this is why i did stash pop); there were no changes other than those made by those two commands
18:25 mostlybadfly joined #git
18:25 realz joined #git
18:25 davidosomething joined #git
18:27 kadoban refried_: https://www.emptypath.com/git_pre_commit_testing this is my way to do that, if it helps
18:27 foist joined #git
18:28 refried_ thanks i'll check it otu
18:28 kadoban (I didn't follow the conversation, just responding to the last line)
18:28 refried_ *out
18:28 refried_ yeah that's good enough
18:28 refried_ basically trying to do pre-commit testing
18:28 Dyonisos joined #git
18:28 refried_ provided it's actually based on the contents of the commit, and not the contents of the working dir
18:29 Sasazuka joined #git
18:29 stonerfish joined #git
18:30 kadoban Yep, that's the same goal the blog post has. You can skip to the final result if it's too verbose, though you miss out on a bit of ... why you have to do all the extra crap.
18:30 durham joined #git
18:31 foist Is there some way to do `git diff`, but only include lines in the diff that match a certain pattern? I want to generate a diff that only contains logger lines.
18:31 refried_ kadoban: i had backed up my working dir, anticipating problems; that worked too, just... sigh
18:32 romerocesar joined #git
18:33 kadoban refried_: Yeah I used to have kind of a horrible thing based on the script just making a backup, but ... it sucked, and took forever too.
18:34 CJKinni` joined #git
18:34 reim joined #git
18:37 LeBlaaanc joined #git
18:37 |2321 joined #git
18:38 eka_ joined #git
18:41 diegoviola joined #git
18:42 dmto joined #git
18:44 duderonomy joined #git
18:45 fuchstronaut joined #git
18:47 livingstn joined #git
18:47 maucar joined #git
18:49 settermjd joined #git
18:49 sebbu joined #git
18:56 ochorocho__ joined #git
18:57 ahmed_elgabri joined #git
18:57 kfpratt joined #git
19:01 paul424 joined #git
19:02 User458764 joined #git
19:03 vuoto_ joined #git
19:03 annoymouse joined #git
19:04 ochorocho__ joined #git
19:04 mwhooker joined #git
19:05 tgunr joined #git
19:06 refried_ joined #git
19:06 eka joined #git
19:06 eletuchy joined #git
19:07 steadystatic_ joined #git
19:08 eletuchy_ joined #git
19:10 t0by joined #git
19:12 FuzzySockets joined #git
19:13 a_thakur joined #git
19:13 quetz joined #git
19:15 vuoto joined #git
19:15 eletuchy joined #git
19:15 carell joined #git
19:16 netj joined #git
19:16 settermjd joined #git
19:20 cyphase joined #git
19:20 courrier joined #git
19:22 roger_raymond joined #git
19:25 SoRoot joined #git
19:27 harish joined #git
19:28 bewilled joined #git
19:28 tabrez joined #git
19:28 ResidentBiscuit joined #git
19:29 bewilled Hi. How can I make sure dev and master are the same each time I want to push to dev?
19:29 feignix joined #git
19:30 milki this sounds very specific to your problem. do you have any details to share?
19:31 feignix joined #git
19:31 t0by joined #git
19:31 GodGinrai bewilled: that sounds weird.  Shouldn't master be behind dev?
19:33 bewilled GodGinrai: I'm thinking just allowing one commit to dev
19:33 bewilled GodGinrai: then that commit is either pushed or discarded
19:34 eletuchy_ joined #git
19:35 efdetonator joined #git
19:37 eletuchy joined #git
19:37 jaguarmagenta joined #git
19:38 remitamine joined #git
19:39 bewilled GodGinrai: Push to dev, test. If everything is correct push to master, else don't allow new commits until the incorrect commit is removed
19:41 eletuchy_ joined #git
19:43 sauvin joined #git
19:43 eletuch__ joined #git
19:45 eletuchy joined #git
19:48 eletuchy_ joined #git
19:48 cdown joined #git
19:49 editshare-ericf joined #git
19:51 Tryop88 joined #git
19:51 fahadash joined #git
19:51 _August_ joined #git
19:51 FeersumEndjinn joined #git
19:53 EvilPenguin joined #git
19:54 eletuchy joined #git
19:56 eletuch__ joined #git
19:57 liuzhen joined #git
19:57 zmanfx joined #git
20:00 eletuchy joined #git
20:00 rbern joined #git
20:02 fuchstronaut joined #git
20:02 zumba_ad_ joined #git
20:03 eletuchy_ joined #git
20:03 mmlb joined #git
20:05 valerd joined #git
20:05 GodGinrai is there any simple way to find that a branch is up-to-date with its remote that I can use in a script?
20:06 BlaXpirit GodGinrai, google, the answers are there
20:06 GodGinrai Googling shows me some `git rev-list` parsing and `git pull --dry-run` solutions
20:06 GodGinrai But those honestly seem like using the wrong tool for the job
20:07 GodGinrai I was wondering if there was a simpler method
20:07 BlaXpirit well what's your actual use case?
20:07 dopesong joined #git
20:07 b1tchcakes joined #git
20:07 harish joined #git
20:07 docnvk joined #git
20:08 efdetonator you can git fetch and compare git rev-parse branch  with git rev-parse origin/branch
20:08 GodGinrai BlaXpirit: Basically, we have users pushing old code to our test server, which causes problems.  The *rule* is that you are supposed to pull the latest master before placing the codes on the server, so I wanted to add some code to our script that pushes that makes it bail if your master is not up-to-date
20:09 BlaXpirit GodGinrai, but git will not allow you to push
20:09 eletuchy joined #git
20:09 GodGinrai BlaXpirit: this isn't a git push we're disallowing.
20:09 BlaXpirit ah you're probably not pushing, just copying
20:09 madduck_ joined #git
20:10 a_thakur joined #git
20:10 GodGinrai BlaXpirit: you can call it whatever you want, my point is that we are trying to disallow the user from doing something non-git if their master is not up-to-date
20:11 eletuch__ joined #git
20:11 GodGinrai efdetonator: does that return the commit hashes that the branches point to?
20:11 BlaXpirit GodGinrai, well what's wrong with this one http://stackoverflow.com/a/3278427
20:12 zjaffee joined #git
20:13 eletuchy_ joined #git
20:13 GodGinrai BlaXpirit: honestly, the fact that git parrots at me in tons of other tasks whether my branch is up-to-date, I assumed that it had a command that could be used to just check that.
20:14 eletuchy joined #git
20:15 dopesong joined #git
20:16 eletuch__ joined #git
20:17 siddharaj6010_ joined #git
20:19 rbern joined #git
20:19 clemf joined #git
20:19 efdetonator GodGinrai: yes
20:19 eletuchy joined #git
20:20 jh3 joined #git
20:20 boombatower joined #git
20:21 refried_ joined #git
20:21 eletuchy_ joined #git
20:22 SoRoot joined #git
20:23 jstein_ joined #git
20:24 eletuch__ joined #git
20:25 eletuchy joined #git
20:27 eletuchy_ joined #git
20:29 davisonio joined #git
20:29 eletuch__ joined #git
20:30 Jetchisel joined #git
20:31 eletuchy joined #git
20:31 sshbio joined #git
20:31 clemf joined #git
20:32 xaviergmail joined #git
20:32 cyan__ joined #git
20:33 eletuchy_ joined #git
20:33 romerocesar joined #git
20:34 gingitsune joined #git
20:34 eletuch__ joined #git
20:36 eletuchy joined #git
20:37 GodGinrai How does git tell if there are changes to commit, for example, in the output of git-status?
20:38 xaviergmail joined #git
20:39 radsy joined #git
20:40 eletuchy_ joined #git
20:41 eletuch__ joined #git
20:42 _ikke_ GodGinrai: it compares stat information + contents against its index
20:43 nachoman joined #git
20:44 GodGinrai _ikke_: stat information being from the filesystem?
20:44 jchonig joined #git
20:44 reim joined #git
20:45 eletuchy joined #git
20:45 ejb joined #git
20:45 xaviergmail joined #git
20:47 eletuchy_ joined #git
20:49 eletuch__ joined #git
20:50 rudi_s GodGinrai: Yes.
20:50 rudi_s It compares size/mtime and if necessary content against its index (.git/index) to decide which files contain modifications.
20:51 eletuchy joined #git
20:51 mage_ joined #git
20:53 eletuchy_ joined #git
20:54 eletuch__ joined #git
20:55 Timvde joined #git
20:55 GodGinrai rudi_s: well, then that explains why `git status` in my mounted volume in docker shows that all of my files have changes that need to be committed.
20:56 eletuchy joined #git
20:56 JanC_ joined #git
20:57 GodGinrai but damn, I was hoping to be able to tell if the user had an unclean repo
20:57 rudi_s GodGinrai: What?
20:57 rudi_s How does that explain anything?
20:57 EvilPenguin joined #git
20:58 GodGinrai rudi_s: the mode is different on every file in the mounted volume, and so it sees tons of changes
20:58 eletuchy_ joined #git
20:58 johnmilton joined #git
20:59 rudi_s GodGinrai: Unless it's +-x, git doesn't care.
20:59 AaronMT joined #git
20:59 GodGinrai rudi_s: it's going from 100644 to 100755 for most of the files
21:00 rudi_s I guess I don't want to know what you or docker are doing there .. but yes, if the x-bit changes, git will notice.
21:00 eletuch__ joined #git
21:01 cdown joined #git
21:01 GodGinrai rudi_s: I'm just mounting a volume.  I suspect it's not docker's fault, and actually the fault of virtualbox's shared folders.  I could be wrong, tho'
21:02 harish joined #git
21:02 rudi_s ...
21:03 aidalgol joined #git
21:03 eletuchy joined #git
21:05 jeffreylevesque joined #git
21:05 ahmed_elgabri joined #git
21:07 eletuchy_ joined #git
21:08 diegoaguilar joined #git
21:08 DieguezZ joined #git
21:09 eletuch__ joined #git
21:09 nettoweb joined #git
21:10 eletuchy joined #git
21:11 Gsham joined #git
21:11 cdown_ joined #git
21:11 nettoweb joined #git
21:11 Seveas !dropbox
21:11 gitinfo Use git-remote-dropbox instead of placing your repository directly in the "Dropbox folder", or you'll get sync errors(and eventually, a corrupted repo). https://github.com/anishathalye/git-remote-dropbox
21:12 eletuchy_ joined #git
21:13 GodGinrai rudi_s: is there any easy way to check just the contents of the files for changes instead of the mode?
21:14 rudi_s GodGinrai: core.fileMode = false
21:14 ResidentBiscuit joined #git
21:16 GodGinrai rudi_s: Is there a way to do this temporarily without dirtying the config? (like how you can specify env vars before a command in shell: `SOMEVAR=1 ./my_script`)
21:16 Seveas git -c foo=bar
21:16 eletuchy joined #git
21:16 johnmilton joined #git
21:16 GodGinrai Seveas: ty
21:17 reim joined #git
21:17 mellernoia joined #git
21:17 stoopkid joined #git
21:18 eletuch__ joined #git
21:19 apprentice joined #git
21:20 eletuchy_ joined #git
21:20 visualshock joined #git
21:21 clemf joined #git
21:22 lildude3970 joined #git
21:23 eletuchy joined #git
21:23 reim joined #git
21:24 lildude3970 It would appear that the code I've pushed to my github repo is showing up under a different username. Is it possible to change this for potentially the last 5-10 commits? :/
21:25 mwhooker joined #git
21:25 eletuch__ joined #git
21:26 eletuchy_ joined #git
21:28 eletuchy joined #git
21:29 visualshock I have added contributors to my github repo, and when they push something it appears under "pull requests" right?
21:30 Eugene visualshock - if they have Push permissions to your repo they can push directly to the branches. You can make a Pull Request between branches within the same repo, but a more common Github workflow is to have the contributor Fork it into their own personal space, and then create a PR from that back to your parent repo
21:30 kadoban visualshock: No, PRs are a separate thing. They require no permission from you to create.
21:30 eletuch__ joined #git
21:30 mage_ joined #git
21:31 kadoban lildude3970: I forget how attribution works on github. Do you have your email address correct in your commits? Is it the same email address that github has on your account?
21:31 mdw joined #git
21:32 visualshock Ok, I have given them all push access, but I still had to merge the pull request. Maybe it was their intention.
21:33 mdw joined #git
21:33 eletuchy joined #git
21:34 kadoban Probably. Having push access doesn't mean you have to use it, you can still create PRs.
21:35 mdw joined #git
21:35 eletuchy_ joined #git
21:36 GodGinrai lildude3970: github determines this by the email address of the committer.  Just make sure the email addrs are correct in the respective accounts
21:37 mdw joined #git
21:37 eletuch__ joined #git
21:38 jaguarmagenta joined #git
21:39 lildude3970 kadoban: The email address in the commits is correct, in fact it hasn't changed at all when I do a git config
21:39 raijin joined #git
21:39 lildude3970 GodGinrai: I actually just flat out deleted the other account a few minutes ago, because it's old and I don't use it, and I never wanted it to be associated with this particular repo.
21:40 lildude3970 When I run git log in my repo, though, I can't even see where/when/how the other account got involved because the name and email was never changed for any of the commits
21:40 GodGinrai lildude3970: hrm... Maybe github caches the user it first recognizes it as.
21:40 GodGinrai lildude3970: if the other account on github had that email address, then it is possible for it to hijack it anyway
21:40 Gsham joined #git
21:40 lildude3970 :(
21:41 lildude3970 I'm just so frustrated... Should I just delete the repo entirely and start over?
21:41 mdw joined #git
21:41 lildude3970 I'm apparantly still commiting under the wrong user ID even now
21:41 mcint__ joined #git
21:41 lildude3970 And I can't find any clear explanations on how to fix it
21:41 GodGinrai lildude3970: I would browse through the github docs and see if they have a proposed fix.  This has happened to me as well, so I wouldn't be surprised if someone had reported it.
21:43 rubyonrailed joined #git
21:44 SimonNa joined #git
21:45 gsingh joined #git
21:45 johnmilton joined #git
21:47 [cust] joined #git
21:47 mdw joined #git
21:47 Dougie187 left #git
21:48 Muzer joined #git
21:48 raininja joined #git
21:49 ahmed_elgabri joined #git
21:50 EvilPenguin joined #git
21:53 jyjon joined #git
21:53 jimi_ joined #git
21:54 joki joined #git
21:54 mcint__ Are there servers/applications (or a way to configure http-backend) to serve content from my own server a la raw.githubusercontent?
21:55 mcint__ to serve file content by commit/commit-ish and path
21:55 nnyk_ joined #git
21:55 remitamine joined #git
21:56 nick123 joined #git
21:56 _August_ joined #git
21:57 cdown I have a mapping where one of the commands is `:normal }<CR>`. When this command moves the cursor (ie. there is a paragraph to move to), the macro continues further. However, when `:normal }<CR>` does not move the cursor, it just displays that in the status and doesn't do anything else. How can I continue regardless?
21:57 orbitphreak joined #git
21:57 eight58 joined #git
21:57 ejb joined #git
21:57 cdown ie. the command is `xxx:normal }<CR>yyy`, and "yyy" only happens if there was a paragraph to move to
21:58 cdown Whereas I'd like to continue whether or not `:normal }` did anything.
21:58 fornax joined #git
21:58 mcint__ cdown: that might be a #vim question
21:58 cdown what the fuck
21:58 cdown i thought i pressed alt-g
21:58 cdown *v
21:58 cdown but i clearly pressed alt-v and came in here
21:58 cdown sigh, sorry
21:58 mcint__ gl
21:59 GodGinrai lol
21:59 Lunatrius` joined #git
22:00 kasper93 joined #git
22:00 cdown well, it was 3 chars long, so i guess my brain didn't register that the status line shows the wrong channel ;-)
22:00 jimi_ joined #git
22:00 lildude3970 Ah gosh.
22:00 lildude3970 I think I might have fixed it.
22:00 lildude3970 :>
22:01 lildude3970 I had no idea it was tied to email in that way.
22:01 jyjon joined #git
22:02 Gamecubic joined #git
22:02 hide_ left #git
22:02 hide joined #git
22:03 aax joined #git
22:03 mwhooker joined #git
22:04 barteks2x joined #git
22:05 mdw joined #git
22:05 eletuchy joined #git
22:05 DolphinDream joined #git
22:07 fuchstronaut joined #git
22:08 kadoban ... isn't that what we said above?
22:09 eletuchy_ joined #git
22:09 _August_ joined #git
22:10 mcint__ ah gitweb out of the box...plus server
22:10 jyjon joined #git
22:11 lildude3970 kadoban: I had no idea before you had said that, of course.
22:11 lildude3970 :)
22:12 DolphinDream joined #git
22:12 clemf joined #git
22:12 eletuchy joined #git
22:14 eletuch__ joined #git
22:14 ToBeCloud joined #git
22:16 eletuchy_ joined #git
22:16 ejb joined #git
22:17 ajf- joined #git
22:18 eletuchy joined #git
22:20 rgrinberg joined #git
22:20 eletuch__ joined #git
22:21 eletuchy_ joined #git
22:23 eletuchy joined #git
22:23 clemf joined #git
22:26 fscala joined #git
22:26 Darcidride joined #git
22:26 eletuchy_ joined #git
22:27 docnvk joined #git
22:27 italoacasas joined #git
22:28 eletuch__ joined #git
22:30 nellicus_ joined #git
22:30 eletuchy joined #git
22:31 caudill joined #git
22:32 lildude3970 left #git
22:32 eletuchy_ joined #git
22:34 eletuch__ joined #git
22:34 basiclaser joined #git
22:36 eletuchy joined #git
22:36 sauvin joined #git
22:37 ajf- joined #git
22:37 eletuchy_ joined #git
22:38 User458764 joined #git
22:39 eletuch__ joined #git
22:40 shaggycat joined #git
22:41 eletuchy joined #git
22:43 eletuchy_ joined #git
22:43 jimi_ joined #git
22:44 xaviergmail joined #git
22:45 w00tner joined #git
22:45 clemf joined #git
22:45 darkbit joined #git
22:45 shaggycat joined #git
22:46 eletuchy joined #git
22:46 clemf joined #git
22:47 clemf joined #git
22:48 clemf joined #git
22:48 clemf joined #git
22:49 eletuchy_ joined #git
22:49 nnyk_ joined #git
22:49 zjaffee joined #git
22:49 clemf joined #git
22:51 mdw joined #git
22:52 ochorocho__ joined #git
22:52 mdw joined #git
22:52 eletuchy joined #git
22:53 mdw joined #git
22:53 ejb joined #git
22:53 ejb joined #git
22:54 eletuch__ joined #git
22:55 mdw joined #git
22:56 foul_owl joined #git
22:56 eletuchy_ joined #git
22:57 nick123 joined #git
22:57 xall joined #git
22:58 eletuchy joined #git
22:59 taylorm joined #git
23:00 eletuch__ joined #git
23:02 eletuchy_ joined #git
23:02 Wulf left #git
23:02 gsingh joined #git
23:04 eletuchy joined #git
23:06 eletuch__ joined #git
23:07 NyB joined #git
23:08 zivester joined #git
23:09 eletuchy joined #git
23:10 ahr3n joined #git
23:11 eletuchy_ joined #git
23:12 NyB Hi! Has the behavior of !-prefixed (shell) aliases changed recently (for some definition of recently)? It seems to be switching to the worktree first now...
23:13 eletuch__ joined #git
23:14 NyB ...but at least it sets GIT_PREFIX
23:15 eletuchy joined #git
23:17 eletuchy_ joined #git
23:17 diegoaguilar joined #git
23:18 reim joined #git
23:19 eletuch__ joined #git
23:20 xall joined #git
23:21 ffabi joined #git
23:21 reim joined #git
23:23 diegoaguilar joined #git
23:24 mablae_ joined #git
23:29 LeBlaaanc joined #git
23:31 tjone270_ joined #git
23:31 larsrustand joined #git
23:39 jaguarmagenta joined #git
23:39 lindenle joined #git
23:41 sauvin joined #git
23:48 allcentury joined #git
23:48 eletuchy joined #git
23:52 drbean joined #git
23:53 afuentes joined #git
23:56 Guest89011 joined #git
23:56 Lyqyd joined #git
23:58 shinnya joined #git
23:59 clemf joined #git

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