Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-07

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

All times shown according to UTC.

Time Nick Message
00:00 Cabanossi joined #git
00:00 clemf_ joined #git
00:01 clemf joined #git
00:02 anuxivm left #git
00:03 bvcosta joined #git
00:04 j7k6_ joined #git
00:08 dave0x6d joined #git
00:16 zivester joined #git
00:18 livingstn joined #git
00:19 bruce_lee joined #git
00:22 ejb joined #git
00:24 col joined #git
00:25 d5sx43 joined #git
00:25 afuentes joined #git
00:28 uhmgawa^3 joined #git
00:30 livingstn joined #git
00:30 Cabanossi joined #git
00:32 brent__ joined #git
00:33 shgysk8zer0_ joined #git
00:39 clemf joined #git
00:39 kbs left #git
00:40 jnewt joined #git
00:42 gugah joined #git
00:44 rominronin joined #git
00:48 ToBeCloud joined #git
00:49 sargas joined #git
00:52 Sasazuka_ joined #git
00:54 Electrometro joined #git
00:54 pur3eval joined #git
00:54 fatalhalt joined #git
00:55 fatalhalt joined #git
00:55 Ranhir joined #git
00:55 Electrometro left #git
00:56 porsche944 joined #git
00:57 livingstn joined #git
00:59 pifon joined #git
01:04 chachasmooth joined #git
01:04 Levex joined #git
01:05 kristofferR joined #git
01:11 chachasmooth joined #git
01:12 nowhereman joined #git
01:12 Sample joined #git
01:13 kristofferR joined #git
01:14 mischat joined #git
01:16 Schrostfutz joined #git
01:20 ozmage joined #git
01:21 clickjack joined #git
01:25 livingstn joined #git
01:33 peeps[lappy] joined #git
01:41 Eugene disi - sounds like a whitespace change
01:41 jameser joined #git
01:41 disi Eugene: indeed, turned out to be normal spaces vs non-breaking HTML/UTF-8 spaces
01:41 Eugene !next
01:41 gitinfo Another satisfied customer. NEXT!
01:42 inflames joined #git
01:43 hexagoxel joined #git
01:43 disi lol
01:43 hhee joined #git
01:46 TikityTik joined #git
01:46 TikityTik why is it that i'm getting merge conflicts when I commit after a push where I'm the only comitter?
01:47 arand joined #git
01:47 zarteletic joined #git
01:47 foreal joined #git
01:47 Eugene Probably because you've merged something somehow. !repro
01:47 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
01:48 kadoban TikityTik: You're leaving out a piece of the puzzle. Neither pushing nor committing involves any potential merge or merge conflicts.
01:48 Eugene !puzzle
01:48 TikityTik i made a pull request on github after pushing
01:48 nevodka and then you tried pushing again without pulling?
01:49 Eugene .trigger_edit puzzle Hmm.... that doesn't make much sense. Its possible you're not showing us the full puzzle. Please provide more details, preferably including a !transcript including `git status` output so we can help you help yourself.
01:49 gitinfo Eugene: Okay.
01:49 Eugene You made a PR on Github.... is this a Forked repo from an upstream project?
01:49 TikityTik nevodka: I did a git pull before gitpush, it had a merge conflict
01:49 TikityTik Eugene: yes
01:49 TikityTik define upstream project
01:50 TikityTik did a git pull request on that last commit, https://github.com/Davidj361/tgs​tation/commits/universalrecorder
01:51 TikityTik then did git add <some file>, then git commit --amend, then git pull, this brought the merge conflict
01:51 hahuang65 joined #git
01:52 nevodka because you committed before you pulled
01:52 alexandre9099 joined #git
01:52 TikityTik I thought git pull is ok after git commit? :|
01:52 TikityTik it only matters if it's before git push
01:52 nevodka nope
01:53 TikityTik must've forgot
01:53 nevodka well as long as your commit didn't alter any of the files in the commits you pulled the merge should be no issue
01:53 TikityTik it did
01:54 TikityTik but still i'm surprised since right after that git push, I did a small change and then did the above
01:54 nevodka then you will probably want to manually resolve that
01:55 Sasazuka joined #git
01:55 nevodka you will probably want to copy that file somewhere else
01:55 TikityTik the merge conflict was literally one line: var/playsleepseconds = FALSE | var/playsleepseconds = 0
01:55 TikityTik which is what I don't understand
01:55 nevodka then do a git checkout --theirs on it
01:55 z01d joined #git
01:56 TikityTik plus isn't it better to git commit before a git pull to make sure your changes get saved?
01:56 nevodka then add your changes back into it
01:56 nevodka if its just that one line then do a git checkout --ours instead
01:56 nevodka and just paste that line back where it was
01:57 TikityTik Why did I even get a merge conflict if I just did a git push, then edited the file and then git add, git commit --amend, git pull?
01:57 z01d Hello all, I am creating a script to backup my dotfiles and automatically install them on new machines.  I am using git to store the .dotfiles directory.  Within the .dotfiles directory is oh-my-zsh (a git repo itself), when i pull down the .dotfiles directory on a new computer the oh-my-zsh directory is empty, i assume because i push to my personal gitlab? How do i fix this?
01:57 nevodka no
01:58 nevodka you did not pull the remote changes
01:58 nevodka and you made a local commit
01:58 z01d ?
01:58 TikityTik that's to me
01:58 z01d oh ok
01:58 Levex joined #git
01:58 nevodka thats divergence
01:58 nevodka hence you are required to merge
01:58 TikityTik but I'm the one that pushed those changes to the remote, why would I need to do a git pull after a git push?
01:58 Eugene Because you don't yet have them in your local repo
01:59 nevodka you must have pushed the changes from a different folder or machine
01:59 TikityTik same machine & folder
01:59 nevodka or there was a rollback, or a plethora of other reasons
01:59 TikityTik alright, i'll hold off on it for now and deal with it alter
01:59 TikityTik s/alter/later
01:59 nevodka well its piss easy as i described
02:00 nevodka git checkout --ours on the file in question
02:00 nevodka then copy paste that one line back where it was
02:00 nevodka and finish the merge
02:00 Cabanossi joined #git
02:01 nevodka there is probably an automated way or something too that could do it but i am but an amateur still
02:01 nevodka and do not know of such commands name
02:01 nevodka :]
02:04 gugah joined #git
02:04 j7k6_ joined #git
02:12 z01d Guys how can i push a repo to git that includes a repo, so that when i pull the repo down i can see the files within it inside the other repo? at the moment its giving me a blank directory
02:14 nevodka z01d : https://git-scm.com/book/e​n/v2/Git-Tools-Submodules
02:14 livingstn joined #git
02:14 Sasazuka joined #git
02:15 SantaClauze joined #git
02:16 rominronin joined #git
02:20 Eugene !subrepos
02:20 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
02:20 TbobbyZ_ joined #git
02:21 SwiftMatt joined #git
02:23 ozmage joined #git
02:26 Noodlewitt joined #git
02:29 finalbeta joined #git
02:33 d^sh joined #git
02:34 pks joined #git
02:35 BackEndCoder joined #git
02:37 EV3RYDAYPR0GRESS joined #git
02:39 tbveloso joined #git
02:39 durham_ joined #git
02:39 tbveloso left #git
02:41 z01d god this is a nightmare, nevodka i can't seem to get submodules to work i've added them but when i do git submodule init and update it gives me an error saying direct commit fetching failed
02:41 z01d Fetched in submodule path 'Configs/vim/bundle/Vundle.vim', but it did not contain f6cc06238d5ac888ddfc514f80392f44cb2e21ac. Direct fetching of that commit failed.
02:41 z01d any idea how to fix this?
02:42 nevodka not sure never really used them
02:46 nevodka its expecting some other commit hash than what is there
02:46 nevodka its possible the fact that it was an existing repo may require some special initialization as a submodule
02:46 nevodka but im just guessing
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:54 duderonomy joined #git
02:54 fstd_ joined #git
02:55 hvn0413 joined #git
02:59 watabou joined #git
02:59 BackEndCoder joined #git
02:59 TbobbyZ joined #git
02:59 sunri5e joined #git
03:01 cqi joined #git
03:03 Smashcat joined #git
03:04 ojdo joined #git
03:04 nettoweb joined #git
03:04 Smashcat Hi, can someone tell me how I can revert all changes made in the last pull? Someone checked a whole bunch of broken stuff into a site and now it's... well... fucked :)
03:05 nevodka you can set the HEAD pointer to the commit before and just recommit it
03:05 nevodka will overwrite the commit ahead of it
03:06 Smashcat I don't know what commit it was at before the pull
03:06 nevodka you can look in the git log
03:06 dandaman joined #git
03:06 nevodka or on whatever hosting site
03:06 nevodka or checkout commits until you find it
03:06 nevodka :p
03:06 joeco joined #git
03:07 gtristan joined #git
03:07 dandaman so i just started a new job and they use team foundation server as their git software… I sometimes like to use the github gui, is it possible to have the same repo using team foundation server as well as github?
03:09 jameser_ joined #git
03:10 Smashcat Oh well, looks like git has decided to modify all the files even after a revert. Someone else can fix it tomorrow - haha :)
03:12 gwolff joined #git
03:12 venmx joined #git
03:12 cdg joined #git
03:12 nevodka he left before i could ask him if he googled it yet
03:12 nevodka i guess he did
03:12 nevodka :>
03:14 clickjack joined #git
03:14 aavrug joined #git
03:15 jokester joined #git
03:15 mischat joined #git
03:15 svm_invictvs joined #git
03:15 aavrug joined #git
03:16 gwolff joined #git
03:16 toothe joined #git
03:17 toothe I made a silly mistake, committed with the wrong username/email. How do I fix that?
03:17 Smashcat Ah I see, so when I do a git reset HEAD@{1} it actually reverts the files, then flags them all as modified ready to check in and overwrite all changes from later revisions - cool :)
03:17 toothe I have not pushed the commit
03:18 Smashcat So if I commit and push them now, it will wipe out all changes made by everyone for the past couple of months. Kind of wish we were using svn now (which has a revert command :) )
03:20 livingstn joined #git
03:28 JPisaBrony joined #git
03:29 finalbeta joined #git
03:30 Vortex34 joined #git
03:30 Cabanossi joined #git
03:31 roxlu joined #git
03:31 Goplat joined #git
03:31 SwiftMatt joined #git
03:31 jameser joined #git
03:33 gopar joined #git
03:33 jon-mac joined #git
03:34 clickjack joined #git
03:36 cdg_ joined #git
03:37 diogenese joined #git
03:37 livingst_ joined #git
03:39 cdg joined #git
03:40 BackEndCoder joined #git
03:40 cdg joined #git
03:41 dandaman joined #git
03:41 mda1 joined #git
03:42 dreiss joined #git
03:47 rominronin joined #git
03:49 chipotle joined #git
03:51 hhee joined #git
03:51 cdg joined #git
03:52 mizu_no_oto joined #git
03:52 wald0 joined #git
03:53 ejb joined #git
03:53 wald0 I have a commit ID, how i can know on which branch it is from?
03:53 wald0 or on which branches is this commit available
03:54 TbobbyZ joined #git
03:55 Derperperd joined #git
03:56 clemf joined #git
03:57 wilbert_ joined #git
03:59 pks joined #git
03:59 Nilesh_ joined #git
03:59 dandaman joined #git
04:00 DolphinDream joined #git
04:01 chachasmooth joined #git
04:01 Eugene wald0 - man git-log; --contains is probably what you're looking for.
04:01 gitinfo wald0: the git-log manpage is available at http://jk.gs/git-log.html
04:01 Eugene Sorry; man git-branch
04:01 gitinfo the git-branch manpage is available at http://jk.gs/git-branch.html
04:03 wald0 ha! perfect, it was "git branch" and not "git log" (hum, curious....) thx Eugene :)
04:03 hexagoxel joined #git
04:03 Eugene I'm not drunk enough to remember right
04:04 rewt with --all to include remote branches
04:05 j7k6_ joined #git
04:10 xall_ joined #git
04:10 d^sh joined #git
04:17 dreiss joined #git
04:21 menip joined #git
04:22 Guma joined #git
04:22 TbobbyZ joined #git
04:23 SwiftMatt joined #git
04:26 Derperperd joined #git
04:30 Cabanossi joined #git
04:31 Derperperd joined #git
04:31 davimore_ joined #git
04:32 jungsubk joined #git
04:33 davimore_ joined #git
04:41 d0nn1e joined #git
04:41 mehola joined #git
04:43 imack joined #git
04:45 brent__ joined #git
04:47 robattila256 joined #git
04:49 durham joined #git
04:50 durham joined #git
04:58 Cabanossi joined #git
05:01 ayogi joined #git
05:05 lucido-cl joined #git
05:06 muhannad_______ joined #git
05:08 learning joined #git
05:09 chachasmooth joined #git
05:10 mehola joined #git
05:12 venmx joined #git
05:16 pur3eval joined #git
05:17 Aboba joined #git
05:19 rominronin joined #git
05:30 elsevero joined #git
05:33 dreiss joined #git
05:33 jungsubk joined #git
05:38 orbyt_ joined #git
05:38 hexagoxel joined #git
05:42 astrofog joined #git
05:47 radoslavcap joined #git
05:54 bruce_lee joined #git
05:54 chachasmooth joined #git
05:57 Cabanossi joined #git
05:57 sbulage joined #git
05:58 nkhl joined #git
06:01 humboldt joined #git
06:02 dreiss joined #git
06:02 hexagoxel joined #git
06:03 rscata joined #git
06:04 dec0n joined #git
06:04 Dandelock joined #git
06:06 j7k6_ joined #git
06:07 dsdeiz joined #git
06:07 dsdeiz joined #git
06:08 MineCoins joined #git
06:08 Andrew_K joined #git
06:13 rchavik joined #git
06:18 learning joined #git
06:19 learning joined #git
06:21 jimklo joined #git
06:21 bocaneri joined #git
06:23 elsevero joined #git
06:24 bakibour joined #git
06:24 bakibour left #git
06:25 bourbaki joined #git
06:25 qt-x joined #git
06:25 thiago joined #git
06:25 bourbaki Greetings, How can i get a file from git with archive from a specific branch?
06:26 chachasmooth joined #git
06:30 jimklo joined #git
06:31 zefferno joined #git
06:35 Kaisyu joined #git
06:38 pks joined #git
06:38 jimklo joined #git
06:38 Junior left #git
06:39 Junior joined #git
06:39 chigang joined #git
06:40 nevodka joined #git
06:41 Silenced joined #git
06:41 Silenced joined #git
06:42 Cabanossi joined #git
06:45 ThomasLocke joined #git
06:46 pur3eval joined #git
06:51 dersand joined #git
06:51 rominronin joined #git
06:53 imack joined #git
06:53 spm_draget joined #git
06:54 b3kN joined #git
07:00 jimklo joined #git
07:05 thiago joined #git
07:07 dreiss joined #git
07:08 freimatz joined #git
07:09 JeroenT joined #git
07:10 wxg joined #git
07:10 cqi joined #git
07:13 venmx joined #git
07:13 j7k6_ joined #git
07:14 rchavik joined #git
07:17 Vampire0_ joined #git
07:19 j7k6_ joined #git
07:22 trelane joined #git
07:22 trelane joined #git
07:25 finalbeta joined #git
07:26 hahuang61 joined #git
07:28 sarri joined #git
07:28 sarri joined #git
07:28 fstd_ joined #git
07:29 sathed joined #git
07:29 hvn0413 joined #git
07:29 Disgeae joined #git
07:29 learning joined #git
07:31 zeroed joined #git
07:31 zeroed joined #git
07:35 Derperperd joined #git
07:35 MACscr joined #git
07:36 rominronin joined #git
07:36 masuberu joined #git
07:37 SwiftMatt joined #git
07:38 Derperperd joined #git
07:40 Silenced joined #git
07:40 Silenced joined #git
07:43 Vampire0 joined #git
07:45 tmg joined #git
07:45 Derperperd joined #git
07:46 Sample joined #git
07:47 Derperperd joined #git
07:51 zeroed joined #git
07:52 thebird joined #git
07:52 crawler joined #git
07:53 PCatinean joined #git
07:54 jnavila joined #git
07:55 byte512 joined #git
07:55 chipotle joined #git
07:55 armin_ joined #git
07:56 elsevero_ joined #git
07:56 math-alpha joined #git
07:57 TomyWork joined #git
07:57 dwts joined #git
08:00 askb joined #git
08:01 aidalgol joined #git
08:03 crst joined #git
08:04 elisa87 joined #git
08:04 ankit01ojha joined #git
08:05 elisa87 joined #git
08:05 crst Hi, what happens when you move a file to a new location inside the repo, than add & commit. Is it now duplicated in .git?
08:06 z01d joined #git
08:06 moritz crst: only the reference to it is duplicated
08:06 elisa87 joined #git
08:06 darkbit joined #git
08:07 moritz and if it's copied and changed just a bit, git's delta compression typically does a pretty good job at saving space
08:08 wrouesnel joined #git
08:08 elisa87 joined #git
08:08 crst moritz: good, that's efficient.
08:09 moritz at $work we have a repo that manages 14MB of source code (and documentation in text format), with a history going back to 1997
08:09 moritz and it's .git dir of a fresh clone is 28MB
08:09 moritz with nearly 20k commits
08:09 hexagoxel joined #git
08:10 ankit_ joined #git
08:10 moritz (plus more in branches)
08:10 elisa87 joined #git
08:11 svm_invictvs joined #git
08:11 elisa87 joined #git
08:17 Macaveli joined #git
08:17 dsdeiz joined #git
08:17 dsdeiz joined #git
08:23 Ruler- joined #git
08:23 ljharb joined #git
08:24 watabou joined #git
08:24 ljharb i'm trying to use grafts and filter-branch rewrite a commit with one parent, so that it has 5 parents (including the original) - but every time I do it, it ends up cloning 4 or the 5 commit trees instead of just setting the parents on the commit. can someone help?
08:25 overlord_tm joined #git
08:25 spm_draget left #git
08:26 mda1 joined #git
08:29 TomyWork joined #git
08:30 senaps joined #git
08:30 navidr joined #git
08:34 flaviodesousa joined #git
08:35 pur3eval joined #git
08:35 dvaske_ joined #git
08:39 GodGinrai joined #git
08:40 mikecmpbll joined #git
08:40 Glowball joined #git
08:42 faux____ joined #git
08:42 Cabanossi joined #git
08:43 xall_ joined #git
08:43 Balliad joined #git
08:43 elect joined #git
08:44 thebird joined #git
08:44 cdown joined #git
08:46 kurkale6ka joined #git
08:49 nkhl joined #git
08:49 darkbit joined #git
08:53 zeroed joined #git
08:53 zeroed joined #git
08:56 Darcidride joined #git
08:57 mknod joined #git
08:58 finalbeta joined #git
08:59 aw1 joined #git
09:00 tmg joined #git
09:02 bongjovi joined #git
09:02 ahr3n joined #git
09:04 aklrcv joined #git
09:05 senaps joined #git
09:05 j416 ljharb: cloning?
09:05 cdown_ joined #git
09:05 j416 ljharb: what do you mean by that?
09:05 TomyWork joined #git
09:07 chipotle joined #git
09:08 ljharb like, copies of the commits with a different sha
09:08 ljharb i couldn't get it working with grafts but got it working with filter-branch --parent-filter
09:08 sbasso joined #git
09:08 j416 interesting
09:09 _ikke_ For the next time, you could also look into man git replace (--graft) in combination with filter-branch
09:09 gitinfo the git-replace manpage is available at http://jk.gs/git-replace.html
09:09 j416 grafts as in replace --graft?
09:09 _ikke_ j416: There is a separate (older) feature
09:09 j416 I thought that was what he was doing
09:09 j416 Yes, hence question
09:09 _ikke_ j416: You can place the 'grafts' in a grafts file
09:10 sbasso joined #git
09:10 j416 yes, hence question.
09:10 _ikke_ j416: https://git.wiki.kernel.org/index.php/GraftPoint
09:10 nkhl joined #git
09:10 j416 ...
09:11 Panacea joined #git
09:12 nkhl joined #git
09:13 ahr3n joined #git
09:13 venmx joined #git
09:14 ljharb _ikke_: i tried git replace too and it's not able to set multiple parents
09:14 ljharb and yes, i used the grafts file, and `git filter-branch`, but my comment above describes how that failed to work (i've used it before successfully)
09:15 j416 ljharb: according to its man page it supports setting multiple parents
09:15 ljharb hm
09:15 DieguezZ joined #git
09:15 blahdodo joined #git
09:16 ljharb i guess i'll try it again next time then
09:16 marcogmonteiro joined #git
09:16 ljharb filter-branch --parent-filter ended up working, without the grafts file
09:16 j416 fwiw the old grafts is to my knowledge deprecated; replace replaces it
09:16 j416 correct me if I'm mistaken @ deprecated
09:17 j416 ljharb: cool
09:19 _ikke_ man gitglossary
09:19 gitinfo the gitglossary manpage is available at http://jk.gs/gitglossary.html
09:19 darkbit joined #git
09:19 _ikke_ It mentions that it's outdated and may lead into problems
09:20 _ikke_ (but after filter-branch, it should not matter)
09:21 ljharb right, my intention was to use the grafts file only temporarily
09:21 j416 oh. Didn't know it was even in the docs still
09:21 aw1 joined #git
09:22 jnewt_ joined #git
09:23 skirk joined #git
09:23 eduardas_m joined #git
09:24 jokajak joined #git
09:25 zxd joined #git
09:25 zxd what is an index file? is entire repository at all times always in the index file?
09:25 marenz_ joined #git
09:25 j416 zxd: not the entire repo.
09:25 watabou joined #git
09:26 j416 zxd: but one copy of a tree
09:26 zxd j416: which tree?
09:27 j416 whichever you choose
09:27 rwp joined #git
09:27 ferr1 joined #git
09:27 j416 it reflects what is in the current commit, plus any uncommitted but changed and added things
09:30 ariver joined #git
09:31 wxg joined #git
09:31 eduardas_m joined #git
09:31 robattila256 joined #git
09:32 XVar joined #git
09:33 MACscr joined #git
09:34 lmat joined #git
09:34 ljharb left #git
09:35 zxd j416: git commit   always reads from index file to know what to commit?
09:35 JanC joined #git
09:36 Glowball joined #git
09:37 cbreak not always
09:37 cbreak but normally
09:38 cbreak the index is the staging area for the next commit after all
09:38 King_Hual joined #git
09:38 darkbit joined #git
09:38 thiago joined #git
09:38 steve joined #git
09:40 eduardas_m joined #git
09:40 mischat joined #git
09:40 zxd cbreak: what happens to index file after commit, it stays the same?
09:41 mischat joined #git
09:41 ratdeptrai joined #git
09:41 testman joined #git
09:41 _ikke_ yes
09:42 sgfgdf joined #git
09:42 gtristan joined #git
09:42 rfi_ joined #git
09:43 eduardas_m joined #git
09:43 monty_hall joined #git
09:43 zxd and index file changes when I checkout to a new branch?
09:43 staplezebra joined #git
09:43 _ikke_ correct
09:43 eduardas_m joined #git
09:44 zxd why is this staging area used? why not directly write the objects on disk ?
09:45 grawity the objects *are* written directly to disk
09:45 grawity in fact the staging area references those objects
09:45 grawity it's there for the *users*, so that they can pick and choose what to commit
09:45 zxd git add   writes the objects to disk?
09:45 grawity yes
09:45 zxd oh
09:47 tvw joined #git
09:48 jungsubk joined #git
09:49 rfi_ joined #git
09:50 pur3eval joined #git
09:50 zxd grawity: does git log  read from index file?
09:50 grawity no
09:50 zxd from HEAD ?
09:50 rfi_ Hi! I'm trying to follow some merge strategy, but that makes git segfault on my Ubuntu Xenial. Has someone a trunk-compile of git at hand to see if git-bug still present in trunk?
09:50 grawity git log reads actual commits only
09:50 seni1 joined #git
09:50 grawity although some other log tools, like gitk or tig, show a virtual "staged files" entry above HEAD
09:51 _ikke_ rfi_: what version does Xenial have?
09:51 steve joined #git
09:51 grawity rfi_: I'd say you are best equiped to test that out, if it segfaults with your repo...
09:51 TbobbyZ joined #git
09:52 zxd grawity: yes but how does it know where the last commit object is
09:52 rfi_ I have generic reproducer, that does not need a specific repository. Just do not want to go through compiling git.
09:52 zxd grawity: git log, that is
09:52 grawity zxd: it reads the 'HEAD' ref
09:52 zxd ah
09:52 grawity most commands either accept a list of refs/branches/stuff, or use HEAD otherwise
09:52 medeirosthiiago joined #git
09:53 Silmarilion joined #git
09:53 osse rfi_: compiling git now
09:53 osse what verysion do you see the bug in?
09:53 rfi_ Xenial has 1:2.7.4-0ubuntu1
09:54 sgfgdf joined #git
09:54 rfi_ Reproducer is: mkdir x y; git init x; git init y; cd x; git remote add y ../y; git fetch y; git merge -s ours --no-commit FETCH_HEAD
09:55 sbasso joined #git
09:55 rfi_ Should be NULL-deref, so not exploitable, just bug.
09:56 clmsy joined #git
09:56 Glowball joined #git
09:56 osse "fatal: FETCH_HEAD - not something we can merge"
09:58 nkhl joined #git
09:58 osse rfi_: on 2.7.4 i get a segfault
10:00 rfi_ OK, so the trunk detects the strange state and reports the error, 2.7.4 segfaults. I'll add a reference to the chat log to Ubuntu bug https://bugs.launchpad.net/ub​untu/+source/git/+bug/1670619
10:00 rfi_ Thanks for testing!
10:02 kevy0 joined #git
10:02 manuelschneid3r joined #git
10:03 chll_ joined #git
10:03 shyam joined #git
10:04 Glowball joined #git
10:04 kevy0 Hi , a very stupid question incomming. I cloned my repo to my local machine, cp'd some files. And now , my zsh prompt keeps saying I'm at the master branch, which is a bit confusing. I'm fairly new, how to remove the master branch from the files ?
10:04 irqq joined #git
10:04 mischat_ joined #git
10:04 kevy0 I tried using git branch -d <name> , won't work tho
10:05 ma5ter joined #git
10:05 _ikke_ kevy0: It's the repository that currently has the master branch checked out (and you can not remove the currently checked out branch_
10:05 _ikke_ Why is it a problem?
10:06 kevy0 well, not a real problem. It's just that it's my home directory saying master branch
10:06 nevodka joined #git
10:07 tobiasvl kevy0: then you also cp'ed the .git directory
10:07 tobiasvl probably not your intention
10:07 swalladge joined #git
10:07 Munt joined #git
10:07 kevy0 well bingo :p
10:07 kevy0 Thanks :)
10:09 Oatmeal joined #git
10:10 Snugglebash joined #git
10:11 Glowball joined #git
10:11 qt-x joined #git
10:16 marcogmonteiro joined #git
10:17 Abhinav joined #git
10:18 Glowball joined #git
10:19 sathed_ joined #git
10:20 Gravious joined #git
10:20 tvw joined #git
10:21 jnavila joined #git
10:22 Dumblez0r joined #git
10:23 robattila256 joined #git
10:24 Glowball joined #git
10:27 watabou joined #git
10:28 robattila256 joined #git
10:29 Silenced joined #git
10:32 wrouesnel2 joined #git
10:39 interrobangd joined #git
10:40 leeN joined #git
10:40 GodGinrai joined #git
10:41 afuentes joined #git
10:43 Cabanossi joined #git
10:44 SwiftMatt joined #git
10:45 Glowball joined #git
10:46 mischat joined #git
10:50 cdown joined #git
10:52 denisMone joined #git
10:55 jameser joined #git
10:56 mehola joined #git
10:56 Glowball joined #git
11:00 netj joined #git
11:00 humboldt joined #git
11:01 YuGiOhJCJ joined #git
11:04 Levex joined #git
11:05 dsdeiz joined #git
11:06 aard_ joined #git
11:07 hvn0413 joined #git
11:07 pitastrudl joined #git
11:08 qt-x joined #git
11:12 Silenced joined #git
11:13 Glowball joined #git
11:14 seni13 joined #git
11:14 venmx joined #git
11:15 seni13 joined #git
11:16 buzzLightBeer joined #git
11:18 tty04 joined #git
11:18 qt-x joined #git
11:18 tty04 Hi! I have a submodule that I want to checkout a tag using git hook. At the moment i have this line in the post-receive hook:
11:19 tty04 "git --work-tree=/path/to/project.checkout --git-dir=/path/to/project.git submodule update --init --recursive"
11:19 tty04 This is for WordPress as a submodule. (github.com/wordPress/WordPress/)
11:20 tty04 Anyone can help?
11:22 notebox joined #git
11:23 _ikke_ tty04: What is the question?
11:23 Silenced joined #git
11:23 Silenced joined #git
11:23 mischat joined #git
11:24 mischat joined #git
11:25 Gravious left #git
11:26 canton7 joined #git
11:27 hussam joined #git
11:27 _ADN_ joined #git
11:28 watabou joined #git
11:32 mazert_ joined #git
11:33 masuberu joined #git
11:34 hexagoxel joined #git
11:37 mischat joined #git
11:37 sarri joined #git
11:37 sarri joined #git
11:37 mischat joined #git
11:39 chipotle joined #git
11:40 jameser joined #git
11:46 bvcosta joined #git
11:47 govg joined #git
11:48 marianina8 joined #git
11:49 marcogmonteiro joined #git
11:52 jimi_ joined #git
11:52 xall_ joined #git
11:53 gechr joined #git
11:53 NTJS joined #git
11:55 gechr joined #git
11:56 DBag joined #git
11:58 GT4066 joined #git
11:59 neuro_sys joined #git
12:00 neuro_sys there's not an available flag for pruning branches that does not exist in the remote, right?
12:00 cousin_luigi joined #git
12:00 cousin_luigi Greetings.
12:01 * cousin_luigi is stuck trying to make a sparse checkout and the answers he's found didn't really solve his problem.
12:01 osse neuro_sys: git fetch --prune will remove origin/foo if foo no longer exists at origin
12:01 osse it won't remove local branches
12:02 dvaske joined #git
12:04 neuro_sys there's all sorts of ugly one liner scripts on the web, I think it would neat to have it in git
12:05 MineCoins joined #git
12:05 cousin_luigi How can I avoid not cloning a whole repository to download only a couple of paths? I have bandwidth constraints here.
12:08 marianina8 joined #git
12:09 moritz cousin_luigi: you can save bandwidth with --depth=1 on clone
12:09 cousin_luigi moritz: Won't that download something anyway?
12:09 osse neuro_sys: it would be easy to shoot oneself in the foot
12:09 moritz cousin_luigi: sure it will download something
12:09 cousin_luigi moritz: I guess it's the only way though.
12:09 buzzLightBeer joined #git
12:10 cousin_luigi moritz: Tell me, after that do I enable sparse checkout and set the directories I want and then what?
12:11 moritz cousin_luigi: then you can access a couple of paths, like you wanted
12:11 neuro_sys cousin_luigi: if you have write access to the repo, you can have a separate branch with the files you need, and clone only that branch perhaps? I'm not sure though.
12:12 cousin_luigi moritz: I mean what's the command afterwards?
12:12 cousin_luigi neuro_sys: I don't.
12:12 zxd joined #git
12:12 zxd what does the ^.. mean in $ git filter-branch --index-filter \   'git rm --ignore-unmatch --cached git.tgz' -- 7b30847^..
12:12 elisa87 joined #git
12:12 hvxgr joined #git
12:13 wxg joined #git
12:13 venmx joined #git
12:13 Cabanossi joined #git
12:14 elisa87 joined #git
12:14 GK___1wm____SU joined #git
12:14 thiago joined #git
12:15 stoopkid joined #git
12:15 elisa87 joined #git
12:16 nedbat zxd: it means the parent of that commit
12:17 elisa87 joined #git
12:17 GK___1wm____SU joined #git
12:18 Levex joined #git
12:18 moritz cousin_luigi: there's no command afterwards
12:18 tobiasvl zxd: specifically, ^ means the parent, .. means the range between that commit and nothing, which uses HEAD by default. so it's 7b30847^..HEAD
12:18 moritz cousin_luigi: then you have the files
12:19 shinnya joined #git
12:19 elisa87 joined #git
12:20 elisa87 joined #git
12:22 elisa87 joined #git
12:22 tsdev joined #git
12:24 bremner I have the output from git show, can I apply it in a "nice" way preserving author and commit message?
12:25 GK___1wm____SU joined #git
12:26 brent__ joined #git
12:26 nevodka bremner, what would you like to do with the output
12:26 Levex joined #git
12:26 bremner basically I'd like to git am the patch, but  it's in the wrong format
12:27 Dumblez0r joined #git
12:27 cousin_luigi moritz: k, thanks
12:27 osse where does the output come from ?
12:27 osse bremner:
12:28 ankit01ojha joined #git
12:28 nedbat osse: bremner said it was from "git show"
12:28 nevodka bremner, you can use tail/head
12:28 nevodka and concatenate the strings
12:28 raijin joined #git
12:29 nevodka it may be a bit hacky though
12:29 wrouesnel2 joined #git
12:30 nevodka echo "$(git show | head -2 | tail -1)""$(git show | tail -1)"
12:30 nevodka for example
12:30 bremner umm. someone else ran git show and sent me the results
12:31 Panacea joined #git
12:31 osse bremner: just changing "Author:" to "From:" worked here in my simple example
12:31 bremner cool
12:31 nevodka looking at the man page there seems to be a whole set of formatting tools
12:31 osse bremner: might screw you over if their name is ÆÅÆØÆåøæøåæøå
12:31 nevodka so you probably dont need something like that
12:32 jast for future reference, if you want something to be appliable later, git format-patch is the tool of choice
12:32 bremner yes. I'm aware.
12:32 bremner but I don't feel like yelling at the person who is fixing my bugs for me ;)
12:32 jast oh right, didn't see it was you :)
12:33 jast no need to yell, just let them know it's an option
12:33 bremner ack
12:33 sgfgdf joined #git
12:34 jast and a friendly cluebat over the head maybe
12:35 marcogmonteiro joined #git
12:35 zxd what's the difference between git binary executable and all the git-foobars
12:37 osse nothing
12:40 buzzLightBeer joined #git
12:41 GodGinrai joined #git
12:41 DolphinDream joined #git
12:43 zxd in my box they aren't symlinks
12:43 Cabanossi joined #git
12:43 osse they're hardlinks
12:44 rchavik joined #git
12:48 xall_ joined #git
12:49 WayToDoor joined #git
12:54 kpease joined #git
12:56 kpease_ joined #git
12:57 parasite_ joined #git
13:00 Sound joined #git
13:06 mischat joined #git
13:08 mazert_ joined #git
13:13 masuberu joined #git
13:13 Levex joined #git
13:14 tormachris joined #git
13:16 eroux joined #git
13:16 jameser joined #git
13:17 elect_ joined #git
13:18 Levex joined #git
13:18 elect__ joined #git
13:18 GodGinrai joined #git
13:19 jagob joined #git
13:24 darkbit joined #git
13:26 marcogmonteiro joined #git
13:26 cdg joined #git
13:27 jameser joined #git
13:28 cdg joined #git
13:30 watabou joined #git
13:32 Cavallari joined #git
13:36 Darcidride joined #git
13:37 sgen joined #git
13:42 Cabanossi joined #git
13:45 zeth joined #git
13:45 thiago joined #git
13:46 ToBeCloud joined #git
13:46 nowhereman joined #git
13:47 amrits joined #git
13:47 frk joined #git
13:48 GK___1wm____SU joined #git
13:49 jeffreylevesque joined #git
13:50 dviola joined #git
13:55 jdl joined #git
13:58 ExoUNX joined #git
13:59 BackEndCoder joined #git
14:00 dandaman joined #git
14:02 mischat joined #git
14:02 synthroid joined #git
14:03 CEnnis91 joined #git
14:03 mischat joined #git
14:05 jameser joined #git
14:08 brillenfux joined #git
14:08 skalpin joined #git
14:13 theoceaniscool joined #git
14:16 yqt joined #git
14:17 Cavallari1 joined #git
14:17 pur3eval joined #git
14:18 mda1 joined #git
14:18 bsanford joined #git
14:18 zzz joined #git
14:22 warthog9 joined #git
14:23 cdg_ joined #git
14:24 Panacea joined #git
14:24 Levex joined #git
14:27 Xgwu joined #git
14:28 troulouliou_div2 joined #git
14:31 Gloomy joined #git
14:32 watabou joined #git
14:32 porsche944 joined #git
14:33 livingstn joined #git
14:33 dvaske joined #git
14:34 ShekharReddy joined #git
14:35 sm_ joined #git
14:37 Levin^ joined #git
14:37 Levin^ hi
14:37 Levin^ I need to hire a freelancer to do some changes on my website, so I think I'll make a git repository for them to use
14:37 Levin^ what is the correct way to add the files and the database separately from the production environment so they have the liberty of making their changes, without affecting my currently published system?
14:37 Levin^ should I add all the media files (like images) and a database access?
14:39 tobiasvl Levin^: you can add anything (except passwords). they'll work on a clone, right? not directly in the production environment
14:39 Munt joined #git
14:40 Levin^ tobiasvl: yes
14:40 tobiasvl then it's up to you
14:41 tobiasvl is the database a flatfile? does it contain sensitive information?
14:41 Levin^ but do think I need to include a wp-config, or the developer can alter my website files without the need of a database?
14:41 publio joined #git
14:41 tobiasvl that's more of a wordpress question
14:41 Levin^ because it's solely some php setting
14:42 Levin^ hm
14:42 Dougie187 joined #git
14:44 Es0teric joined #git
14:44 jameser joined #git
14:44 BackEndCoder joined #git
14:45 sm_ hello
14:45 gitinfo sm_: 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.
14:45 sm_ have some queries
14:45 AK joined #git
14:46 sm_ regarding gsoc microprojects
14:46 sm_ where i can find the repo for those microprojects
14:46 bannakaffalatta joined #git
14:47 brent__ joined #git
14:47 marianina8 joined #git
14:47 Levex joined #git
14:48 _ikke_ sm_: There's the git.git project
14:48 _ikke_ git::master
14:48 gitinfo Git web link: https://github.com/git/git/commits/master
14:48 tobiasvl sm_: here's a list of ideas, but not sure about "the repo" https://git.github.io/SoC-2017-Microprojects/
14:49 nickabbey joined #git
14:49 j7k6 joined #git
14:49 sm_ yes i can find the microprojects but nor the repo
14:49 _ikke_ sm_: you contribute by sending patches to the !mailing_list
14:49 gitinfo sm_: 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:49 _ikke_ sm_: the git repo is available at many places
14:49 _ikke_ github being one of them
14:49 mash_ Does the order of the functions in the git source code matter apart from define before use? Question would be if it matter where I put a newly defined function?
14:49 GodGinrai joined #git
14:49 amosbird joined #git
14:50 sm_ _ikke_: thanks
14:50 bsanford joined #git
14:51 AaronMT joined #git
14:51 _ikke_ mash_: I don't think it matters too much. Place it where it makes most sense (ie, if it's a helper function, close to where it's used.
14:53 mischat joined #git
14:54 synthroid joined #git
14:55 Es0teric joined #git
14:56 mischat joined #git
14:58 mehola joined #git
14:58 Guest38728 joined #git
15:00 SilverBe joined #git
15:01 Derperperd joined #git
15:01 hasc joined #git
15:03 guampa joined #git
15:04 mischat joined #git
15:05 Emperor_Earth joined #git
15:05 Levex joined #git
15:06 XenophonF joined #git
15:06 Derperperd joined #git
15:06 LazyLama joined #git
15:09 Derperperd joined #git
15:09 madewokherd joined #git
15:10 Derperperd joined #git
15:11 M-erwin joined #git
15:12 M-erwin left #git
15:12 Cabanossi joined #git
15:14 Levex joined #git
15:15 kristofferR joined #git
15:17 Tobbi joined #git
15:17 sm_ Levin^: you are talking about some website
15:18 sm_ that need freelancing
15:19 raijin joined #git
15:21 Munt joined #git
15:22 matumbo left #git
15:23 lamicka joined #git
15:23 mischat joined #git
15:24 mischat joined #git
15:25 marcogmonteiro joined #git
15:26 dkdwtq joined #git
15:27 scottjl joined #git
15:28 blackwind_123 joined #git
15:28 GreySunshine joined #git
15:29 al-damiri joined #git
15:30 mischat joined #git
15:30 ych joined #git
15:31 Chrismeister joined #git
15:32 Chrismeister Hello, I want to reset my whole git directory to the last commit. I try 'git checkout' but I does not seem to work
15:32 _ikke_ just git checkout is a noop
15:32 watabou joined #git
15:32 moritz git checkout HEAD .
15:33 Chrismeister When I type git checkout it says:
15:33 Chrismeister M    main.pi
15:33 Chrismeister *py
15:33 Chrismeister And nothing seem to happen
15:33 pur3eval joined #git
15:33 re1 joined #git
15:34 Chrismeister ah 'git checkout .' worked
15:34 mikecmpbll joined #git
15:34 Chrismeister thx
15:35 srandon1213 joined #git
15:35 shgysk8zer0_ joined #git
15:36 gtristan joined #git
15:37 kenansulayman joined #git
15:38 perlpilot joined #git
15:39 GK___1wm____SU joined #git
15:39 cust joined #git
15:39 HardlySeen joined #git
15:39 matumbo joined #git
15:41 trion joined #git
15:41 puff Good morning.
15:43 biertie joined #git
15:44 mischat_ joined #git
15:44 mikecmpbll joined #git
15:44 cdg joined #git
15:45 mischat_ joined #git
15:46 matumbo joined #git
15:47 tty04 joined #git
15:47 BackEndCoder joined #git
15:48 GK___1wm____SU joined #git
15:48 Tobbi joined #git
15:49 tty04 Hi. I need to checkout the latest tag of a submodule using git hooks. I am currently getting the latest of the master like this: http://pastebin.com/mNvwPkMv
15:49 tty04 Anyone can help?
15:50 Vinnie_win joined #git
15:50 crose joined #git
15:50 GK___1wm____SU joined #git
15:51 Gsham joined #git
15:52 cust joined #git
15:52 boombatower joined #git
15:53 GK___1wm____SU joined #git
15:54 Orphis joined #git
15:54 cliluw joined #git
15:56 GK___1wm____SU joined #git
15:57 elect joined #git
15:59 mischat joined #git
15:59 jimklo joined #git
15:59 Gustavo6046 joined #git
16:02 holodoc joined #git
16:02 kristofferR joined #git
16:02 cliluw joined #git
16:02 Bizkit joined #git
16:03 tty04 Hi. I need to checkout the latest tag of a submodule using git hooks. I am currently getting the latest of the master like this: http://pastebin.com/mNvwPkMv
16:04 tty04 Anyone with previous experience with submodules, git hooks and latest tags checkout?
16:04 Levin^ git commit command stores my changes into my .git folder, right?
16:04 thiago joined #git
16:05 Dumblez0r joined #git
16:05 Levin^ and git add stages my changes, before storing with git commit, right?
16:05 osse yes
16:05 Levin^ ok, thanks
16:05 zivester joined #git
16:06 osse Levin^: git add actually creates most of the stuff in .git
16:06 sbasso joined #git
16:06 osse ♫ ♪ git commit puts a ring on it ♪
16:07 phy1729 If you like the tree then you should have put a commit on it
16:07 Derperperd joined #git
16:07 osse actually... i wonder if git add just creates the blobs, while git commit creates all the trees as well as the commit object itself
16:07 * osse tests
16:08 CrypticGator joined #git
16:08 qqx Regardless of that I think it's still accurate to say thata `git add` creates most of the stuff in .git.
16:09 osse commit at least creates the top level tree
16:09 Levin^ I'm too early in the learning process to be able to read the .git folder :[
16:09 osse Levin^: it's mostly for the perversely curious. you never need to *actually* go in there an look for stuff
16:10 phy1729 But it can help to have a mental model of what's going on
16:10 osse tty04: normally what you do is make the submodules point to the commit you actually want and then you just get it for free.
16:10 Levin^ I'd love to understand it though
16:10 osse tty04: if you want to use a different commit than what is recorded for some reason, then I tink the manual way is the only way
16:11 osse e.g. find the most recent tag yourself and check it out. (git tag -l can sort by version)
16:11 Levin^ as the same way I'd love to understand a smartphone's hardware, even it's not needed
16:11 phy1729 Levin^: https://git-scm.com/book/en/v2/Git​-Internals-Plumbing-and-Porcelain  is a pretty good intro to the internals, but you should probably read the beginning of the book first
16:12 osse Levin^: to that end this is pretty good: https://www.youtube.com/watch?v=ig5E8CcdM9g
16:12 Levin^ I'm reading a beginner's book, I'm still new to git
16:12 NeXTSUN joined #git
16:12 tty04 osse: this is a wordpress submodule so getting the latest tag means i get the latest stable commit.
16:13 Cabanossi joined #git
16:13 osse when why is that commit not registered as *the* commit to use in the superproject?
16:13 Levin^ so I'll get used to the commands, then, after I'm understanding everything, I'll go and take a look at the internals
16:13 vuoto joined #git
16:13 cdown joined #git
16:14 osse sounds good to me
16:14 thiago joined #git
16:14 bvcosta joined #git
16:15 Levin^ so, after commiting locally, I can go and send it to a web repository, right?
16:15 osse yes
16:15 Levin^ ok
16:15 dave0x6d joined #git
16:16 GK___1wm____SU joined #git
16:18 Munt joined #git
16:19 clemf joined #git
16:20 s1scha joined #git
16:21 sbasso joined #git
16:21 GK___1wm____SU joined #git
16:21 pwndave joined #git
16:22 wald0 joined #git
16:23 pwndave joined #git
16:23 hahuang61 joined #git
16:24 cliluw joined #git
16:26 gwolff joined #git
16:27 sloj joined #git
16:28 sloj Hello, can someone please help me with something?
16:28 sloj I'm using cloud9 and want to remove a file from my folder
16:29 sloj If I create a file, I have to then add it, commit and then push
16:29 sloj Does deleting a file only require me to commit and push?
16:29 Chrismeister !give Chrismeister testcase
16:29 _ikke_ You need to remove it too
16:29 sloj How do I remove it?
16:29 Chrismeister !testcase
16:29 Chrismeister Whoops, wrong channelö
16:29 _ikke_ sloj: git rm (--cached) <file>
16:29 sloj What does --cached mean?
16:29 _ikke_ sloj: --cached if you want to keep it locally
16:30 elisa87 joined #git
16:30 xall_ joined #git
16:31 sloj Thank you _ikke_
16:31 Murii joined #git
16:32 janx sloj: if you just `rm <file>` without a `git rm <file>`, you'll see that the file removal is detected by Git, but remains in the "unstaged" area of `git status` (changes that are not staged don't get included in commits). `git rm <file>` can delete the file and stage this change for a future `git commit`
16:32 des_consolado joined #git
16:32 elisa87 joined #git
16:32 des_consolado hey how can I run the git-diff command from a completely different directory and still use the HEAD?
16:32 sloj Without "git" only the local file is removed?
16:32 des_consolado like I want to do something like: git diff /my/custom/repo/path HEAD
16:33 achadwick joined #git
16:33 _ikke_ des_consolado: git -C /my/custom/repo/path diff HEAD
16:33 des_consolado (this is just so I can use ssh to run the command so that I can use pbcopy from my mac to copy to clipboard)
16:33 des_consolado ah ty
16:33 GK___1wm____SU joined #git
16:34 brent__ joined #git
16:34 janx sloj: yes, whereas with `git rm <file>` the local file is removed and that change will be included in your next commit (also `git rm --cached <file>` will keep the local file, but still include its removal in the next commit. you can do this if you want to keep the file locally but not track its changed with Git)
16:34 elisa87 joined #git
16:34 sloj Ah, so if I still want to work on it in private, I should use --cached?
16:35 _ikke_ yes
16:35 watabou joined #git
16:35 sloj And pushing the commit with git rm will also remove the file in the repository?
16:35 _ikke_ When you merge such a commit, then yes
16:35 brent__ joined #git
16:36 sloj I have to merge it?
16:36 _ikke_ (not sure how cloud9 uses git)
16:36 YuGiOhJCJ joined #git
16:36 sloj I can add a file to the repository with add, commit then push
16:36 elisa87 joined #git
16:36 _ikke_ Then that same workflow should work for removing files too
16:37 janx _ikke_: cloud9 doesn't use git itself, it just gives you a terminal where you can do what you want with git
16:37 skalpin If I do a git merge dev --no-ff, remove the changes I don't want right now, and then do a 'git merge dev' will I get the changes I had previously removed?
16:37 bremner what do you mean by "remove"
16:38 vuoto joined #git
16:38 skalpin bremner: I mean undo
16:38 elisa87 joined #git
16:39 elisa87 joined #git
16:39 Gsham joined #git
16:40 hahuang65 joined #git
16:40 TbobbyZ joined #git
16:40 zxd how will history log  'git log'  after a merge will look like ? in https://git-scm.com/docs/git-merge they say  "record the result in a new commit along with the names of the two parent commits" it will show two sha-1 in the log as a parent of the created commit after the merge?
16:41 TbobbyZ joined #git
16:41 elisa87 joined #git
16:41 renatosilva joined #git
16:42 snits` left #git
16:42 Cabanossi joined #git
16:43 snits joined #git
16:43 renatosilva left #git
16:43 _ikke_ Not by default
16:43 _ikke_ (if you add --parents, it will)
16:43 Levex joined #git
16:44 _ikke_ if you use --oneline --graph, you see the two sides being joined together
16:44 cliluw joined #git
16:44 mischat joined #git
16:45 ertes joined #git
16:45 zxd that's confusing _ikke_
16:45 _ikke_ What is confusing?
16:45 aielima joined #git
16:46 mash_ Should test cases be added when adding/modifing behavior to/of a future that is currently not being tested?
16:46 zxd two parents
16:46 mash_ s/future/feature/
16:47 Levin^ left #git
16:47 _ikke_ mash_: Adding extra text coverage is always a bonus
16:47 sloj I have a question, when changing a file, it says "Changes not staged for commit:"
16:47 sloj It doesnt let me commit
16:47 _ikke_ zxd: Why is that confusing?
16:47 _ikke_ sloj: You need to stage the changes first
16:48 vuoto joined #git
16:48 imack joined #git
16:48 sloj I add the files again?
16:48 _ikke_ git add stages changes
16:49 Vampire0_ joined #git
16:49 mikecmpbll joined #git
16:50 Guest38728 joined #git
16:51 sloj Why do I have to do that though?
16:51 Jdox joined #git
16:51 _ikke_ !staging
16:51 gitinfo [!index] The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/​Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
16:51 _ikke_ sloj: It lets you specify exactly what you want to commit
16:52 dviola joined #git
16:52 zxd _ikke_: if I am checking out to a branch with two parents how would it know which parent in the tree to follow for building the work tree?
16:52 _ikke_ zxd: each commit is a snapshot
16:52 _ikke_ zxd: It contains the whole tree
16:53 _ikke_ (though, by reference, so content is not duplicated)
16:53 orbyt_ joined #git
16:53 overlord_tm joined #git
16:53 Tobbi joined #git
16:54 _ikke_ So git does not have to follow history back to get all the files, it just needs to look at a single commit
16:54 matt_m joined #git
16:54 buzzLightBeer joined #git
16:54 robotroll joined #git
16:55 kristofferR joined #git
16:58 jagob joined #git
16:59 zxd _ikke_: the commit reference another commit or a tree correct?  so after a merge it will point to two commit references?
16:59 BeerSerc joined #git
17:00 _ikke_ zxd: A commit references one tree, and 0 or more other commits
17:00 tang^ joined #git
17:01 _ikke_ It's not an or, there is always one tree object
17:01 gwolff joined #git
17:01 svm_invictvs joined #git
17:01 thiago joined #git
17:02 JordiGH joined #git
17:02 uhmgawa^3 joined #git
17:02 JordiGH How do you disable all pack files? For pedagogical purposes, I don't want any repo compression.
17:03 GK___1wm____SU joined #git
17:04 _ikke_ man git unpkack-objects
17:04 gitinfo the git manpage is available at http://jk.gs/git.html
17:04 _ikke_ man git unpack-objects
17:04 gitinfo the git-unpack-objects manpage is available at http://jk.gs/git-unpack-objects.html
17:04 pur3eval joined #git
17:04 Munt left #git
17:04 _ikke_ Not sure if that does exactly what you want, but that's the only thing I can find quickly
17:05 dreiss joined #git
17:05 JordiGH I would like them to not get created in the first place.
17:06 ayogi joined #git
17:06 blackwind_123 joined #git
17:07 fckfreenode joined #git
17:07 dbear joined #git
17:08 gusnan joined #git
17:08 fckfreenode what's the difference between git and other VCSs in how they recognize changes?
17:08 dbear fckfreenode: git is a completely distributed repository with version control
17:09 fckfreenode dbear: as in the difference between snapshots
17:09 dbear I can't compare it to others because I haven't used others as a developer
17:09 fckfreenode for example, how subversion tracks a change and how git tracks a change
17:09 fckfreenode ah ok
17:10 GK___1wm____SU joined #git
17:10 _ikke_ I'm not familiar with how svn stores history
17:10 chardan joined #git
17:10 _ikke_ mercurial stores diffs
17:10 dbear I've only used subversion and cvs for pulling latest stable code, never as a contributor
17:10 JordiGH fckfreenode: Git stores the entire content of the file (with some minor and opaque optimisation via pack files). Mercurial does the same thing, but bitkeeper uses the SCSS weave format which is kind of like a set of edit instructions to go from one revision of the file to another.
17:11 JordiGH _ikke_: hg stores diffs in the same way that git stores pack files: an opaque optimisation. Conceptually, it stores snapshots just like git.
17:11 _ikke_ ok
17:11 fckfreenode ok so say you edit two files in a large directory and make a commit, how is this stored in git?
17:11 nickabbey joined #git
17:11 Sound joined #git
17:11 dbear If I am currently checked out on a branch called 'xyz' and I do a git fetch, will 'master' be put in to my 'xyz' branch? or will the branches remain separate until merged?
17:12 JordiGH fckfreenode: The file contents are hashed, their hashes are pointed to by a tree object, and a commit is made that points to this tree object, along with metadata such as time, author, commit message and that commit object is hashed again.
17:12 fckfreenode will it just store the two changed files in a new snapshot and reference all the unchanged files from a previous snapshot?
17:12 _ikke_ dbear: THe latter, git fetch does not change any local branches (only the remote tracking branches)
17:12 _ikke_ fckfreenode: correct
17:12 JordiGH fckfreenode: Yes.
17:12 _ikke_ But the tree objects contains a reference to all files
17:13 _ikke_ All files part of that commit
17:13 _ikke_ Not just the files you changed
17:13 multi_io joined #git
17:13 dbear _ikke_: ok, thanks. I'm trying to teach some high school students git in a programming class and I don't want them to be checked out in to 'private' branches, and have accidental git pull or fetch do surprising things
17:13 fckfreenode is there a graphic that depicts this?
17:14 _ikke_ dbear: git pull does do a merge, though
17:14 _ikke_ fckfreenode: !gcs and !book
17:14 gitinfo fckfreenode: [!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
17:14 gitinfo fckfreenode: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
17:14 GK___1wm____SU joined #git
17:14 fckfreenode _ikke_: yeah currently reading pro git, just wanted to clarify what i was reading
17:15 fckfreenode i'll check out gcs though, thanks
17:15 _ikke_ gcs does not show how trees and objects are referenced (I hoped it did)
17:16 fckfreenode ah ok
17:16 fckfreenode maybe i'll revisit this topic once i've finished the book
17:16 fckfreenode it might be covered later in the book too
17:16 nowhereman joined #git
17:16 _ikke_ I know the book does cover this
17:16 _ikke_ Chapter 10
17:18 dbear _ikke_: outch - git pull merge 'from the central' repo to the local?
17:19 _ikke_ dbear: git pull == git fetch + git merge
17:19 dbear _ikke_: so should all user merge the 'xyz' branch in their local repo BEFORE doing any git pull? or should we just use git fetch exclusively?
17:20 _ikke_ dbear: it's not a matter of always doing x, or always doing y
17:20 dbear _ikke_: i'm just now getting a clue about how much anarchy can ensue with git.. so we just want to establish some 'common' practices
17:21 Pseudocrat joined #git
17:21 Pseudocrat joined #git
17:21 _ikke_ dbear: What often happens is that people do git pull all the time to 'synchronize' resulting in lots of merges, making your history really complicated and hard to follow
17:21 fckfreenode _ikke_: what exactly is check-summing, and what's its purpose?
17:22 fckfreenode (from my understanding it's generating a hash based on the contents of a file)
17:22 Hink joined #git
17:22 fckfreenode not sure if that's right though
17:22 _ikke_ fckfreenode: that's correct
17:22 _ikke_ a hash is a type of checksum
17:23 dbear _ikke_: so we should not git pull at the beginning of class, then git push at the end?
17:23 fckfreenode _ikke_: so a file with "this is content" vs "this is not content" will have a different checksum?
17:23 _ikke_ fckfreenode: correct
17:23 fckfreenode _ikke_: and why is it so important?
17:23 _ikke_ fckfreenode: git uses hashes to refer to files
17:23 dbear Would love links to 'how to use git in education' in a classroom setting if anyone has such a thing
17:23 uhmgawa^2 joined #git
17:24 fckfreenode _ikke_: ah so it's like an identifier? like ID in a database
17:24 cdg_ joined #git
17:24 MineCoins joined #git
17:24 _ikke_ fckfreenode: It is something like that
17:24 cdown joined #git
17:24 fckfreenode ok, thanks
17:25 _ikke_ dbear: if 2 people push after eachother, the last one of them would be rejected
17:25 Darcidride joined #git
17:25 _ikke_ dbear: I think it's important to visualize what happens
17:26 _ikke_ dbear: !learn_git_branching might help
17:26 gitinfo dbear: A nice tutorial visualizing git branching: http://pcottle.github.io/learnGitBranching/
17:26 cdown joined #git
17:26 dbear _ikke_: what if the check out their own branches, then do git fetch to get updates for master and other branches at the start of class. Then we have git push at the end so that branches get updated. BTW, we are using gitlab for our central repo store.
17:26 dbear gitinfo: thanks. looking at it now
17:26 gitinfo dbear: you're welcome, but please note that I'm a bot. I'm not programmed to care.
17:27 dbear gitinfo: well, then you are a polite bot
17:27 _ikke_ dbear: each student using their own branch is a good idea
17:28 _ikke_ dbear: I'm not sure what kind of students they are, but developing a good workflow would make things a lot easier
17:28 dbear _ikke_: agreed, thats what I'm trying to come up with
17:28 dbear so, if they all have their own named branches, do regular git fetch
17:28 _ikke_ simulating real-world scenarios, ie, i'm working on a feature, then that feature gets merged back in
17:29 oleksiyp joined #git
17:29 _ikke_ dbear: note that git fetch does not update their local master
17:29 _ikke_ it updates a remote tracking branch, called origin/master by default
17:29 dbear _ikke_ arg, just when I thought I understood --
17:29 GK___1wm____SU joined #git
17:29 _ikke_ dbear: Do you understand the concept of namespaces?
17:30 dbear _ikke_: python names spaces ok, git namespace, I don't understand the power yet
17:30 GK___1wm____SU joined #git
17:30 _ikke_ same idea
17:31 dbear _ikke_: so a branch creates a namespace?
17:31 _ikke_ branches are part of a concept called refs (references)
17:32 dbear _ikke_: I hate the way I learn -- I have to know too much to get it...
17:32 _ikke_ What you call branch master, git calls a ref, named refs/heads/master (fully qualified name)
17:32 dbear _ikke_: ok
17:32 dbear I've seen references to HEAD
17:32 _ikke_ I delibaretely try to give some more background
17:32 j416_ joined #git
17:33 _ikke_ dbear: Yeah, HEAD is a so called symolic ref, it points to another ref (normal refs just points to commits)
17:33 _ikke_ HEAD -> ref -> commit
17:33 _ikke_ When you fetch from a remote, git creates (or updates) a different kind of ref
17:33 cdown joined #git
17:33 _ikke_ refs/remotes/<remotename>/<branchname>
17:34 dbear _ikke_: ok
17:34 _ikke_ so if I fetch from a remote called origin, which has a branch called master, it will update refs/remotes/origin/master
17:34 Will1892 joined #git
17:34 _ikke_ which you can call origin/master
17:34 dbear _ikke_: ok, makes sense, git push origin master --
17:35 _ikke_ dbear: right, but note that is a bit different
17:35 _ikke_ origin/master is a single branch
17:35 rominronin joined #git
17:35 dbear _ikke_ : origin puts to the remote -- master is the name of the branch
17:35 _ikke_ in git push origin master, origin and master are 2 parameters,
17:36 watabou joined #git
17:36 dbear correction -- origin points to the remote repo
17:36 _ikke_ correct
17:36 durham joined #git
17:36 dbear the origin settings in .git config have the URI for that
17:36 Hink joined #git
17:36 _ikke_ also correct
17:36 _ikke_ so, in origin/master, origin is (part of) a namespace
17:37 _ikke_ (which is equal to the remote name)
17:37 dbear ok
17:37 _ikke_ with me so far?
17:37 dbear so if I git push origin xyz than I am pushing branch xyz?
17:37 Forlorn joined #git
17:37 _ikke_ correct
17:37 gwolff joined #git
17:37 j416_ left #git
17:38 _ikke_ for completeness: that's the same as: git push origin refs/heads/xyz:refs/heads/xyz
17:38 cdown joined #git
17:38 dbear _ikke_: the shorter syntax works better for my typing skills..
17:38 dreiss joined #git
17:38 _ikke_ yup, that's why git does not require you to fully qualify it :)
17:39 _ikke_ So when you fetch, all the remote tracking branches are updated (refs/remotes/*)
17:39 _ikke_ Your local branches are left alone
17:39 _ikke_ It's up to you to decide to merge in the commits you fetched (or rebase on top if those commits)
17:40 _ikke_ you can first check what has been fetched
17:40 _ikke_ so for example:
17:40 _ikke_ git fetch origin #fetch latest changes from origin
17:40 dbear _ikke_: ok - so a student workflow would include their own named 'branch', the can do git push while checked out in their own branch
17:40 _ikke_ git log master..origin/master #see what commits the remote has, which you have not incorporated locally yet
17:41 matt_m joined #git
17:41 _ikke_ dbear: correct
17:41 d0nn1e joined #git
17:41 dbear _ikke_ then get fetch origin ___ will grab all 'refs' from origin and update the local repo
17:42 _ikke_ yeah, just the remote tracking branches
17:42 vuoto joined #git
17:42 svm_invictvs joined #git
17:42 dbear they could then change their namespace by git checkout 'otherguy' to select other branches that have not yet been merged
17:43 dbear git push origin 'mybranch' makes commits to my branch available in the central repo
17:43 Doow joined #git
17:43 dbear then others could checkout my branch if they wanted... but should not plan on making modifications
17:44 dbear They could do git status, or git log to see what was done in 'mybranch'
17:44 _ikke_ git status shows local uncomitted changes, git log would be better
17:45 dbear but I think they will likely use the web ui to gitlab to see that
17:45 dbear _ikke_ ok -- yes,
17:45 dbear git log
17:45 _ikke_ dbear: Also tools like gitk will help
17:45 djb-irc joined #git
17:45 dbear _ikke_: looking at gitk
17:46 _ikke_ and !lol is a way to visualize it within git
17:46 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
17:46 Gsham joined #git
17:46 sargas joined #git
17:48 dbear _ikke_: the bots suggestion was interesting...
17:48 lesshaste left #git
17:48 Will1892 joined #git
17:49 dbear _ikke_: thanks for all the suggestions.. I liked gitk --
17:49 dbear bell is about to ring.
17:49 dbear gotta go
17:49 _ikke_ alright, success
17:51 jeffreylevesque joined #git
17:52 skalpin joined #git
17:54 skered joined #git
17:55 uhmgawa^3 joined #git
17:55 cliluw joined #git
17:55 mischat_ joined #git
17:56 a3Dman joined #git
17:57 ayogi joined #git
17:57 tdkqup joined #git
17:58 Derperperd joined #git
17:59 nickabbey joined #git
17:59 [Brain] joined #git
18:00 fckfreenode _ikke_: is "git add X" adding a file to staging?
18:00 fckfreenode or making it tracked
18:01 mikeputnam joined #git
18:01 _ikke_ fckfreenode: a file starts to be tracked by staging it.
18:01 fckfreenode _ikke_: by "git add"-ing it?
18:01 _ikke_ yes
18:01 fckfreenode ah ok, got it
18:01 Glowball joined #git
18:02 _ikke_ for git, there is not much difference between staging a new file, and staging changes to an existing file
18:03 nevodka joined #git
18:04 JordiGH left #git
18:04 fckfreenode understood, thanks
18:04 kpease joined #git
18:05 diogenese joined #git
18:06 bloody_albatross joined #git
18:06 radoslavcap joined #git
18:07 bloody_albatross I did split a single file into a new repo (clone, then filtered out everything else). then I ran gc (all kinds of options), reflog expire, repack etc. but the repo is still 56MB
18:07 bloody_albatross even when I make a new clone
18:07 shgysk8zer0_ joined #git
18:07 bloody_albatross what do I need to do to get the size down?
18:09 _ikke_ How did you filter out everything else?
18:09 sloj joined #git
18:09 NeXTSUN joined #git
18:10 sloj Hello, I would like to know, if i have to merge branch B into branch A using the command merge, I have to be inside branch A, then do git merge B?
18:10 sloj Or do I have to be in branch B and do git merge A?
18:11 Levex joined #git
18:12 uhmgawa^2 joined #git
18:12 dandaman joined #git
18:13 _ikke_ You always merge into the current branch
18:13 _ikke_ so, checkout A, merge B
18:13 sloj The word merge is a bit different in my language
18:14 sloj Thanks _ikke_
18:14 sloj Also merging B -> A will not remove B?
18:14 mikecmpbll joined #git
18:14 moritz nope, won't remove anything
18:15 porsche944 joined #git
18:15 sloj Okay thank you
18:15 ayogi joined #git
18:17 MineCoins joined #git
18:17 rominronin joined #git
18:18 sloj Why does my branch A have no changes when I merge B -> A?
18:19 nixjdm joined #git
18:20 GK___1wm____SU joined #git
18:22 LeBlaaanc joined #git
18:24 GK___1wm____SU joined #git
18:25 guampa joined #git
18:25 marianina8 joined #git
18:27 hahuang65 joined #git
18:28 leitao joined #git
18:28 leitao how do I find which remote branch contains a commit?
18:30 kadoban leitao: git branch -r --contains whatevercommit
18:30 utrack joined #git
18:30 leitao thanks
18:31 dreiss joined #git
18:31 bremner after fetching though
18:31 treehug88 joined #git
18:31 peeps[lappy] joined #git
18:32 DBag joined #git
18:32 Es0teric joined #git
18:33 Levex joined #git
18:34 ejb joined #git
18:34 nickabbey joined #git
18:35 helpmeplease joined #git
18:37 watabou joined #git
18:38 urda joined #git
18:39 Glowball joined #git
18:40 helpmeplease left #git
18:40 CrypticGator joined #git
18:42 okaov joined #git
18:44 Levex joined #git
18:45 radoslavcap joined #git
18:45 TomyLobo joined #git
18:45 manuelschneid3r joined #git
18:47 chachasmooth joined #git
18:48 j7k6_ joined #git
18:48 svm_invictvs joined #git
18:48 imack joined #git
18:50 pur3eval joined #git
18:51 navidr joined #git
18:51 gugah joined #git
18:53 leeN joined #git
18:53 webstrand joined #git
18:56 blr joined #git
18:57 Levex joined #git
18:58 Cabanossi joined #git
18:59 AaronMT joined #git
18:59 blr joined #git
18:59 sloj joined #git
19:00 mehola joined #git
19:00 sloj Hello, I have one question, when I merge two branches, B->A for example, does A automatically get the commits of B assigned to it?
19:01 nickabbey joined #git
19:01 sloj Before I merged A and B, commits specifically for B had a branch symbol and now that symbol is gone, I'm using bitbucket
19:01 rwp sloj, Commits before the merge, yes. Commits on B *after* the merge, no.
19:01 xissburg joined #git
19:02 sloj So the commits are not marked as commits only for B but for both B and A?
19:03 sm_1 joined #git
19:03 marenz_ joined #git
19:03 nickabbey joined #git
19:03 rwp Every commit is a fork. (Possibly with only one line out.) Every merge is a join. History is shared before joins. But if you commit again to a branch after the merge then it creates an additional history that has not yet been merged.
19:03 leitao joined #git
19:04 Levex joined #git
19:04 kpease joined #git
19:04 sloj Thanks rwp, I have little knowledge in how git works so sorry for asking a lot
19:04 rwp A merge commit joins together those two histories before that point. Anything after that point is new and would once again need to be merged if they are to be joined.
19:04 nickabbey joined #git
19:05 PioneerAxon joined #git
19:06 rwp Some people commit repeatedly to a branch and repeatedly join that branch into another. Looking at the history it looks like a sewing stitch looping out and back, out and back, repeatedly. It is one of the valid paradigms.
19:06 nickabbey joined #git
19:06 rwp Personally I don't prefer it. But there are many valid strategies for dealing with branches. Which is why there is no single answer.
19:07 rominron_ joined #git
19:07 Glowball joined #git
19:07 faux___ joined #git
19:07 rwp It is this flexibility that people like about git because it allows people do do what they want. And it is also that flexibility that new people hate about git, because it is so flexible. They want one answer but there are dozens.
19:09 sloj It's not that I hate it
19:09 sloj I like UI more than commands
19:09 akkad joined #git
19:11 Sasazuka__ joined #git
19:11 Sample joined #git
19:13 guampa joined #git
19:15 _ADN_ joined #git
19:16 inflames joined #git
19:17 Noldorin joined #git
19:17 w9qbj joined #git
19:17 tyreld joined #git
19:17 oleksiyp joined #git
19:19 marianina8 joined #git
19:22 cdg joined #git
19:22 blackwind_123 joined #git
19:23 GK___1wm____SU joined #git
19:23 aidalgol joined #git
19:25 vF3hNGxc47h8 joined #git
19:25 marianina8 joined #git
19:26 Hink joined #git
19:32 eroux joined #git
19:36 govg joined #git
19:37 todd_dsm joined #git
19:37 watabou joined #git
19:39 akkad joined #git
19:40 Hink joined #git
19:42 TikityTik joined #git
19:43 e01 joined #git
19:43 e01 joined #git
19:43 TbobbyZ_ joined #git
19:43 bket joined #git
19:44 math-alpha joined #git
19:44 Levex joined #git
19:45 kpease joined #git
19:45 holodoc joined #git
19:45 Forlorn joined #git
19:46 cdg joined #git
19:46 math-alpha joined #git
19:48 jeffreylevesque_ joined #git
19:48 math-alpha joined #git
19:49 Hink joined #git
19:49 faux___ joined #git
19:49 math-alpha joined #git
19:50 pur3eval joined #git
19:52 Hink joined #git
19:54 kyan joined #git
19:55 gugah_ joined #git
19:56 m0viefreak joined #git
19:56 ocelotsloth joined #git
19:57 nickabbey joined #git
19:57 Derperperd joined #git
19:58 sixcorners joined #git
19:58 cliluw joined #git
19:58 radoslavcap joined #git
19:58 jnavila joined #git
19:59 oskarkv joined #git
19:59 _ocelotsloth joined #git
20:00 urda joined #git
20:04 buzzLightBeer joined #git
20:04 cdown joined #git
20:05 gopar joined #git
20:06 impliednude joined #git
20:07 peterbecich joined #git
20:09 btree joined #git
20:09 eroux joined #git
20:10 btree left #git
20:11 batrick joined #git
20:13 Doow joined #git
20:13 trewe joined #git
20:14 ahr3n joined #git
20:16 peterbecich joined #git
20:17 jeffreylevesque joined #git
20:17 Levex joined #git
20:18 TbobbyZ joined #git
20:19 Guest2163 left #git
20:20 Forlorn joined #git
20:21 bvcosta joined #git
20:21 ariver joined #git
20:22 askb joined #git
20:22 crose joined #git
20:24 a_thakur joined #git
20:25 synthroid joined #git
20:25 matt_m joined #git
20:26 irqq joined #git
20:28 ocelotsloth joined #git
20:32 satifant joined #git
20:32 DARSCODE joined #git
20:33 dandaman joined #git
20:34 ocelotsloth_ joined #git
20:34 Levex joined #git
20:34 lucido-cl joined #git
20:37 MattMaker joined #git
20:38 watabou joined #git
20:39 rominron_ joined #git
20:39 Guest4561 joined #git
20:40 ocelotsloth_ joined #git
20:42 mischat joined #git
20:43 finalbeta joined #git
20:44 mischat joined #git
20:45 Sample joined #git
20:46 peterbecich joined #git
20:46 elisa87 joined #git
20:46 peterbec` joined #git
20:47 netj joined #git
20:47 elisa87 joined #git
20:47 Guest4561 left #git
20:49 j7k6_ joined #git
20:49 bket joined #git
20:49 t0by joined #git
20:49 t0by joined #git
20:49 elisa87 joined #git
20:50 Endarked joined #git
20:50 elisa87 joined #git
20:51 Sasazuka_ joined #git
20:51 jnavila joined #git
20:51 elisa87 joined #git
20:53 ocelotsloth_ joined #git
20:53 elisa87 joined #git
20:55 elisa87 joined #git
20:56 dandaman joined #git
20:56 overlord_tm joined #git
20:57 todd_dsm joined #git
20:59 clemf joined #git
21:00 tmg joined #git
21:01 ocelotsloth_ joined #git
21:03 NeXTSUN joined #git
21:06 Tobbi joined #git
21:09 mmlb joined #git
21:09 nfk joined #git
21:12 Cabanossi joined #git
21:17 PioneerAxon joined #git
21:23 synthroid joined #git
21:24 Sasazuka_ joined #git
21:25 _ocelotsloth joined #git
21:26 _ocelotsloth joined #git
21:26 dosequis joined #git
21:27 toothe left #git
21:27 DDBag joined #git
21:29 GodGinrai joined #git
21:30 dosequis hey all, I have a weird issue, I think... I have some code stashed from branch b, which is rebased on branch a. When I run 'git stash show -p' in branch a, I have 1 function being added to a file. However, if I 'git stash pop', it adds a bunch of code not shown in the 'git stash show -p'
21:30 dosequis the code is from branch b, by the way
21:31 ejb joined #git
21:32 raynold joined #git
21:33 DBag joined #git
21:33 jeffreylevesque joined #git
21:35 urda joined #git
21:35 muhannad_______ joined #git
21:37 thiago joined #git
21:37 duderonomy joined #git
21:38 netj joined #git
21:39 pur3eval joined #git
21:40 watabou joined #git
21:42 Cabanossi joined #git
21:44 masuberu joined #git
21:44 livingstn joined #git
21:45 Brando753 joined #git
21:45 Es0teric joined #git
21:46 Guma joined #git
21:46 jdl joined #git
21:48 dfas joined #git
21:49 disi joined #git
21:49 avar I'm currently browsing the cia's meme-y shitposting about git: https://wikileaks.org/ciav​7p1/cms/page_17072489.html
21:51 PioneerAxon joined #git
21:52 diogenese joined #git
21:58 nowhereman joined #git
21:59 Doow_ joined #git
22:00 fatalhalt joined #git
22:00 sbasso joined #git
22:03 avar Merge Boromir is in 3 different pages: https://wikileaks.org/ciav​7p1/cms/page_13205556.html / https://wikileaks.org/ciav​7p1/cms/page_3375428.html
22:05 ExoUNX joined #git
22:05 clemf_ joined #git
22:07 sarri joined #git
22:07 sarri joined #git
22:07 blackwind_123 joined #git
22:09 cdg_ joined #git
22:10 a3Dman joined #git
22:10 rominronin joined #git
22:10 Atm0spher1c joined #git
22:11 MonsterKiller left #git
22:13 Doow joined #git
22:13 PioneerAxon joined #git
22:13 ISmithers joined #git
22:15 Sasazuka__ joined #git
22:15 Gustavo6046 joined #git
22:16 swalladge joined #git
22:16 PioneerAxon joined #git
22:18 shinnya joined #git
22:18 ejb joined #git
22:18 _ocelotsloth joined #git
22:20 Atm0sphe1 joined #git
22:22 uranellus joined #git
22:22 uranellus joined #git
22:23 moei joined #git
22:24 moei joined #git
22:24 UTAN_dev joined #git
22:25 ygeLN joined #git
22:27 gugah joined #git
22:30 nickabbey joined #git
22:32 Sasazuka_ joined #git
22:34 chipotle joined #git
22:38 kristofferR joined #git
22:38 Noodlewitt joined #git
22:39 Hobbyboy joined #git
22:39 barteks2x joined #git
22:40 Sasazuka__ joined #git
22:40 pur3eval joined #git
22:41 watabou joined #git
22:41 bvcosta joined #git
22:43 Sasazuka_ joined #git
22:44 Eugene joined #git
22:44 cdown joined #git
22:48 urda joined #git
22:49 clemf joined #git
22:50 j7k6_ joined #git
22:53 matt_m joined #git
22:53 dviola joined #git
22:53 blr joined #git
22:55 bulletmark joined #git
22:56 gugah joined #git
22:57 cdg joined #git
22:59 Gloomy joined #git
23:01 mehola joined #git
23:03 jeffreylevesque_ joined #git
23:04 livingstn joined #git
23:06 Noodlewitt joined #git
23:07 overlord_tm joined #git
23:08 tmg joined #git
23:09 Dougie187 left #git
23:10 barteks2x joined #git
23:10 cdown joined #git
23:10 Hobbyboy joined #git
23:10 DolphinDream joined #git
23:10 joeco joined #git
23:11 Darren_ joined #git
23:12 tvw joined #git
23:13 Gsham joined #git
23:13 Cabanossi joined #git
23:13 bannakaffalatta joined #git
23:14 cdown joined #git
23:16 cliluw joined #git
23:17 skered joined #git
23:17 hahuang65 joined #git
23:18 tang^ joined #git
23:19 glebihan_ joined #git
23:19 dserodio joined #git
23:19 dserodio joined #git
23:20 todder joined #git
23:20 qsx joined #git
23:21 z01d joined #git
23:21 JrCs joined #git
23:23 courrier joined #git
23:23 selckin joined #git
23:24 roger_raymond joined #git
23:24 SmashingX joined #git
23:24 jamick joined #git
23:24 SmashingX where are the ssh public and private keys stored in git client for windows?
23:27 ftoulemon joined #git
23:27 JrCs joined #git
23:27 Zialus joined #git
23:27 Synthead joined #git
23:27 Gabemo joined #git
23:27 z01d joined #git
23:27 Noodlewitt joined #git
23:28 venmx joined #git
23:28 markovh joined #git
23:28 markovh joined #git
23:29 _ocelotsloth joined #git
23:30 safe joined #git
23:30 Noodlewitt joined #git
23:30 mjuszczak joined #git
23:33 jimi_ joined #git
23:34 whaley joined #git
23:36 barteks2x joined #git
23:37 Gsham joined #git
23:38 cdown joined #git
23:40 zivester joined #git
23:40 Hobbyboy joined #git
23:41 pur3eval joined #git
23:42 SmashingX left #git
23:42 rominronin joined #git
23:43 Cabanossi joined #git
23:43 watabou joined #git
23:43 mda1 joined #git
23:44 Sasazuka__ joined #git
23:48 todd_dsm_ joined #git
23:52 pks joined #git
23:53 King_Hual joined #git
23:55 dsdeiz joined #git
23:55 dsdeiz joined #git
23:57 m0viefreak joined #git
23:57 ertes joined #git
23:59 gugah joined #git
23:59 cdg joined #git

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