Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-26

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

All times shown according to UTC.

Time Nick Message
00:02 cagomez_ joined #git
00:03 dedicated joined #git
00:04 Noldorin joined #git
00:04 brimonk joined #git
00:04 brimonk Anyone have any advice on how to merge two git repos?
00:05 telephone joined #git
00:05 telephone joined #git
00:05 s17 --> <--
00:06 s17 maybe I'm wrong, but try adding one of the repos as a branch of the other and see what happens when you do a pull request
00:07 s17 git checkout -b <new-branch> ... add all files ... ???
00:07 s17 probably not
00:07 durham_ joined #git
00:08 peterbecich joined #git
00:08 menip joined #git
00:11 pandeiro joined #git
00:12 TikityTik joined #git
00:13 xtpeeps joined #git
00:14 brimonk The real problem is that another guy on the project just copied over my existing files,
00:14 brimonk And didn't even think about the ~100 commits that I have.
00:14 brimonk He was just like, "Initial Commit"
00:14 brimonk and copied everything.
00:17 s17 eww
00:18 s17 I'm used to a tool called 'diffmerge', but may be going away from it soon, now that I'm working more with git
00:18 mjuszczak joined #git
00:18 dsdeiz joined #git
00:18 s17 it did help recently when merging two repos, though
00:19 s17 find all the differences in this one that aren't in that one, but do it in a new branch
00:19 rewt brimonk, did he delete the repo, or just made a new commit without your files?
00:19 s17 then you can step through all the differences and only apply the ones that are needed
00:20 idlemind joined #git
00:21 kadoban brimonk: Temm them to undo that and actually merge in your changes?
00:21 dirtyroshi_ joined #git
00:21 brimonk I feel like I'll just pull down the 4 changes he made, and merge them into my original tree.
00:21 brimonk I hate idiots.
00:22 Peetz0r joined #git
00:22 brimonk rewt: he cp'd my master branch into a whole new repo, and added stuff into that one.
00:23 brimonk Like,
00:23 brimonk He just copied the raw files into a new dir right after he did a 'git init'
00:23 brimonk and commited those with the message, "Initial Commit"
00:25 rewt and then force pushed it to the server?
00:25 dirtyroshi_ joined #git
00:26 Cabanossi joined #git
00:29 telephone joined #git
00:29 telephone joined #git
00:30 Noodlewitt joined #git
00:31 kadoban brimonk: Is this a coworker, or ... who is this? Why do you care that they suck?
00:31 madewokherd joined #git
00:34 Noodlewitt joined #git
00:34 zzz joined #git
00:35 theiostream joined #git
00:37 fstd joined #git
00:40 durham joined #git
00:45 dsdeiz joined #git
00:45 rivarun joined #git
00:45 mar77i joined #git
00:45 earnestea joined #git
00:45 armin joined #git
00:45 fstd_ joined #git
00:45 defewit joined #git
00:46 ddavidd joined #git
00:47 telephone joined #git
00:47 telephone joined #git
00:48 jihedamine joined #git
00:48 jiangpeng joined #git
00:50 rominronin joined #git
00:51 MuffinMedic joined #git
00:51 Muzer joined #git
00:52 ivo_ joined #git
00:53 NotKyros joined #git
00:54 Squiggs joined #git
00:54 jarred joined #git
00:54 MrMojit01 joined #git
00:55 phase3 joined #git
00:55 bdonnahue1 joined #git
00:56 Noodlewitt joined #git
00:56 dilfridge joined #git
00:56 TheKyros joined #git
00:56 Cabanossi joined #git
00:58 nikivi joined #git
00:58 watersoul_ joined #git
00:58 jihedamine left #git
00:59 DolphinDream joined #git
00:59 fatalhalt joined #git
01:00 juvenal joined #git
01:00 AKPWD joined #git
01:00 khfeng joined #git
01:01 Vortex34 joined #git
01:01 SpeakerToMeat joined #git
01:01 wagle joined #git
01:01 tctara joined #git
01:01 cqi joined #git
01:01 ygeLN joined #git
01:01 FilipNor1ic joined #git
01:01 shampine joined #git
01:02 discopatrick joined #git
01:02 jerrcs joined #git
01:02 jesk joined #git
01:02 buck1 joined #git
01:02 rizonz joined #git
01:02 Noldorin joined #git
01:02 firef1y joined #git
01:03 lukky513 joined #git
01:04 Ekho joined #git
01:04 Noodlewitt joined #git
01:06 mustmodify joined #git
01:06 mustmodify Does git use https?
01:08 bilal_ joined #git
01:08 bremner it can
01:11 bremner mustmodify: do you have a more specific question?
01:12 nikivi joined #git
01:13 KG4PEQ____ joined #git
01:13 bongo joined #git
01:14 brimonk kadoban: lol. He's kind of a coworker.
01:14 brimonk Just feeling frustrated that there's deadlines and I have to fight other people as well.
01:14 rchavik joined #git
01:15 Rodya_ joined #git
01:15 scottjl_ joined #git
01:15 atomi joined #git
01:16 __name__ joined #git
01:17 weakdan joined #git
01:17 Ekho joined #git
01:18 ddavidd joined #git
01:18 phase3 joined #git
01:18 bronson joined #git
01:19 kbeflo joined #git
01:19 nixdork joined #git
01:20 lagothrix joined #git
01:20 moei joined #git
01:21 Tiny_Groot joined #git
01:21 nikivi joined #git
01:23 Tiny_Groot there we go
01:23 Tiny_Groot Hello!
01:23 Tiny_Groot I've got a question about line endings and the .gitattributes file.
01:23 bertschn_ joined #git
01:23 cagomez joined #git
01:23 Tiny_Groot Should I just...blurt it out?
01:24 bremner blurt.
01:24 Tiny_Groot Sweet. I made a .gitattributes file that I think should specify that all text files should be checked out with lf line endings
01:25 Tiny_Groot yet when I cloned the repo, they're all still crlf
01:25 Tiny_Groot what gives?
01:25 barteks2x joined #git
01:25 finalbeta joined #git
01:25 bremner just guessing, maybe it's confused about what's a text file
01:25 bremner e.g. UTF16 or something?
01:26 Tiny_Groot https://gist.github.com/BenjaminHolland/f0c3e36d6e272791cb7f743b03008b6d
01:26 Tiny_Groot the file in question
01:26 Tiny_Groot bremner, naw.
01:27 pumafied joined #git
01:28 earnestea joined #git
01:28 Tiny_Groot like...Arent I telling it that all the files are supposed to be text?
01:28 Tiny_Groot and that all text files are supposed to be lf?
01:28 Tiny_Groot maybe I'm misunderstanding the format
01:28 telephone joined #git
01:28 telephone joined #git
01:29 jameser joined #git
01:29 bremner at this point I should admit I've never used .gitattributes, and clam up.
01:29 Tiny_Groot hm.
01:29 Hobbyboy joined #git
01:29 brimonk left #git
01:29 Tiny_Groot anyone else got some ideas?
01:30 jiangpeng joined #git
01:30 Tiny_Groot bremner, me neither. hence why I'm here.
01:33 thiago joined #git
01:34 ajf- joined #git
01:35 rkazak joined #git
01:37 juvenal joined #git
01:39 theiostream joined #git
01:41 SpeakerToMeat joined #git
01:42 warthog9 joined #git
01:47 ajf- How can I keep the directory structure when doing this. Currently all files go to dir/ instead of in their corresponding subdirectories: git ls-files dir/ --modified --others | xargs -i scp {} user@remote:/path/to/dir/
01:47 stutter joined #git
01:47 peepsalot joined #git
01:47 ki0 joined #git
01:47 Guest92809 joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 dsdeiz joined #git
01:50 dsdeiz joined #git
01:50 LBV_User joined #git
01:51 Muzer joined #git
01:52 Shakeel_ joined #git
01:53 Gsham joined #git
01:56 telephone joined #git
01:56 telephone joined #git
01:56 fatalhalt joined #git
01:56 Cabanossi joined #git
01:57 sunri5e joined #git
01:57 Tiny_Groot so...nobody, huh?
02:00 dermoth joined #git
02:00 jstimm joined #git
02:02 Gsham joined #git
02:03 smccully joined #git
02:04 Goplat joined #git
02:04 pks joined #git
02:05 mjuszczak joined #git
02:06 mjuszcza_ joined #git
02:07 fatalhalt joined #git
02:08 brent__ joined #git
02:09 Tiny_Groot ok
02:09 Tiny_Groot so I updated the .gitattribute file to a known good one
02:09 Tiny_Groot and the I cloned
02:10 Tiny_Groot and ALL the text files are STILL crlf
02:10 Tiny_Groot even though the .gitattributes file specifies they should be lf
02:11 ojacobson Tiny_Groot: what line endings appear in the actual blob object?
02:11 ojacobson `git cat-file blob HEAD:path/to/file | hexdump -C` would be a good place to start
02:11 ojacobson All of the gitattributes text management assumes the stored ending is lf
02:12 bongo joined #git
02:13 Tiny_Groot I don't have hexdump
02:14 Tiny_Groot but when I run git grep -I --files-with-matches $'\r' HEAD nothing shows up, and when I run git grep -I --files-with-matches $'\r\n' HEAD EVERYTHING shows up
02:16 cqi joined #git
02:16 lucazz joined #git
02:17 Rodya_ joined #git
02:18 Vortex35 joined #git
02:18 scottjl joined #git
02:19 SlashLife joined #git
02:22 rominronin joined #git
02:22 theiostream joined #git
02:23 scottjl joined #git
02:23 fatalhalt joined #git
02:26 jaeckel joined #git
02:26 Cabanossi joined #git
02:33 onlyanegg joined #git
02:36 fatalhalt joined #git
02:36 telephone joined #git
02:36 telephone joined #git
02:43 robattila256 joined #git
02:48 chachasmooth joined #git
02:48 mustmodify left #git
02:52 jaeckel joined #git
02:52 hexagoxel joined #git
02:54 peterbecich joined #git
02:56 theiostream joined #git
02:56 duderonomy joined #git
02:58 TikityTik joined #git
02:58 dreiss joined #git
02:58 a_thakur joined #git
03:00 fahadash joined #git
03:01 dstw joined #git
03:03 aavrug joined #git
03:09 jaeckel joined #git
03:09 jaeckel joined #git
03:11 TheSimonator joined #git
03:13 MrWoohoo joined #git
03:14 jiangpeng joined #git
03:16 dreiss joined #git
03:18 Rodya_ joined #git
03:21 justanotheruser joined #git
03:22 chipotle joined #git
03:32 rivarun joined #git
03:32 raspado joined #git
03:32 Nilesh_ joined #git
03:36 blunaxela joined #git
03:37 jnewt_ joined #git
03:37 onlyanegg joined #git
03:37 LordRyan Is there an easy way to do (roughly) `git log --oneline -10` over five different repositories and have them sorted together? I want to be able to combine the commit history of multiple projects into an "update feed"
03:40 Cabanossi joined #git
03:40 otiose joined #git
03:41 jameser_ joined #git
03:41 fatalhalt joined #git
03:44 adgtl joined #git
03:45 Spydar007 joined #git
03:48 MuffinMedic joined #git
03:52 rominronin joined #git
03:53 robnester joined #git
03:55 fatalhalt joined #git
03:58 onlyanegg joined #git
03:59 a_thakur joined #git
04:00 bronson joined #git
04:03 robnester joined #git
04:05 Noodlewitt joined #git
04:06 ShapeShifter499 joined #git
04:07 kfoonamalik joined #git
04:08 TzilTzal joined #git
04:08 TzilTzal Hi
04:09 fatalhalt joined #git
04:10 Cabanossi joined #git
04:13 kfoonamalik joined #git
04:13 Wulfe813 joined #git
04:15 SwiftMatt joined #git
04:16 kfoonamalik joined #git
04:19 Rodya_ joined #git
04:21 fatalhalt joined #git
04:22 robotroll joined #git
04:30 fatalhalt joined #git
04:34 theiostream joined #git
04:37 Atrumx joined #git
04:37 a_thakur_ joined #git
04:38 Bock joined #git
04:39 mjuszczak joined #git
04:40 _ikke_ hey
04:40 _ikke_ LordRyan: Nothing built into git
04:40 _ikke_ LordRyan: You ave to manually sort the output from the different repositories
04:40 LordRyan _ikke_: yeah, eventually i just used a --pretty with \1 delimiters and parsed it from there
04:40 LordRyan and then used this weird sort thing
04:41 felixjet joined #git
04:41 telephone joined #git
04:41 telephone joined #git
04:43 Xenophon1 joined #git
04:44 marianina8 joined #git
04:44 Raging_Hog joined #git
04:44 ayogi joined #git
04:45 xall joined #git
04:47 Levex joined #git
04:49 mmattice joined #git
04:51 a_thakur joined #git
04:53 fracting joined #git
04:53 diogenese joined #git
04:59 onlyanegg joined #git
05:00 fakenerd joined #git
05:02 defewit joined #git
05:08 senaps joined #git
05:08 indistylo joined #git
05:09 senaps joined #git
05:15 schleppel joined #git
05:16 senaps joined #git
05:16 senaps joined #git
05:16 cads2 joined #git
05:18 Guest89557 joined #git
05:20 qt-x joined #git
05:20 Rodya_ joined #git
05:21 jozwior joined #git
05:23 lordjancso joined #git
05:23 ogny joined #git
05:24 armyriad joined #git
05:25 rominronin joined #git
05:26 overlord_tm joined #git
05:28 theiostream joined #git
05:28 jameser joined #git
05:30 xtpeeps joined #git
05:31 xall_ joined #git
05:32 jiangpeng joined #git
05:33 freimatz joined #git
05:37 acetakwas joined #git
05:37 jameser joined #git
05:39 imack joined #git
05:42 Raging_Hog joined #git
05:42 regedit joined #git
05:43 dersand joined #git
05:50 scoobert1on joined #git
05:52 SlashLife joined #git
05:59 mel00010 joined #git
06:00 Atrix joined #git
06:00 dermoth joined #git
06:01 zerow joined #git
06:02 telephone joined #git
06:02 telephone joined #git
06:02 tarkus joined #git
06:04 rscata joined #git
06:05 brent__ joined #git
06:10 chele joined #git
06:11 dsdeiz joined #git
06:11 dsdeiz joined #git
06:12 darkbit joined #git
06:13 MineCoins joined #git
06:16 ferr joined #git
06:17 bathtub_shark joined #git
06:20 Rodya_ joined #git
06:23 ki0 joined #git
06:24 sbulage joined #git
06:24 telephone joined #git
06:24 telephone joined #git
06:25 Cabanossi joined #git
06:26 overlord_tm joined #git
06:28 osse \1 ? why not \0 ? :p
06:28 osse log -z
06:32 rominronin joined #git
06:33 ronskisika joined #git
06:33 zeroed joined #git
06:33 zeroed joined #git
06:36 basy_ joined #git
06:37 govg joined #git
06:41 bariscant joined #git
06:42 elect joined #git
06:43 Silenced joined #git
06:44 manuelschneid3r joined #git
06:44 Guest77180 joined #git
06:45 onlyanegg joined #git
06:46 zefferno joined #git
06:47 freimatz joined #git
06:48 gajus left #git
06:49 jiangpeng joined #git
06:51 Brski joined #git
06:52 slidercrank joined #git
06:53 rasto joined #git
06:53 Darren_ joined #git
06:55 Cabanossi joined #git
06:58 Silmarilion joined #git
06:59 cagomez joined #git
07:05 tkore joined #git
07:05 mSSM joined #git
07:05 Tobbi joined #git
07:05 King_Hual joined #git
07:05 King_Hual joined #git
07:05 zulutango joined #git
07:06 unpleased joined #git
07:07 rchavik joined #git
07:07 JanC_ joined #git
07:13 Raging_Hog joined #git
07:14 chigang joined #git
07:15 theoceaniscool joined #git
07:16 h12o joined #git
07:16 ivanruizmonjo__ joined #git
07:16 netj joined #git
07:16 sea-gull joined #git
07:21 dreiss joined #git
07:21 Rodya_ joined #git
07:23 masuberu joined #git
07:23 theoceaniscool_ joined #git
07:26 _ng joined #git
07:27 hustl4 joined #git
07:28 bertschneider joined #git
07:30 Brski joined #git
07:32 dsdeiz joined #git
07:32 dsdeiz joined #git
07:42 xaa joined #git
07:43 dvaske_ joined #git
07:44 Tuor joined #git
07:44 glebihan_ joined #git
07:45 jaziz joined #git
07:47 Chuguniy joined #git
07:50 adac joined #git
07:51 Tuor joined #git
07:51 Tuor joined #git
07:55 Cabanossi joined #git
07:57 glebihan joined #git
08:02 marcogmonteiro joined #git
08:04 hurricanehrndz joined #git
08:04 Endarked joined #git
08:05 imrg joined #git
08:06 nowhereman joined #git
08:07 Milos joined #git
08:07 dsdeiz joined #git
08:07 mikecmpbll joined #git
08:08 theoceaniscool_ joined #git
08:09 cdown joined #git
08:09 elsevero joined #git
08:10 tvw joined #git
08:11 _ng joined #git
08:12 gfixler joined #git
08:14 overlord_tm joined #git
08:16 a_thakur joined #git
08:17 Tuor joined #git
08:17 Tuor joined #git
08:17 glebihan joined #git
08:17 metachr0n joined #git
08:22 Rodya_ joined #git
08:22 rts-sander joined #git
08:24 Snugglebash joined #git
08:24 senaps joined #git
08:24 tymczenko joined #git
08:26 a_thakur joined #git
08:29 pbandark joined #git
08:29 jameser_ joined #git
08:30 ams__ joined #git
08:36 glebihan joined #git
08:37 jameser joined #git
08:37 rokups joined #git
08:37 glebihan_ joined #git
08:38 jiangpeng joined #git
08:39 qt-x joined #git
08:41 notebox joined #git
08:41 cstratak joined #git
08:42 fakenerd_ joined #git
08:42 dsdeiz joined #git
08:42 otiose joined #git
08:43 jesk left #git
08:43 skunkz joined #git
08:44 aard joined #git
08:45 SlashLife joined #git
08:45 mentazoom joined #git
08:45 onlyanegg joined #git
08:46 Urbany joined #git
08:46 spark`_ joined #git
08:47 qt-x joined #git
08:49 arand__ joined #git
08:50 a_thakur joined #git
08:50 Introoter joined #git
08:50 chll_ joined #git
08:51 flopsec joined #git
08:52 sbulage joined #git
08:53 a_thakur joined #git
08:53 gabes joined #git
08:54 gabes left #git
08:54 metalraiden34 joined #git
08:54 stepho joined #git
08:57 phideas joined #git
08:57 clmsy joined #git
08:58 seni joined #git
08:58 intellix joined #git
08:59 phideas left #git
08:59 sarri joined #git
08:59 sarri joined #git
09:01 jiangpeng joined #git
09:01 chll_ joined #git
09:04 achadwick joined #git
09:07 earnestea joined #git
09:09 Pilfers joined #git
09:12 WizJin joined #git
09:14 skunkz joined #git
09:16 dsdeiz joined #git
09:16 dsdeiz joined #git
09:19 sonOfRa joined #git
09:23 Rodya_ joined #git
09:23 theoceaniscool joined #git
09:23 sbulage joined #git
09:25 Cabanossi joined #git
09:27 Stace joined #git
09:27 netroxen joined #git
09:27 Stace is it possible for me to reset --soft just one file instead of the entire commit?
09:28 Stace usually I'd do git reset HEAD~1 --soft but I only want to reset changes in one file instead of all of them
09:28 moritz Stace: then you should  git checkout HEAD~1 path/to/file
09:28 jonascj joined #git
09:29 moritz Stace: that'll keep the commit, but writes the old state of that particular file into the index and working copy
09:29 Stace moritz: but then I wouldn't have the changes in the staged area
09:30 jonascj Hi all. So I'm on a branch b1 and have made some changes to files (nothing staged), but these changes should not be committed to the b1 branch, but some other branch. Maybe the branch I'm on should even be merged with master before I branch b2. How can I accomplish this?
09:30 moritz Stace: index = staging area
09:30 moritz jonascj: !float
09:30 gitinfo jonascj: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
09:31 jonascj thanks
09:31 Stace moritz: I don't understand. I want to keep my changes, I just want to apply them to a different commit
09:31 Stace I don't want the old file back
09:32 Stace reset --soft doesn't revert the contents of the file, it just un-doas the commit step
09:32 ti2 Stace, what is your intension, then?  Do you want to modify your last commit?
09:33 Stace I have two intentions
09:33 Stace 1) to modify the last commit (easily achieved with git checkout HEAD~1 file, git add file, git commit --ammend file)
09:33 Stace 2) to apply the changes one one file to another commit (where I'm stuck)
09:34 Stace if I just wanted to do #1 I'd be fine
09:34 Stace a cherry pick with just one file would also probably work
09:34 brk_ joined #git
09:35 moritz Stace: you can do a cherry-pick with --no-commit
09:35 moritz Stace: and then unstage all changes, git add the one file, commit
09:36 Stace ooh, or I could create a patch
09:36 ti2 What about: git checkout othercommit && git log -1 -p HEAD@{1} yourfile | patch -p1
09:36 Stace git diff HEAD~1 HEAD file
09:36 Stace ok, that's more like it
09:37 jost joined #git
09:37 Stace at this rate, it'll probably be easier just to do reset --soft on the entire thing and re-commit after dropping file from staging area
09:38 matus joined #git
09:40 Stace ti2: I'm not very familiar with the @{1} notation, is HEAD@{1} the same as HEAD~1?
09:41 metalraiden34 joined #git
09:44 ti2 Stace: no, it's the previously used HEAD (cp. git-reflog) pointing to the commit you wanted to do the 'reset --soft' on.
09:44 mSSM joined #git
09:45 dminuoso ti2: Oh interesting. So @{2} actually is just a reflog entry for any ref?
09:45 Stace ti2: isn't that the same thing as HEAD~1? in what cases would the reflog deviate from the tree itself?
09:45 jast without a ref it refers to HEAD which has a reflog, too
09:45 dminuoso Stace: No.
09:46 jast Stace: merge, rebase, reset, ...
09:46 Stace I'll google, ignore my ignorant questions, lol
09:46 jast for instance, if you do a fast-forward merge, you get a whole bunch of commits in a single operation (one new reflog entry)
09:46 dminuoso jast: How do you specify a specific reflog entry for a given ref?
09:46 jast refname@{...}
09:46 adac joined #git
09:46 Stace jast: right, got it
09:47 dminuoso jast: so refs/tags/v1@{1} for example?
09:47 vrach joined #git
09:47 ki0 joined #git
09:48 jast dminuoso: yes, but a tag is a bad example because tags don't have reflogs :)
09:49 jast and as always, you can use the short ref name, without the refs/heads/ prefix, if it's still unambiguous
09:49 routingsparks joined #git
09:51 dsdeiz joined #git
09:51 dsdeiz joined #git
09:54 senaps joined #git
09:54 Snugglebash joined #git
09:55 jost joined #git
09:55 Cabanossi joined #git
09:57 Stace jast: so if I went through process #1 (checkout HEAD~1 file, add file, commit --ammed) that would create a NEW commit hash. the old one (un-ammended) isn't in the tree anymore but is in the reflog, which is where I can get it from
09:58 Stace right?
09:58 jast yep
09:58 YuGiOhJCJ joined #git
09:58 Stace got it!
09:58 Stace that's really cool
09:58 jast the reflog ist one layer of defence for keeping old commits (and related objects) around
09:59 jast it also allows you to do complicated rebases/merges without any risk. if the result doesn't look right, you can just use the reflog and reset back to what you had before.
09:59 Stace ok, so that's why you use HEAD@{1} because that's actually the un-ammended commit
10:00 choice joined #git
10:00 jast after the amend, yeah, sure
10:00 choice Hello!
10:00 jast ahoy there
10:00 choice So I did a git pull over ssh, modified a bunch of files, added and commited .. and now when I say "git push", git tells me "Everything up-to-date" and does not push anything. Why?
10:01 Tuor joined #git
10:01 Stace ok. I didn't know that, that's really useful. thanks!
10:01 tonyj joined #git
10:01 jast choice: hard to say without more information. you may want to compare the history of your branch and the upstream branch: git fetch; git log; git log @{u}
10:02 choice jast: OH! I forgot to commit!! Stupid me :)
10:03 jast yeah, that would do it :)
10:03 choice Thanks, jast!
10:03 chardan joined #git
10:03 jast you're welcome. I like easy solutions, so that's all good.
10:03 choice Shit, now it tells me it's too snobbish to push.
10:04 choice "refusing to update checked out branch"
10:04 choice Where do I set that fucking receive.denyCurrentBranch?
10:04 jast in the remote repository
10:04 choice fuck
10:04 choice ok, i sshed in. where?
10:05 jast in the repo, 'git config receive.denyCurrentBranch warn' (for example)
10:05 choice The adventures of working under time pressure...
10:05 jast note that if you do push to a repo that has a working tree, the resulting state can be confusing
10:05 * choice tries git config receive.denyCurrentBranch ignore
10:05 jast Git updates the history, but not the working tree and index
10:06 choice what?
10:06 choice Honestly?
10:06 jast well, it's not generally possible... after all, the update might conflict with local changes
10:06 jast I thought there was an option to make Git try to update the working tree but I can't find it right now
10:06 choice So pushing is a piece of crap them. I think I remember why I made a mental note to never push but always pull...
10:06 Tuor_ joined #git
10:06 choice But how do I pull from my laptop to a sever...
10:06 jast pushing works better with "bare" remote repositories, i.e. those without a working tree
10:06 rwp choice, You should only ever push to a bare repository. NEVER to a checked out working copy.
10:06 choice I don't like bare repos.
10:07 jast which is what is used in pretty much all repo hosting scenarios
10:07 stamina joined #git
10:07 choice Well... rcp to the rescue then. To hell with the remote repo!
10:07 jast if you know there are no uncommitted changes in the remote repo, you can do a 'git reset --hard' in there after you're done pushing
10:07 choice jast: Oh, that sounds good!
10:07 IRQ` joined #git
10:07 rwp 'rcp'? Wow. That is a blast from the past. I haven't used rcp in 20 years.
10:08 choice jast: "git reset --hard" *says* it did it but it did not :(
10:08 rwp 'git status' should say something useful.
10:08 jast after pushing, and inside the remote repo, right?
10:09 choice Ah, it still refuses.
10:09 choice refusing to update checked out branch
10:09 choice Maybe I have to set it locally...
10:09 choice It still refuses...
10:09 choice When software tries to be intelligent \o/
10:10 senaps joined #git
10:10 choice Did the config again on the server..
10:10 choice ..now it updated it.
10:11 choice Thank god! Thank jast!
10:13 Tuor_ joined #git
10:13 jast choice: you don't need to thank me twice :P
10:14 choice Strange, god just said the same.
10:14 Tuor_ left #git
10:14 choice Ok, gotta go. Cu!
10:15 Murii joined #git
10:17 kurkale6ka joined #git
10:17 MineCoins joined #git
10:19 Endarked joined #git
10:19 DarsVaeda joined #git
10:21 DarsVaeda hi, I do "git pull" but get "local changes would be overwritten" - how do I ignore that and let it just overwrite those files?
10:22 dminuoso DarsVaeda: git reset --hard
10:22 dminuoso !backup
10:22 gitinfo 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
10:22 dminuoso Mmm, there was another factoid for that..
10:23 DarsVaeda I don't think I want a hard reset, I don't want to lose local commits but just ignore those few files
10:23 dminuoso DarsVaeda: You cant do that. The solution is to merge.
10:23 AstralStorm joined #git
10:23 dminuoso DarsVaeda: And you just asked explicitly for those files to be overwritten
10:23 DarsVaeda yes but just these (4 in my case) not all
10:24 jast git checkout HEAD -- <those files>
10:24 kurkale6ka joined #git
10:24 jast then repeat
10:26 dminuoso DarsVaeda | I don't think I want a hard reset, I don't want to lose local commits but just ignore those few files
10:26 dminuoso DarsVaeda: Also obviously they are not commits (yet)
10:26 dminuoso :P
10:26 dsdeiz joined #git
10:26 dsdeiz joined #git
10:26 kurkale6ka joined #git
10:26 jast sure, but there *is* a difference between resetting all files vs. just those that are in the way for merging
10:27 Tobbi joined #git
10:27 peacememories joined #git
10:27 DarsVaeda jast: thanks that worked :)
10:29 xtpeeps joined #git
10:30 theoceaniscool joined #git
10:37 routingsparks joined #git
10:38 masuberu joined #git
10:40 Stace I usually do git diff --cached to see the difference between the index and HEAD. How do I do a diff between the index and the working tree?
10:41 jast just leave out the --cached, it's the default
10:41 Stace isn't that working tree and HEAD?
10:41 Stace not index?
10:41 _ikke_ no
10:41 jast no, that's 'git diff HEAD'
10:42 Stace oh, huh, I didn't know that
10:42 jast 'git diff' basically shows unstaged changes
10:42 _ikke_ if you do git add ., git diff returns nothing
10:42 jast it's documented :P
10:42 Stace jast: yeah I'm reading the documentation but didn't understand it
10:42 otiose joined #git
10:42 jast yeah, the style of some of the docs is a little... inaccessible :)
10:42 jast you can get used to it, though
10:43 fakenerd joined #git
10:44 jast .trigger_edit diff "git diff": show unstaged changes. "git diff --cached": show staged changes. "git diff HEAD": show all uncommitted changes.
10:44 gitinfo jast: Okay.
10:44 Stace heh, that's a cool bot
10:44 jast we definitely use it a lot
10:45 Stace so git diff HEAD = HEAD - index
10:45 jast now, that one compares working tree to HEAD
10:45 Stace wait, no
10:46 Stace can I just check my terminology quick?
10:46 * Stace aint so good with jargon
10:46 onlyanegg joined #git
10:46 Stace so working tree = what's in my filesystem
10:46 jast yep
10:46 Stace index == staged == the green part that's going to get committed
10:47 jast pretty much, yeah
10:47 jast and !HEAD... let's ask the bot
10:47 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
10:47 Stace HEAD = well, HEAD.
10:47 Stace it's the head of the checked out branch
10:47 jast that's not completely true
10:48 jast HEAD is what *defines* which branch is checked out
10:48 jast you can see it in your filesystem, in .git/HEAD
10:48 Stace ok. so HEAD is a pointer to a hash which is the last (most recent) commit in the currently checked out branch
10:49 jast not quite. it's a pointer to the branch (ref), which in turns points to the topmost commit in the branch
10:49 Stace in my head it's like a "snapshot" that I'm working/comparing against
10:49 Stace ok
10:49 Raging_Hog joined #git
10:49 jast and since Git automatically resolves things to a commit whenever it needs one, HEAD is basically the current topmost commit, but it's really more than that
10:50 jast yeah, that's a valid way to think of it, it just helps to be aware how HEAD actually works
10:51 Stace so HEAD points to a branch, and then that points to a commit which is the last commit in that branch?
10:51 Raging_Hog joined #git
10:51 Stace last as in most recent
10:51 jast exactly
10:52 jast except if you "detach" HEAD, it points directly to the commit (you might do that temporarily to look at something without accidentally changing it, for instance)
10:52 jast and if you make a new commit, Git updates the commit ID in HEAD... but if HEAD points to a branch, that branch is updated instead
10:52 Stace ok, so when my local master is behind the origin/master it means that the most recent commit pointer is behind?
10:52 jast yeah
10:52 Stace when it says "you are behind by x commits, pull to catch up"
10:52 jast Git basically takes the log from both branches and looks at the difference: what's not in A, what's not in B
10:53 Stace ooh, that detatched head thing makes more sense now
10:53 Stace so then HEAD points to a commit not a branch?
10:53 jast right
10:54 Stace I've never made a commit while in a detatched state
10:54 jast happens sometimes during other operations, too, e.g. rebase. rebase does everything on a detached HEAD and only updates your branch at the end (or goes back to it if you abort)
10:54 jast well, in most cases you wouldn't want to, that's why there's this big warning when you detach HEAD
10:56 Stace ok so rebase re-writes history, right? It goes back and re-applies changes to a previous base. So it takes a base commit, re-plays history onto that hash and then at the end uses the new last hash as the branch head which points to HEAD?
10:56 h12o joined #git
10:57 jast it's more accurate to say the branch is updated with what's in HEAD at the end of the rebase, but essentially yes
10:57 osse correct!
10:57 Stace its like reverting to a previous commit and then cherry picking all the subsequent commits on that and then pushing, except that that process actually keeps the history in tact
10:58 jast pretty much, yeah
10:58 jast interactive rebase, of course, does more stuff, but still the basic idea is the same
10:58 selckin joined #git
10:59 Stace I don't really have much experience with rebase because rebaseing on a remote branch is a bad idea
10:59 Stace but I do rebase on local branches occassionally
11:00 Stace wait, so jast this goes back to what you were waying earlier, in the reflog the entire old tree (re-rebase) is still there?!
11:00 Stace i mean, it's un-referenced but it's there
11:01 Stace (pre-rebase I mean)
11:01 dsdeiz joined #git
11:01 dsdeiz joined #git
11:02 jast Stace: yes
11:03 Stace wait so does it stay there forever? or does it get cleaned up?
11:03 Stace do I have in my reflog all the hashes that got de-referenced since the beginning of time?
11:04 Stace doesn't that get pretty big?
11:05 jast Git is pretty good at compressing redundancy away
11:05 jast that said, reflogs get cleaned up after some time (90 days or so, I think, it's configurable) if you run 'git gc' every now and then
11:06 dsdeiz joined #git
11:06 dsdeiz joined #git
11:06 jast which is also what will optimize your storage and improve compression
11:06 NotKyros joined #git
11:08 Stace ok. I didn't realise git was so powerful. the reflog is really useful
11:10 Bernzel joined #git
11:10 tymczenko joined #git
11:10 Cabanossi joined #git
11:12 Bernzel Hey. So I'm working for the first time in a team. And came across a git "issue" of which I'm not sure what to do with since I don't want to mess upp the master branch for everyone. Here's the git status output: https://pastebin.com/RkQ83upp
11:13 Stace uuh, git pull?
11:13 Stace what's the issue?
11:13 Bernzel Stace git pull gives me "git fatal cannot create directory at permission denied"
11:13 jackrandom joined #git
11:13 jast uhh
11:13 jast that sounds like you used multiple system accounts to work in your local git repo (e.g. your normal user and root)
11:13 jast you'll have to fix your filesystem permissions first
11:14 Bernzel jast, yes well the other guy is working on my other pc where I'm at the same github account. That's why?
11:14 Stace isn't that just a matter of chown user:user ropo_dir
11:14 Stace with a -r in there probably
11:14 jast Bernzel: no, this is about your local clone of the repository, nothing else
11:15 Bernzel jast, okey so how do I fix the permissions?
11:15 jast normally, at the top of your repo: chown -R youruser .
11:15 jast you'll probably need to do it as root
11:16 Eryn_1983_FL joined #git
11:17 zeroed joined #git
11:17 Bernzel jast, so I can't just reset the HEAD and clean my repo  to get the latest commits. I don't have anything important on my local repo that needs to be commited atm
11:18 ij If I «rebase -i» the order of two commits that don't change the same files, will git be smart enough to not actually touch the disk since the result's the same?
11:18 jast sure you can, but 'git pull' will do the update without touching your changes if possible, so it's worth a try
11:18 jast ij: the commits are still re-applied one by one in *any* rebase operation
11:18 Stace isn't this permissions issue actually in .git? I've run into something simmilar and that was in .git which meant the only way to fix was to fix permissions
11:19 Stace then I couldn't do *anything* with the repo
11:19 jast yeah, that's going to need to happen no matter what
11:20 ij jast, You mean "no, it doesn't get optmiized"?
11:20 jast ij: pretty much
11:21 ij Alright, thanks.
11:21 MarioBranco joined #git
11:21 ij It would be possible without much hassle to some point, though, right?
11:21 cstratak joined #git
11:22 jast it's much the same as with merging: technically some things can be done without getting the working tree and index involved but nobody wants to implement all the needed trickery plus I guess it would violate the principle of least surprise if merge and rebase randomly use an entirely different code path depending on what the changes look like
11:23 ij Different code path?
11:24 jast well, rebase literally works by applying the changes to the checked out files
11:24 Rodya_ joined #git
11:24 jast to optimize, you'd need to have a second mode of operation that attempts to skip that and do something entirely different
11:25 borkr joined #git
11:25 MineCoins joined #git
11:25 Stace in other words, why code in an entire different special case for this only when the normal one would work
11:26 jast yeah, that's the logic the current implementation is based on, most likely :)
11:26 ij jast, What you're saying is that it might introduce bugs where there were no bugs?
11:26 jast sure
11:26 ij right
11:26 jast and more code that needs to be maintained
11:27 ij True, a cool idea to think about though.
11:27 jast right
11:27 Stace there's always a payoff, code complexity vs functionality
11:27 jast you could implement it as a third-party tool :)
11:27 jast git exposes enough of its low-level operations that it shouldn't be too hard, though I guess it helps to be familiar with the graph structure (commits->trees->blobs)
11:28 Stace it's a matter of deciding if this one feature is worth the additional complexity and bug potential
11:28 ij Are any of you git devs?
11:28 Stace not me
11:28 jast I've made a few contributions but I wouldn't call myself a "git dev"
11:28 jast the most active developers usually aren't here
11:28 jast division of labour :)
11:29 SilverBe joined #git
11:29 senaps joined #git
11:32 seni joined #git
11:34 Stace so jast, going back to our previous discussion, does that mean that a branch is just a pointer to a specific hash?
11:34 jast in terms of implementation, yes, absolutely
11:35 senaps joined #git
11:35 Stace does that mean that the history is just a chain (or linked list) of hashes
11:36 senaps joined #git
11:36 grawity it's a graph, not necessarily a linear chain, but yes
11:37 jast that's the general idea... but merges have two (or more, in rare cases) parents, not just one, which makes it a graph instead of a list
11:37 Stace ok so a merge can cause a "node" to have multiple parents
11:38 jast that's the definition of a merge commit, in fact: more than one parent
11:38 Stace and a branch can cause a "node" to have multiple children
11:38 zeroed joined #git
11:38 zeroed joined #git
11:38 Stace my brain hurts
11:38 jast yes. but the structure has links only in one direction, so "children" can't actually easily be referenced
11:38 jast well, perhaps some pictures will help: !gcs
11:38 gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
11:39 lady_luck joined #git
11:39 Bennux joined #git
11:40 Stace ok so the linked list points backwards so each chile can have multiple parents and that's why children are hard to track
11:41 Stace so git iterates from the last commit in a branch backwards to produce the history
11:42 Stace i imagine that's what's happening when I run git log
11:43 osse you imagine correctly
11:43 Stace good to know that my imaginings are accurate
11:43 osse I can only speak for that particular one
11:43 Stace ok so this also answers my question about the difference between tags and branches
11:44 Stace a tag is a branch that doesn't move
11:45 bernd27 joined #git
11:46 Tobbi joined #git
11:46 unpleased joined #git
11:46 DolphinDream joined #git
11:47 gnixev joined #git
11:48 moritz a tag also doesn't live in a namspace under a remote
11:48 moritz with branches, you have master, origin/master etc.
11:48 Stace moritz: what's a namespace?
11:48 moritz but a tag exists just once in a repo
11:48 Stace oh, those are a namespace?
11:48 moritz you only have a v0.1, not origin/v0.1
11:48 moritz they are remotes, but they also act as namespaces for branch names
11:49 Stace that makes sense, if it doesn't move then the remote can't ever be different from the local
11:49 Chuguniy joined #git
11:49 Stace apart from initially pushing the tag
11:49 Stace if they can't be out of sync then no need to distinguish between remote and local
11:49 moritz though that bit me once
11:50 moritz I made a release where I had an error in the tag name
11:50 moritz that was a project that did monthly releases
11:50 moritz so instead of releasing 2014.06, I accidentally named the tag 2016.04
11:50 moritz when I realized it, I deleted the wrong tag
11:51 moritz but people still got a nasty surprise when 2016.04 came around
11:51 Stace talk about makind trouble for yourself 2 years into the future
11:51 moritz because many still had the wrong tag locally, and when they checked it out, they had an ancient version :-)
11:51 Stace that's also a wtf error to debug
11:52 moritz aye
11:52 moritz (by now we have mostly automated the release process, so that won't happen again any time soon)
11:52 Stace good illustration of why understanding what's going on is so much more useful than just knowing how to do tags
11:52 moritz aye
11:52 Stace because the one causes wtf when you see the bug
11:53 Stace and the other is hold on...
11:53 davimore_ joined #git
11:54 kristofferR joined #git
11:55 Stace so howcome when I go git reset HEAD file it preserves my working copy?
11:55 Stace is that just git being nice?
11:56 guampa joined #git
11:56 Stace surely resetting to HEAD should actually reset to head and not working copy?
11:56 jast Stace: 'git reset' doesn't touch the working tree unless you add --hard
11:56 jast !reset
11:56 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
11:56 Stace ok I'm misunderstanding what reset does then
11:57 jast ... many things :)
11:57 Stace I suppose I was treating it somewhat like checkout... "make this file look like THAT"
11:57 moritz git reset (--hard|--mixed|--soft) <COMMIT> moves the current branch to <COMMIT>
11:58 roby10 joined #git
11:58 moritz and then the options --hard, --mixed and --soft decide what happens with the index and the working copy
11:58 jast the whole thing defaults to --mixed and HEAD, so by default all it does is unstage all changes
11:58 moritz --hard: sets working copy and index to <COMMIT> also
11:59 moritz --soft: leave working and index alone
11:59 Stace ok. In my head I have a forward process (add, commit) and a backward process (reset HEAD~1 --soft, reset HEAD, checkout)
11:59 intellix joined #git
11:59 Spydar007 joined #git
11:59 Spydar007 joined #git
12:00 Stace but those are more "this command gives this result" rather than understanding what reset does
12:00 Stace I'll read up on it for a bit
12:01 bernd9000 joined #git
12:01 moritz and the sequence reset HEAD~1 --soft, reset HEAD, checkout .   is the same as git reset --hard HEAD~1
12:01 Stace moritz: yeah you're right. I like the control of doing it because I could keep some files along the way
12:02 Stace I do use --hard occassionally when I'm feeling particularly brave
12:02 moritz Stace: I think you have a solid understanding of git's concepts, now you just need to manage not to get confused
12:02 moritz (which I still struggle with at times :-)
12:02 boombatower joined #git
12:03 Stace will do. Thanks for your advice, jast and moritz . Thunderstorm coming this way so I need to get my pc off
12:03 synthroid joined #git
12:03 Acerific joined #git
12:03 Acerific joined #git
12:04 s17 is your pc outside
12:04 bernd27 joined #git
12:07 synthmeat joined #git
12:13 intellix joined #git
12:18 wget joined #git
12:20 wget joined #git
12:20 wget joined #git
12:21 Guest4561 joined #git
12:22 Guest4561 left #git
12:23 otiose joined #git
12:24 dviola joined #git
12:24 thiago joined #git
12:24 dviola how do I show everything that changed (stats) between a period of time?
12:25 osse step 1. find the relevant commits.  step 2. diff them
12:25 grawity git log --stat; git diff --stat a..b
12:25 Rodya_ joined #git
12:25 digidog joined #git
12:26 dviola thanks
12:29 fakenerd joined #git
12:32 osse dviola: something like git rev-list --since='your time here' | tail -1
12:33 jost joined #git
12:37 jackrandom joined #git
12:37 gugah joined #git
12:38 NeXTSUN joined #git
12:39 dviola great, thank you
12:39 dviola the diff --stat is good enough for me
12:40 dviola I already knew about this btw, but someone else asked me if it was possible to diff --stat by dates instead, I had no idea
12:40 dviola it doesn't also make that much sense anyway
12:43 seni joined #git
12:45 diego2 joined #git
12:46 diego2 joined #git
12:47 onlyanegg joined #git
12:47 h12o joined #git
12:48 perlpilot joined #git
12:49 wget joined #git
12:50 Bennux joined #git
12:53 dootele joined #git
12:54 jeffreylevesque joined #git
12:54 elsevero joined #git
12:55 telephone joined #git
12:55 telephone joined #git
12:55 Hink joined #git
12:58 vuoto joined #git
12:58 dvaske joined #git
12:59 reynierpm joined #git
13:00 tonyj joined #git
13:00 reynierpm hello there, I have a tracked folder in the repository and I have added it to the .gitignore file, I want to delete it from remote but keep it locally how do I achieve this?
13:00 marcogmonteiro joined #git
13:00 grawity `git rm -r --cached`, then commit
13:01 grawity note that it *will* be deleted from everybody else's repos
13:03 mkalfon_ joined #git
13:03 reynierpm grawity, thx that's exactly what I want
13:04 reynierpm grawity, do I need to add the folder I want to delete?
13:06 grawity you said it's already tracked
13:06 reynierpm yes, I find it
13:06 reynierpm I need to add the path after the command you give me
13:08 diego3 joined #git
13:09 bitmod joined #git
13:09 bitmod joined #git
13:10 reynierpm grawity, thanks
13:11 dave0x6d joined #git
13:12 peacememories joined #git
13:13 Hink joined #git
13:17 oskarkv joined #git
13:22 diego3 joined #git
13:23 theoceaniscool joined #git
13:23 cdg joined #git
13:24 zerow joined #git
13:26 MarioBranco joined #git
13:26 Rodya_ joined #git
13:26 peacememories joined #git
13:26 relipse__ joined #git
13:28 Naan joined #git
13:28 p4trix joined #git
13:29 _Stumbler joined #git
13:29 p4trix I have commits A-temp-C, I want to "squash" temp and C together leaving only like A-C
13:30 p4trix Im having trouble using the rebase -i
13:30 cstratak joined #git
13:30 osse p4trix: squash C into temp
13:30 osse Then edit the message to be the same as C's was'
13:30 p4trix osse, so I pick C and squash temp right?
13:30 osse other way around
13:31 osse or:  leave them in whatever order they already are in. mark the last of the two 'squash', whichever that is.
13:31 osse Which seems to be C.
13:31 cjohnson Just to confirm, if I see a bunch of untracked files that I want to delete, but I don't want git to touch any of the ignored files
13:31 cjohnson git clean -df
13:32 p4trix Thx osse
13:32 osse cjohnson: that's why gaben invented -n.
13:32 osse so you can switch -n with -f when you're happy
13:33 notebox joined #git
13:33 cjohnson all hail
13:33 osse cjohnson: but to answer your question: "I think so, yes".
13:33 cjohnson well I got impatient and ran it anyway and it was a no
13:33 cjohnson it deleted some files I didn't want it to
13:33 cjohnson so now I get to fix that lol
13:33 cjohnson but good to know going forward
13:34 tonyj joined #git
13:34 osse in that case either you or i misunderstand the docs. or you misunderstand what happened. or the docs are wrong.
13:34 osse or we're both lunatics and/or this is a dream/simulation
13:34 chardan_ joined #git
13:34 * osse pinches arm
13:34 cjohnson I did a git status, it listed some files as untracked, then I did git clean -df, and the list of files it deleted included more than just that list of untracked files
13:35 osse status sometimes list whole directories instead of each file within. maybe that happened?
13:35 cjohnson let me double check, good call
13:36 cjohnson nerp that wasn't it
13:36 cjohnson https://i.imgur.com/IBmf1sS.png
13:36 cjohnson the thing in question is the Plugin dir
13:36 cjohnson fortunately it was just a vendor files dir installed from composer so easy recovery
13:36 cjohnson I have plugin ignored though
13:37 cjohnson I'm doing an interview thing though so I need to not focus on this issue now, I got it repaired. But if you can spot why it deleted Plugin let me know. I am scared of git clean now
13:38 cjohnson lol
13:38 Impaloo joined #git
13:38 yanome joined #git
13:39 diego2 joined #git
13:39 diego2 joined #git
13:41 chardan_ joined #git
13:42 darkbit joined #git
13:42 delboy1978uk joined #git
13:43 delboy1978uk how do you get the long commit hash? log is giving me the short version#
13:44 cdg_ joined #git
13:44 lb1c delboy1978uk: man git log https://git-scm.com/docs/git-log#git-log---no-abbrev-commit
13:44 gitinfo delboy1978uk: the git-log manpage is available at https://gitirc.eu/git-log.html
13:44 AndrewAlexMac joined #git
13:45 delboy1978uk thanks lb1c
13:45 delboy1978uk is gitinfo a bot?
13:45 bremner yes
13:45 delboy1978uk ok cheers
13:45 _ikke_ !botsnack
13:45 gitinfo Om nom nom
13:45 lb1c o/
13:46 bitmod joined #git
13:47 Tobbi joined #git
13:47 aw1 joined #git
13:47 Dougie187 joined #git
13:47 kurkale6ka joined #git
13:48 osse cjohnson: is Plugins a git repo ?
13:48 onlyanegg joined #git
13:48 osse no never mind
13:48 osse cjohnson: seems like you ignore Plugin somewhere.
13:49 cdg joined #git
13:49 osse cjohnson: git check-ignore -v Plugin/somefile
13:50 cdg_ joined #git
13:50 hashpuppy joined #git
13:51 hashpuppy i have `signkey = ...` in my `[user]`.  when I do git -S -m "Message", it commits, but I don't see anything signed nor do i see any errors.  any ideas?
13:54 borkr joined #git
13:55 Cabanossi joined #git
13:55 Gsham joined #git
13:56 osse hashpuppy: "signkey" isn't mentioned in man-gitconfig.
13:56 AaronMT joined #git
13:56 osse hashpuppy: do you mean signingKey ?
13:56 lb1c hashpuppy: user.signingkey might be the config key you're looking for
13:56 zerow joined #git
13:57 grawity are you checking with 'git log --show-signatures'?
13:57 rmesta joined #git
13:57 LordRyan joined #git
13:58 hashpuppy lol.  no.  fuck.  i thought would show there by default.  i also checked `git show`
13:58 deepakbn[m] joined #git
13:59 cstratak joined #git
13:59 mkalfon_ joined #git
14:00 mostlybadfly joined #git
14:00 gituser joined #git
14:01 rmesta joined #git
14:01 rmesta joined #git
14:02 rmesta joined #git
14:03 shinnya joined #git
14:03 rmesta joined #git
14:04 Cavallari joined #git
14:05 peepsalot joined #git
14:06 cjohnson osse: correct, I am intentionally ignoring Plugin
14:08 timini joined #git
14:08 osse cjohnson: was it empty at the time?
14:09 solars joined #git
14:09 a_thakur joined #git
14:09 timini hey is there anyway to "merge" a file in git?
14:10 _ikke_ timini: No, not just a single file
14:10 HoierM joined #git
14:10 timini I basicall have a support branch and i want to just copy the contents of a file from another branch
14:10 osse cjohnson: trying to reproduce but it works as expected here.
14:10 solars I've got a problem: I was working on something, then all of a sudden, without doing git reset or anything, the changes were gone. had 20 unstaged changes, now 1 - all the deleted files are there again with a timestamp of when it happened, and new files are still there as unchanged - any idea what could have caused this, and is there any way I could rescue something?
14:10 timini but would be cool if git could treat it like a merge
14:11 timini so i could do a 3 way merge on the file
14:11 osse timini: git merge-file
14:11 dvaske joined #git
14:11 osse but it's a bit inconvenient
14:11 timini solars, might be your eritor?
14:11 timini ohh nice thanks osse
14:12 lektrik joined #git
14:12 VA3VNA joined #git
14:12 IanLiu joined #git
14:12 solars timini: it could be vim related - but I'm not sure how, I saved the files before and reopened vim
14:13 solars is there any way to get this back?
14:14 IanLiu I have 2 remotes, A and B. I don't have local branches. How can I push all branches from B to A? Do I need to checkout each B branch locally, and then pull to A?
14:15 timini git pull --all B; git push --all A
14:15 timini ? maybe
14:15 timini (im a noob in git years)
14:15 doMynation joined #git
14:16 IanLiu I was trying the solution given on this post, without success: http://stackoverflow.com/questions/7818927/git-push-branch-from-one-remote-to-another
14:17 cjohnson osse: It was not empty, it had a composer-installed dependency
14:17 Emperor_Earth joined #git
14:17 osse IanLiu: git fetch A; git push B 'refs/remotes/A/*:refs/heads/*'
14:17 roelmonnens joined #git
14:18 osse oops
14:18 theoceaniscool joined #git
14:18 osse IanLiu: git fetch B; git push A 'refs/remotes/B/*:refs/heads/*'
14:19 cjohnson that's how I knew it screwed up because my app immediately threw up about the missing dep afterward
14:19 MineCoins joined #git
14:19 cjohnson I'm not too worried about it, I can putz later
14:19 osse cjohnson: git version?
14:22 cjohnson 2.9.2
14:22 a_thakur joined #git
14:22 IanLiu osse: thank you, that worked!
14:23 ignatiz- joined #git
14:24 osse cjohnson: lot of commits affecting git-clean since then
14:24 osse but I can't find any bug fixes
14:25 osse cjohnson: never mind! I wrote 'git log v2.9.2' instead of 'git log v2.9.2..' lol
14:26 osse IanLiu: de nada. it's the second answer on SO btw :p
14:26 Rodya_ joined #git
14:28 lewix joined #git
14:28 lektrik joined #git
14:29 doMynation joined #git
14:31 cjohnson osse: any bug fixes in your updated log?
14:31 hashpuppy i'm looking at this https://mikegerwitz.com/papers/git-horror-story.  with GitHub supporting GPG key uploads, can we just force users to sign their own commits and just merge anything pull request where all commits have been verified?  or do we still need to review each individual commit for malicious code?
14:31 cjohnson my first git bug!!! it's an exciting day
14:31 _ikke_ cjohnson: The question is, can we reproduce it
14:32 al-damiri joined #git
14:32 cjohnson ha
14:33 _ikke_ hashpuppy: gpg verification only verifies that the code was signed by a person, it says nothing on the contents
14:33 cjohnson I just ran git clean -df again with a clean working tree, it deleted Plugin again
14:33 osse cjohnson: none
14:33 cjohnson poo
14:33 cjohnson OH, maybe this is it
14:33 cjohnson I actually ignored /Plugin/DebugKit/
14:33 cjohnson which is the only thing in there
14:34 cjohnson still, seems like git clean should be smart enough not to delete the parent folder if no untracked files in child
14:34 cjohnson or is my ignore just wrong?
14:34 osse is that directory itself empty?
14:34 cjohnson https://i.imgur.com/7P3V5IT.png
14:35 osse what does 'git check-ignore -v Plugin' say
14:35 zivester joined #git
14:35 cjohnson no output
14:35 osse and  'git check-ignore -v Plugin/' just in case
14:35 meadmoon joined #git
14:35 cjohnson https://i.imgur.com/k2qlUmH.png
14:36 delboy1978uk left #git
14:37 osse and clean -df removea all of Plugin/ ?
14:37 cjohnson correct, the entire Plugin dir is remove including the dir itself
14:37 osse and -dn says it would be removed?
14:38 Suigetsu joined #git
14:38 cjohnson Would remove Plugin/
14:38 ShapeShifter499 joined #git
14:38 Seveas because plugin is not tracked.
14:38 Seveas ignore rules deeper than Plugin/ don't apply
14:39 osse huh
14:39 osse cjohnson: what if you remove -d
14:39 osse jsut clean -n
14:39 cjohnson no output
14:39 cjohnson So what should I do here? I want the option to keep other things I add to Plugin, I just don't want to track DebugKit
14:39 cjohnson prefer not to ignore Plugin and git add -f because I will forget
14:40 Seveas add a .gitignore to Plugin/ with 'DebugKit' as content. Then track that file.
14:40 cjohnson oh nice I forgot you could have multiple .gitignore
14:40 cjohnson thanks Seveas
14:40 osse praise Seveas, lord and saviou?r
14:40 cjohnson Still... is this correct behavior? Really seems like git clean -df should roughly match the list git status reports for untracked / modified files
14:41 Suigetsu Hi. I was looking for some good code quality analyser tools and came across Codacy. I currently have a git repo set up on one of my servers which is in a VPN not exposed to the outside world. So, would it be possible for me to use Codacy in some way to analyse this code base?
14:41 osse cjohnson: to the !list !
14:41 gitinfo cjohnson: [!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://public-inbox.org/git
14:41 Seveas cjohnson: and it does. Status will also say Plugin/ is untracked and not even look at Plugin/DebugKit/
14:41 govg joined #git
14:42 cjohnson Seveas: check my screenshots, it didn't report Plugin in the git status at all
14:42 cjohnson osse: I'll make a note to follow up on that tomorrow
14:42 Seveas hmm
14:42 Seveas hmm.
14:42 cjohnson yeah ha that's why I was confused that it blew it away
14:42 cjohnson seems either status or clean behavior should be tweaked here
14:42 SantaClauze joined #git
14:42 Seveas that means it notices s that you ignore Plugin/DebugKit
14:42 Seveas leaving Plugin/ "empty"
14:42 Seveas so status and clean don't match behaviours
14:43 Seveas odd.
14:44 Seveas yeah, and I can easily reproduce that here
14:45 Seveas Smells faintly buggy indeed
14:46 jimmyrcom joined #git
14:46 cjohnson my first bug!!! I'd like to thank all the little people who helped me get here
14:46 cjohnson mom, you really played a big hand in this
14:46 Endarked joined #git
14:46 cjohnson dad, I wish you stuck around
14:46 osse "little people"? that's racist!
14:47 cjohnson lol
14:47 cjohnson so I've got a note to follow up on this tomorrow but where should I submit
14:47 cjohnson mailing list, or an issue tracker
14:49 User458764 joined #git
14:51 osse cjohnson: since one of them doesn't exist, the other!
14:52 cjohnson ha
14:52 cjohnson awesome, thanks for the help folks
14:52 cjohnson glad I'm not crazy
14:52 osse s/racist/heightist/
14:53 kristofferR joined #git
14:54 diego3 joined #git
14:54 tymczenko joined #git
14:54 Acerific joined #git
14:56 Dougie187 left #git
14:56 h12o joined #git
14:57 sz0 joined #git
14:58 chipotle joined #git
14:58 NeverDie joined #git
14:59 alexandre9099 joined #git
15:00 Nerbrun joined #git
15:02 ivanruizmonjo__ joined #git
15:03 ZexaronS Helli
15:03 Gsham joined #git
15:03 theoceaniscool joined #git
15:03 ZexaronS Why doesn't git make confirmation when addind files
15:03 grawity because you're already explicitly telling it to do that twice
15:04 grawity once when you `git add`, and again when you commit
15:04 ZexaronS like if something is successful, there's no message in CLI, it just goes to the next input
15:04 grawity ...that's perfectly normal for CLI tools, I'd say
15:04 ZexaronS Simple printf "ok" ... but okay I'm new, in my situation it would help a bit, easly get confused
15:05 xall joined #git
15:05 roelmonn_ joined #git
15:05 ZexaronS This is a minor one, there's another one, I typed git rm "oldfile" and that file didn't exist anymore, it just repeated the filename and didn't say anything what it did, then someone told me he made a mistake, that's not for renamed files, that's for files that still exist
15:06 ZexaronS in that case the CLI could tell it didn't found any file or didn't do anything
15:06 dstolfa joined #git
15:07 perlpilot joined #git
15:07 cjohnson ZexaronS: in terminal, no response means success
15:07 _ikke_ "fatal: pathspec 'foo' did not match any files:
15:07 cjohnson that is an old convention
15:08 dstolfa Hello, is there a git command to revert a certain commit(or undo the diff that was applied)? The commit is inbetween the commits I want, so I don't want to reset, I just want to take a diff from a given commit from a given point and undo it's changes
15:08 dreiss joined #git
15:08 grawity dstolfa: `git revert <id>`
15:08 dstolfa grawity: Well that's pretty self evident. Should have read the man page first lol, thanks
15:09 cjohnson lol
15:09 ojdo joined #git
15:09 diego3 joined #git
15:11 gunnaro joined #git
15:13 overlord_tm joined #git
15:13 NeverDie joined #git
15:13 rasto joined #git
15:13 cstratak joined #git
15:15 a_thakur joined #git
15:16 cstratak joined #git
15:16 zhodge joined #git
15:17 publio joined #git
15:19 Gustavo6046 joined #git
15:21 borkr joined #git
15:22 TheSimonator joined #git
15:23 JoelJoel joined #git
15:23 h12o joined #git
15:23 rmesta joined #git
15:24 JoelJoel left #git
15:24 Joel joined #git
15:24 Joel Any way to make 'git diff' do the same thing 'git difftool' does?
15:25 osse no
15:25 osse but you can make an alias 'dt' for difftool
15:25 Cabanossi joined #git
15:25 osse if typing is the issue
15:26 mekhami joined #git
15:26 dreiss joined #git
15:26 mekhami someone help me understand something. on my laptop i created a new branch foo off of stage
15:26 mekhami i made some changes, pushed foo up to the repository
15:26 mekhami i got on my desktop, git pulled, and tried to check out this new branch
15:26 mekhami but when i do, i end up in a detached head state
15:26 Vgr joined #git
15:27 osse don't checkout origin/foo. checkout a new branch named 'foo' that's initially equal to origin/foo
15:27 Rodya_ joined #git
15:27 osse 'git checkout foo' alone should do this automagically. if not:  git checkout -b foo origin/foo
15:28 mekhami ah i guess my tab-completion put the origin in front and that messed it up
15:28 osse been there, done that
15:28 osse declined the overpriced t-shirt
15:28 navidr joined #git
15:29 gugah_ joined #git
15:31 marianina8 joined #git
15:31 marianina8 joined #git
15:32 YuGiOhJCJ joined #git
15:34 Joel osse thanks
15:36 brent__ joined #git
15:36 Darcidride joined #git
15:40 SoRoot joined #git
15:40 Darren_ joined #git
15:41 NeverDie joined #git
15:42 orbyt_ joined #git
15:44 NeverDie joined #git
15:45 synthroid joined #git
15:47 TheSimonator joined #git
15:50 Minty__ joined #git
15:50 justin1 joined #git
15:50 Minty__ git desktop for windows doesn't automatically seem to be checking in empty directories
15:50 Minty__ how can i make it do this
15:50 NeXTSUN joined #git
15:50 TheSimonator joined #git
15:50 selckin git only tracks files
15:50 Minty__ i have 1 folder that i want to be under source control and within my project even though i deliberately exclude the files within it
15:51 grawity Minty__: git won't "check in" empty directories no matter what you do
15:51 Minty__ :(
15:51 theiostream joined #git
15:51 Minty__ i guess i should just dump a placeholder file in the dir then
15:51 grawity Minty__: if you want it to be in the repo, create something like a .empty or .keep file in it
15:53 Introoter joined #git
15:53 kristofferR joined #git
15:54 Raging_Hog joined #git
15:54 xall joined #git
15:55 NeverDie joined #git
15:56 pwnz0r joined #git
15:57 mekhami left #git
15:57 njs126 joined #git
15:58 svm_invictvs joined #git
15:58 timini joined #git
16:00 b1tchcakes joined #git
16:01 tymczenko joined #git
16:03 rasto joined #git
16:03 Nilesh_ joined #git
16:04 Ryanar joined #git
16:07 kristofferR joined #git
16:08 durham joined #git
16:08 madewokherd joined #git
16:10 onlyanegg joined #git
16:10 durham joined #git
16:18 marianina8 joined #git
16:20 adac joined #git
16:21 mdw joined #git
16:21 shgysk8zer0 joined #git
16:22 Rodya_ joined #git
16:22 gnixev joined #git
16:23 King_Hual joined #git
16:23 King_Hual joined #git
16:23 synthroi_ joined #git
16:25 cdg joined #git
16:27 mdw joined #git
16:28 mdw joined #git
16:28 MineCoins joined #git
16:31 yueia joined #git
16:31 Ryanar joined #git
16:32 svm_invictvs joined #git
16:36 perlpilot joined #git
16:37 freddy__ joined #git
16:37 manuelschneid3r joined #git
16:38 Sargun joined #git
16:38 Sargun Is there a way to create a new branch without switching to it, and cherry-pick into that branch
16:39 _ikke_ the former, yes, the latter, no
16:39 DeltaHeavy joined #git
16:40 DeltaHeavy When rebasing a feature branch onto a new sprint's branch, when I make my PR I see my commits are duplicated. Is there something I'm doing wrong or some way I can resolve this?
16:40 osse Sargun: in case it helps, you can do the work in a new worktree. that way you don't disturb your current files in any way
16:42 Endarked joined #git
16:42 a_thakur joined #git
16:43 _ikke_ DeltaHeavy: Where do you see the commits duplicated?
16:44 DeltaHeavy _ikke_ In the commits list on GitHub's PR page
16:44 roelmonnens joined #git
16:45 Impaloo joined #git
16:46 chipotle joined #git
16:46 dstolfa left #git
16:47 osse DeltaHeavy: you most likely rebased, then pull
16:47 osse ed
16:47 osse merging your edited history with your own original
16:47 DeltaHeavy osse I don't want to do that?
16:47 osse no
16:48 osse if you rebase, you most likely want to forcefully push
16:48 DeltaHeavy So it'd look something like: git rebase <branch> && git push -f
16:48 DeltaHeavy Or no?
16:48 Muzer joined #git
16:49 osse too vague to give a definite answer
16:49 DeltaHeavy For the most basic of cases assuming there were no conflicts?
16:49 osse if this hadn't happened in the first place, something like that yet
16:49 roelmonnens joined #git
16:49 osse yes
16:50 DeltaHeavy If there were some very typical conflicts, would it most likely be the same?
16:50 dviola joined #git
16:50 DeltaHeavy push -f feels like mad danger @_@
16:51 osse if you are pushing to a branch others push to it is often mad danger
16:51 osse if you push to a branch that you've submitted a PR from it's probably the right thing
16:51 osse not sure what conflicts have to do with it
16:52 roelmonnens joined #git
16:52 Impaloo joined #git
16:53 osse DeltaHeavy: if the goal you want to achieve is the same as would have been the case if you didn't already push then push -f is likely to be what you want
16:54 tyreld joined #git
16:54 DeltaHeavy Awesome, thanks!
16:55 osse use --force-with-lease to be extra safe
16:55 roelmonnens joined #git
16:55 osse note that now this alone won't solve the "duplicate commits" problem.
16:55 wvmstr joined #git
16:56 Cavallari joined #git
16:57 nixjdm joined #git
16:59 shgysk8zer0 joined #git
16:59 kristofferR joined #git
17:01 mariusm joined #git
17:01 roelmonnens joined #git
17:01 jrm joined #git
17:02 mariusm left #git
17:04 wvmstr using visualstudio.com as my remote repo is this the right place?
17:04 rastos2 joined #git
17:05 dsdeiz joined #git
17:05 raynold joined #git
17:06 cdg_ joined #git
17:06 Random832 wvmstr, that probably depends on your question, just like github, some questions are specific to the hosting service, some are generic (or mostly generic) git questions.
17:07 sunri5e joined #git
17:07 osse joined #git
17:08 MrLawrence joined #git
17:08 bsanford joined #git
17:09 Ryanar joined #git
17:09 wvmstr random832, trying the command line to get stuff done, but it won't accept my username, personal access token
17:10 Random832 wvmstr, that'd be in the realm of "hosting service specific" questions. for example, github makes you use the username "git" and a ssh key, with the public key installed in your account
17:11 wvmstr random832, I have tens of incoming commits and tens of outgoing, VS2017 plug does not tell me why it won't sync, just that it failed with a fatal error
17:11 wvmstr random832, are there command line options to find out why it won sync?
17:11 ResidentBiscuit joined #git
17:12 Random832 did you set up https://www.visualstudio.com/en-us/docs/git/set-up-credential-managers
17:12 tarkus joined #git
17:13 cdg joined #git
17:13 wvmstr random832, am doing that now.
17:14 Random832 see also http://stackoverflow.com/questions/21808341/unable-to-authenticate-with-git-bash-to-visual-studio-team-services
17:14 Random832 and other than that i don't know how to help you, i have never used visualstudio.com
17:15 sea-gull joined #git
17:16 MaxLeiter joined #git
17:17 mikecmpbll joined #git
17:17 MaxLeiter im working on fixing conflicts, ran `git rebase upstream/master`, fixed conflicts, git added, now git status reports conflicts finished and to run `git rebase --continue`, but rebase --continue reports no changes
17:17 MaxLeiter any ideas?
17:18 osse MaxLeiter: then the result of solving the conflicts makes the commit do nothing. try git rebase --skip
17:18 MaxLeiter oh, gotcha
17:18 _ikke_ It should normally report that however
17:19 overlord_tm joined #git
17:21 Raging_Hog joined #git
17:21 notebox joined #git
17:22 sbulage joined #git
17:25 Darren_ joined #git
17:25 thiago joined #git
17:26 mel00010 joined #git
17:26 theiostream joined #git
17:27 AaronMT joined #git
17:28 ankit01ojha joined #git
17:30 cdown joined #git
17:34 marianina8 joined #git
17:34 gopar joined #git
17:35 ploop joined #git
17:36 plasticle joined #git
17:36 tymczenko joined #git
17:37 joshszep joined #git
17:37 NeverDie joined #git
17:37 rubenb joined #git
17:38 Vampire0_ joined #git
17:38 joshszep joined #git
17:39 XenophonF joined #git
17:39 joshszep joined #git
17:40 doMynation joined #git
17:42 malt3 joined #git
17:45 nowhereman joined #git
17:45 freddy__ joined #git
17:50 kpease joined #git
17:51 mjuszczak joined #git
17:51 jackrandom joined #git
17:51 Atm0spher1c joined #git
17:53 MarioBranco joined #git
17:53 synthroid joined #git
17:54 hobodave joined #git
17:55 Bolp joined #git
17:56 tnecniv joined #git
17:56 Es0teric joined #git
17:57 ave_ joined #git
17:57 theiostream joined #git
17:58 Motoko joined #git
17:58 darkbit joined #git
17:59 mjuszczak joined #git
18:00 xall joined #git
18:01 fatalhalt joined #git
18:01 dglambert joined #git
18:01 dglambert yo
18:02 chrisgeorge joined #git
18:03 sea-gull joined #git
18:03 bjblaz joined #git
18:05 math-alpha joined #git
18:06 osse _ikke_: For å while I thought it didn't. But it does!
18:06 osse But it's in the second paragraph
18:07 gnixev joined #git
18:07 bjblaz i have a file that's been modified, but "git status" won't show it as such
18:08 bjblaz git update-index --really-refresh doesn't seem to help
18:08 bjblaz nor git add -f
18:08 cdg joined #git
18:08 bjblaz it's not ignored, according to git check-ignore
18:09 kpease joined #git
18:09 bjblaz any ideas on how to troubleshoot this?
18:09 kadoban Have you used --assume-unchanged or other such insanity?
18:09 bjblaz no, i haven't done anything weird
18:09 bjblaz i'm not new to git by any means, and this is the first time something like this has happened
18:09 relipse__ joined #git
18:10 kadoban Are you sure you're changing the file you think you're changing, and haven't already commited or something? I've done stuff like that before.
18:10 bjblaz oddly, i had a coworker who encountered the same problem with the same file a while back
18:10 bjblaz i wrote it off as something weird with his system or something he did
18:10 bjblaz but now here i am...
18:11 zeroed joined #git
18:11 osse No warranty, but sometimes I do rm .git/index; git reset
18:12 osse update-index confuses me to no end, so I end up nuking it
18:12 robattila256 joined #git
18:13 bjblaz recloning the repo will fix it fine, but i was hoping there were people here who would actually know how to debug this
18:13 mel00010 joined #git
18:13 bjblaz it's unfortunately not a repo i can share, so not sure how productive sending this to a mailing list would be
18:13 _ikke_ no need to reclone
18:13 _ikke_ !rmrf
18:13 gitinfo [!startover] There’s usually no need to start over / rm -rf everything and reclone or so.  Most situations can be fixed by other means.
18:13 osse Can you prove it has changed? If you eg 'cat file'
18:14 re1 joined #git
18:14 bjblaz yep
18:14 _ikke_ what OS?
18:14 bjblaz git show HEAD:./default.json and cat default.json show very different things
18:14 osse diff -U3 <(git show HEAD:file) file
18:14 bjblaz ubuntu 16.04
18:15 osse git log -- default.json
18:15 perlpilot joined #git
18:15 _ikke_ touch default.json
18:15 bjblaz tried all of that
18:15 osse !repro
18:15 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:15 bjblaz coworker was on a mac, btw
18:15 _ikke_ git ls-files -v default.json
18:16 chrisgeorge joined #git
18:16 bjblaz h default.json
18:16 _ikke_ so assume-unchanged is set
18:16 bjblaz running 2.11.0 btw
18:16 _ikke_ (small letters means assume-unchanged)
18:17 nevodka joined #git
18:17 bjblaz ok, not that i ever use that
18:17 _ikke_ git update-index --no-assume-unchanged default.json
18:17 _ikke_ Nothing in git itself sets it
18:17 bjblaz shows as modified now
18:18 Murii joined #git
18:20 _ikke_ There you go
18:20 Sasazuka joined #git
18:21 osse bjblaz: Do you have any script yoy run from time to time as part of your workflow?
18:21 bjblaz ugh, these fuckers
18:21 bjblaz yeah i just grepped everything for assume-unchanged
18:21 astrofog joined #git
18:21 bjblaz they have something that runs git update-index --assume-unchanged on that file
18:21 _ikke_ ugh
18:21 kadoban Ugh
18:21 osse Awesome
18:22 bjblaz umm yeah
18:22 bjblaz sorry i wasted everyone's time
18:22 _ikke_ please slap them
18:22 osse !assume_unchanged | mail -s 'Stop it' team@company.com
18:22 gitinfo git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
18:22 _ikke_ :D
18:22 onlyanegg joined #git
18:23 chrisgeorge joined #git
18:24 kadoban bjblaz: Yeah, that's ... really never a good idea as far as I know. Considering the filename, it sounds like they're using it for !config if that gives some ideas how to do it better
18:24 gitinfo bjblaz: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
18:24 cbreak joined #git
18:24 kadoban maybe ... maybe it's something else, I dunno
18:25 bjblaz i think they just want people not to check in updates to that file
18:25 osse Some men just want to watch the world burn
18:25 bjblaz that just seems like...not the way to do it
18:25 bjblaz it is a config file, though
18:25 cebula joined #git
18:25 kadoban Ah, if they just don't want anyone to be able to change it, maybe a hook, either client or server side.
18:26 _ikke_ git show :default.json >default.template.json; git rm --cached default.json; git add default.template.json; echo default.json >>.gitignore; git commit -m "Remove default.json which should not be tracked"
18:26 osse _ikke_+=1
18:27 ok91 joined #git
18:27 RxMcDonald joined #git
18:28 RxMcDonald Hello, how do you turn the last commit to a new branch?
18:28 preaction RxMcDonald: git branch <newbranch>; and then git reset to fix the previous branch
18:28 _ikke_ git branch <new_branch>; git reset --keep HEAD~
18:30 AbleBacon_ joined #git
18:30 RxMcDonald nvm
18:30 RxMcDonald k
18:32 TheSimonator joined #git
18:34 freimatz joined #git
18:35 Discovery joined #git
18:36 Dougie187 joined #git
18:38 cdg_ joined #git
18:38 HElephant joined #git
18:39 MattMaker joined #git
18:39 Acerific joined #git
18:39 Acerific joined #git
18:41 nixjdm joined #git
18:43 lmatteis joined #git
18:43 leeN joined #git
18:48 nickel_dime_look joined #git
18:50 mjuszczak joined #git
18:50 d3m3tr10 joined #git
18:52 onlyanegg joined #git
18:52 lewix joined #git
18:53 diogenese joined #git
18:54 d3m3tr10 left #git
18:54 fatalhalt joined #git
18:55 Cabanossi joined #git
18:56 alburaq joined #git
18:56 alburaq git pull couldn't unlink cause permission denied. how to fix this problem?
18:56 _ikke_ alburaq: os?
18:56 Tobbi joined #git
18:57 alburaq linux
18:57 _ikke_ alburaq: check the permissions on the file that could not be unlinked
18:57 alburaq i'll. but how can i then re pull again?
18:58 alburaq when i git pull again it says 'up to date already'
18:58 MaxLeiter left #git
18:58 plasticle joined #git
18:58 zeroed joined #git
18:59 _ikke_ alburaq: pull = fetch + merge (or rebase). the fetch part is already done, now only thing left is the merge (or rebase)
18:59 _ikke_ alburaq: what does git status say?
19:00 pengohi joined #git
19:01 alburaq it shows some new files, cause it didn't apply the file rename, so now i have two files
19:01 borkr joined #git
19:02 _ikke_ Does it show a merge in progress?
19:02 cagomez joined #git
19:02 alburaq no
19:05 dviola joined #git
19:08 mjuszczak joined #git
19:08 synthroi_ joined #git
19:08 sea-gull joined #git
19:09 alburaq _ikke_: basically i had some directories that had to be deleted, but git couldn't due to permission problem
19:11 shgysk8zer0 joined #git
19:12 Rodya_ joined #git
19:13 alburaq _ikke_: i'm considering to nuke it. delete entire repo locally, then git clone it :D
19:13 alburaq is there anything wiser? i would like to learn it, cause one day i may not have this liberty
19:13 _ikke_ alburaq: Are there any uncommited changes you need to keep?
19:14 bernd27 joined #git
19:14 alburaq i don't think so, cause when i did 'git pull' it did not say "dude, commit 1st!". because this i assume that there aren't anything uncommitted
19:14 _ikke_ alburaq: first try: git merge --abort
19:15 dvaske joined #git
19:15 ExoUNX_ joined #git
19:15 RxMcDonald left #git
19:16 Remram joined #git
19:16 fakenerd joined #git
19:16 alburaq _ikke_: it says: fatal: There is no merge to abort (MERGE_HEAD missing).
19:16 _ikke_ ok
19:16 skered joined #git
19:17 _ikke_ git reset --hard HEAD # this cannot be undone
19:17 dvaske_ joined #git
19:17 alburaq this will undo latest commit that i git pulled?
19:17 _ikke_ no
19:17 _ikke_ it will undo uncomitted changes in your worktree
19:18 alburaq why would i need to do this?
19:18 _ikke_ so that you can merge again
19:18 doMynation joined #git
19:19 pbandark joined #git
19:21 alburaq _ikke_: but when i do `git commit -a`, it doesn't show me anything to commit. so i guess i don't have any uncommitted changes? and therefore that git reset --hard HEAD won't do anything?
19:21 _ikke_ alburaq: git status will tell you
19:22 alburaq _ikke_: i just have a bunch of new untracked files. can i just remove those and call it a day, under the assumption that git wanted to remove those?
19:23 alburaq _ikke_: that's i did. solved for now :-p
19:23 _ikke_ alburaq: Is the last commit a merge? (implying that the merge was done, just not completed in the work tree)
19:24 alburaq yeah
19:24 alburaq sorry, dunno.
19:24 alburaq dunno what "last commit a merge" means
19:25 alburaq i just git pulled. that's all. then lots of commits are now added from that git pull
19:25 peterbecich joined #git
19:25 Cabanossi joined #git
19:25 _ikke_ alburaq: A pull creates a merge commit if had commits locally which the remote did not have yet
19:27 gopar joined #git
19:30 ki0 joined #git
19:30 ki0 joined #git
19:31 UrsoBranco joined #git
19:31 TheSimonator joined #git
19:31 dreiss joined #git
19:34 mSSM joined #git
19:34 _Stumbler_ joined #git
19:36 Murii joined #git
19:36 systemovich joined #git
19:36 synthroid joined #git
19:42 finalbeta joined #git
19:43 fatalhalt joined #git
19:44 uther joined #git
19:44 jagob joined #git
19:46 lightstalker joined #git
19:49 Tobbi joined #git
19:51 dreiss joined #git
19:51 cahoots joined #git
19:51 sathed joined #git
19:52 cahoots hi, when i do a "git merge master", it seems like if the merge goes smoothly, it just puts in a single commit for the merge, but if there's a conflict, then it adds all the commits that were merged in, and then i see them in my pr and can't merge the pr. any ideas what to do? i want the first behavior always, even with commits
19:52 davimore joined #git
19:52 cahoots *even with conflicting merges
19:52 cdg joined #git
19:52 mekhami joined #git
19:53 shinnya joined #git
19:54 _ikke_ cahoots: does it mention something like fast-forward when it goes 'smoothly'?
19:55 cahoots _ikke_, hm now even a smooth merge has this issue. ff is not mentioned
19:55 _ikke_ Right. It has nothing to do with merge requests
19:55 _ikke_ merge conflicts*
19:56 _ikke_ But whether history has diverged or not
19:56 Panacea joined #git
19:56 cahoots ok, so is there an easy fix?
19:57 _ikke_ No, it's inherent to how merges work
19:58 _ikke_ You can better rebase your branch on master in that case
19:58 fatalhalt joined #git
19:59 pbrewczynski_c joined #git
20:01 evilmquin joined #git
20:01 tnecniv joined #git
20:02 _ikke_ The way you prefer is a special case that only works when master does not have any new commits
20:02 aw1 joined #git
20:03 m0viefreak joined #git
20:03 mquin joined #git
20:04 UTAN_dev joined #git
20:06 Sasazuka joined #git
20:06 nebodka joined #git
20:06 _Stumbler joined #git
20:08 MuffinMedic joined #git
20:09 ResidentBiscuit joined #git
20:09 ResidentBiscuit joined #git
20:09 ResidentBiscuit joined #git
20:10 ResidentBiscuit joined #git
20:10 Cabanossi joined #git
20:10 nd_ joined #git
20:11 ResidentBiscuit joined #git
20:11 Pseudocrat joined #git
20:12 fatalhalt joined #git
20:20 alburaq joined #git
20:20 lavenders joined #git
20:21 zeroed joined #git
20:21 zeroed joined #git
20:21 fatalhalt joined #git
20:22 lavenders hi guys
20:23 Murii joined #git
20:23 lavenders Is it normal behaviour that a merge-commit does not show int he log
20:23 jstimm joined #git
20:24 _ikke_ just plain git log should show merge commits
20:24 Minty_ joined #git
20:24 Minty_ how do i ignore py files inside foo?
20:24 Minty_ foo/*.py doesn't work
20:24 foo Minty_: Hey, don't look at me.
20:24 Minty_ :(
20:24 gitinfo lavenders: 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.
20:24 jast joined #git
20:25 _ikke_ Minty_: That should work
20:25 _ikke_ Minty_: Are you by chance trying to ignore tracked files?
20:25 rkazak joined #git
20:26 Minty_ _ikke_: nope
20:26 Minty_ _ikke_: oh maybe
20:26 Minty_ btw foo is 1 directory down from .gitignore
20:26 Minty_ should i do bar/foo/*.py
20:26 foo Minty_: What is _ikke_ is getting at... did you already add files foo/*.py and commit them, and *now* you want to ignore them?
20:26 Minty_ ahhh
20:26 Minty_ i was missing bar/
20:27 Minty_ my bad
20:27 Minty_ thanks
20:27 foo Ah
20:27 foo Minty_: Is .gitignore at the same level as ./bar/ (eg. .gitignore) or did you have it ./bar/.gitignore?
20:28 cbreak joined #git
20:29 zivester joined #git
20:30 renlo joined #git
20:31 renlo is there a name for 'no pull-requests, you simply push directly to a dev-branch' ?
20:32 osse 'permission'
20:32 Random832 joined #git
20:32 renlo osse: was that directed at me?
20:32 ResidentBiscuit I call it 'pushing to a branch'
20:33 _ikke_ You always push to a branch :P
20:33 ResidentBiscuit That's the point
20:33 rmesta1 joined #git
20:33 ResidentBiscuit It's not a special situation
20:33 rmesta2 joined #git
20:33 renlo I am referring to the 'strategy'. As in, I, developer A have some changes I have made to branch 1. Instead of doing a PR to merge my changes into branch 1, I simply push my changes up directly.
20:34 renlo and developer B, and developer C are doing the same thing
20:34 renlo at some point, we merge branch 1 into master
20:35 _ikke_ It has no special name
20:35 renlo how common is it to do it that way?
20:35 ResidentBiscuit In my experience, uncommon
20:35 ResidentBiscuit Create your own branch to work in
20:36 ResidentBiscuit There's no reason not to
20:36 renlo merge conflicts
20:36 ResidentBiscuit You'll get those regardless
20:36 renlo but theyre smaller / more manageable
20:36 ResidentBiscuit You're still merging the remote branch with your local branch
20:36 ResidentBiscuit Even if they have appear to have the same name
20:37 renlo with the PR strategy, a person might have been sitting on their branch for the past month, at some point when they merge it in there might a lot of merge conflicts
20:37 ResidentBiscuit They are not any smaller or any more manageable. They'll be the exact same conflicts
20:37 _ikke_ renlo: once developer A has pushed, developer B and C need to merge locally, needing to deal with any merge conflicts
20:37 renlo if developer A and B have to push up to the same branch (as in, they wont just sit on it) then the merge conflicts are minor and addressed immediately
20:37 ResidentBiscuit You might have been sitting on a stale copy of the dev branch for a month
20:38 renlo yes, I am just saying 'deal with the merge conflicts now, not in a week or two when I want to submit my PR'
20:38 ResidentBiscuit What you're proposing has nothing to do with the timliness of dealing with conflicts
20:38 _ikke_ renlo: rebasing regularly can help you deal with that
20:39 renlo true _ikke_
20:42 satifant joined #git
20:42 renlo imo the problem with the PR approach is with the merge conflicts after master has changed too much. I know you're saying that the merge conflicts are identical but not really, because you are going back and rewriting your own history in your branch (correct?)
20:43 renlo At least subjectively, I have dealt with merge conflicts which threw a wrench into things. It hasn't happened in a long while so I don't know if maybe I was just stupid or something, but when the merge conflicts are dealt with immediately its a lot more simple
20:43 ResidentBiscuit If you're not updating your local branch regularly, it doesn't matter that you're using the local copy of the shared branch or your own branch. Either way, your code is out of date and you're going to have conflicts
20:43 renlo as opposed to dealing with a merge conflicts 3 weeks later for a file you kind of remember editing but don't really know how you should resolve the conflict
20:43 renlo I understand
20:44 renlo I am saying that 'dealing with it now' is completely different from dealing with it in 3 weeks. Also, I'm not sure if I completely agree that the merge conflicts will be completely the same because you are coding it in real time instead of retroactively going back and making the changes
20:45 ResidentBiscuit What is forcing you to deal with it now? Are you pushing daily? If so, just rebase daily. Same amount of work, you get the benefits of not sharing a branch for your dev work
20:45 _ikke_ renlo: The problem with pushing to dev (depending on your workflow) is that a specific feature might not be ready yet
20:45 YouCallItFar joined #git
20:45 _ikke_ or it breaks other things
20:45 ResidentBiscuit If you're not pushing daily, then there's literally no difference
20:45 synthroi_ joined #git
20:46 jerkey left #git
20:46 YouCallItFar hm my git submodule add is going crazy because i think i added a submodule with same name before.  ive git submodule sync'd and see corret git remote -v.  but its like it needs to be git pulled, which doesnt work.
20:46 ResidentBiscuit Branches are essentially free in git. You should utilize them, otherwise you're just using git incorrectly imo.
20:47 renlo _ikke_: feature flags would work for that though right? But yeah, I think I should just do PRs with rebasing often, sounds like I'm in the minority
20:47 _ikke_ renlo: Note that you don't have to use PRs
20:47 _ikke_ you can just merge them in locally
20:48 renlo with continuous delivery (or development, never remember which), for every commit in master (or stage/dev), the data is deployed, correct? Are they doing PRs for that?
20:48 _ikke_ renlo: PRs can be used for that yes
20:48 renlo yeah, I guess the argument really is 'shared branch' vs 'local branch, merge at a certain point'
20:48 Blkt joined #git
20:49 D4R5C0D3 joined #git
20:49 zhodge joined #git
20:51 gopar joined #git
20:52 YouCallItFar ah i just git reset --hard origin in my submodule. nice.
20:52 Balthasar|V20 joined #git
20:52 cbreak joined #git
20:54 YouCallItFar i know git fu ^^
20:54 YouCallItFar left #git
20:57 plasticle joined #git
20:59 relipse__ joined #git
20:59 indistylo joined #git
21:01 robattila256 joined #git
21:01 aidalgol joined #git
21:01 renlo joined #git
21:02 raffo joined #git
21:03 mjuszczak joined #git
21:06 sunri5e joined #git
21:08 ForeignBiscuit joined #git
21:09 foreal joined #git
21:10 Cabanossi joined #git
21:10 dreiss joined #git
21:11 mmlb joined #git
21:12 fatalhalt joined #git
21:14 askb joined #git
21:14 zhodge joined #git
21:15 lavenders joined #git
21:16 robattila256 joined #git
21:21 joshszep joined #git
21:21 brent__ joined #git
21:21 jeffreylevesque joined #git
21:23 joshszep_ joined #git
21:27 lavenders joined #git
21:29 NeverDie joined #git
21:30 kfoonamalik joined #git
21:32 magiq joined #git
21:33 anuxivm joined #git
21:34 _xor joined #git
21:34 magiq hello. I'm using "git add -p" and one chunk didn't split so I decide to use editing. But I cant understand how it's works. So https://pastebin.com/1WzwpdT3 i need that from line 5 to 15 dont go to the add
21:35 cha18 joined #git
21:35 magiq So only protected getAppDir with comment go to stage
21:35 osse magiq: read line 25.
21:36 magiq deleting + is not complete decition
21:36 magiq since I need to change numbers at top
21:36 _xor What should I look into for this: I have a repo & two remotes. One is my local server where most of the work is done, and another is for delivering work to the client.  I make a lot of small commits local and use a fair number of branches. My local repo is basically a mirror of my local server (GitLab).
21:36 magiq I dont know how to change even after reading diff united format
21:36 _xor What I want to do is just track one branch on the remote server (local branch can be called "client" or something and it would track master on remote).
21:36 osse magiq: deleting stuff from that view only affects what gets added. not how the file looks on disk
21:36 osse magiq: delete lines 5-15 then save and close
21:37 _xor Then basically I want to combine selected commits into a single commit and push that single commit up to the remote master branch.
21:37 _xor Not sure if rebase, cherry-pick, or what should be used for that.
21:37 magiq osse: but numbers
21:37 magiq osse: will it work with old numbers at top?
21:38 osse magiq: you mean between @@ ... @@ ?
21:38 magiq Your edited hunk does not apply. Edit again
21:38 magiq yes!
21:38 osse yes it will
21:38 magiq nope
21:38 magiq got error
21:38 magiq Your edited hunk does not apply. Edit again
21:38 osse then you did something else incorrectly
21:38 roelmonnens joined #git
21:39 magiq osse: https://pastebin.com/CgLy1fC9
21:39 ToBeCloud joined #git
21:40 osse that looks good to me
21:40 duderonomy joined #git
21:41 magiq osse: not for git, someone says that needed to change @@ numbers
21:41 bdonnahue joined #git
21:41 magiq osse: http://stackoverflow.com/questions/3268596/git-add-interactive-your-edited-hunk-does-not-apply
21:41 mkoskar joined #git
21:41 osse that's the first I've ever heard about it
21:41 osse have used add -p for years
21:42 _xor Oh, nevermind, I think I figured it out.  I guess I can just rebase my local client branch and then squash the commits in that branch and push it up.
21:42 osse what's your git version
21:42 osse _xor: git merge --squash might be interesting to you
21:42 fahadash joined #git
21:42 _xor Yeah, that's what I think I'm going to do.
21:42 Dougie187 left #git
21:42 magiq git version 2.7.4
21:43 magiq osse: did you use editing mode ?
21:43 _xor The basic idea I want to achieve is keep my local repo with all of the branches/commits/etc.  But when I push a set of work up to the client, I want to just push a single commit up to their repo.
21:43 qqx magiq: You can try changing the 20 to 9, since you've removed 11 lines from what's being added.
21:43 osse magiq: yes
21:44 _xor I'm thinking that I could just create a new local branch that tracks their master branch (something like local:client -> remote:master), and then I could just merge (or rebase) local:client with the new changes, squash the commits down, and then push that up.
21:44 _xor osse: Does that sound about right?
21:44 magiq qqx: not working
21:45 _xor Oh, yeah that makes sense...merge -squash will just be quicker than having to rebase + rewrite.
21:50 griff joined #git
21:52 auv joined #git
21:53 MarioBranco joined #git
21:54 cahoots joined #git
21:54 re1_ joined #git
21:55 Cabanossi joined #git
21:56 re1_ joined #git
22:01 Fallen0223 joined #git
22:01 dreiss joined #git
22:01 magiq omg
22:01 magiq my brain soon will blow
22:01 magiq how the fuck editing chunk works
22:06 fatalhalt joined #git
22:07 ki0 joined #git
22:08 osse magiq: Try removing just one line and see if that works
22:09 marlinc joined #git
22:12 PaulCapestany joined #git
22:13 ntnn joined #git
22:13 gopar joined #git
22:20 gopar_ joined #git
22:22 cads2 joined #git
22:22 Fallen0223 joined #git
22:23 zerow joined #git
22:24 zhodge joined #git
22:25 cha1800 joined #git
22:25 tvw joined #git
22:25 Cabanossi joined #git
22:26 Charliechin joined #git
22:26 sirdaxalot joined #git
22:28 magiq somehow I did it
22:28 magiq dont know how
22:28 magiq but
22:29 Fallen0223 joined #git
22:32 glebihan joined #git
22:34 sirdaxalot left #git
22:36 kristofferR joined #git
22:36 jstimm joined #git
22:38 MistahKurtz joined #git
22:38 gopar joined #git
22:41 MistahKurtz are there any suggested async workflows for resolving merge conflicts when the conflicts need to be addressed by different developers?
22:41 dave0x6d joined #git
22:42 mentazoom joined #git
22:43 madewokherd joined #git
22:43 scoobertron joined #git
22:44 radens joined #git
22:46 Random832 joined #git
22:46 radens hello, I'm having trouble with git send-email and gmail. I configured my .gitconfig according to this document: https://git-scm.com/docs/git-send-email I generated a patch with git format-patch and then did git send-email my.patch --from=me@gmail.com --to=me@gmail.com and git is just hanging
22:50 Klumben joined #git
22:50 raynold joined #git
22:53 masuberu joined #git
22:54 nebodka joined #git
22:59 NumberStation08 joined #git
23:00 mentazoom joined #git
23:03 rkazak joined #git
23:04 Tobbi joined #git
23:07 ljc joined #git
23:08 cahoots_ joined #git
23:10 Goplat joined #git
23:12 mozzarella joined #git
23:15 sea-gull joined #git
23:15 dreiss joined #git
23:16 Rodya_ joined #git
23:19 akkad joined #git
23:20 nevodka joined #git
23:21 Tobbi joined #git
23:21 fatalhalt joined #git
23:22 fakenerd joined #git
23:23 cdg joined #git
23:24 foreal joined #git
23:26 robattila256 joined #git
23:28 swords joined #git
23:29 stepho joined #git
23:30 tnecniv joined #git
23:31 Kaisyu joined #git
23:31 cdown joined #git
23:33 cdown joined #git
23:33 zerow joined #git
23:34 robattila256 joined #git
23:35 courrier joined #git
23:38 shgysk8zer0 joined #git
23:39 YuGiOhJCJ joined #git
23:39 dsdeiz joined #git
23:39 dsdeiz joined #git
23:41 Kyros joined #git
23:41 fatalhalt joined #git
23:43 linuxmodder joined #git
23:43 linuxmodder joined #git
23:43 Gustavo6046 joined #git
23:43 Achylles joined #git
23:49 DolphinDream joined #git
23:50 Rodya_ joined #git
23:50 fatalhalt joined #git
23:50 courrier joined #git
23:50 cahoots joined #git
23:51 courrier joined #git
23:51 murph joined #git
23:51 dirtyroshi_ joined #git
23:52 Noodlewitt joined #git
23:55 Cruzeiro joined #git
23:55 goodlluck joined #git
23:55 Cabanossi joined #git
23:55 evanm joined #git
23:57 h12o joined #git
23:58 Stas joined #git

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