Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-07

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

All times shown according to UTC.

Time Nick Message
00:03 TSS_ joined #git
00:07 Anja joined #git
00:07 shaggycat joined #git
00:09 TSS_ joined #git
00:11 yohnnyjoe joined #git
00:12 m___ hello
00:12 gitinfo m___: 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.
00:13 dodobrain joined #git
00:13 dodobrain joined #git
00:13 thiago joined #git
00:14 venmx joined #git
00:14 dodobrain joined #git
00:19 _cyril_ joined #git
00:21 johnmilton joined #git
00:21 Gfurst so something really weird happened
00:22 Gfurst on a submodule
00:23 Gfurst this repo specifically used for assets, has tons of small images and etc, those pratically untouched and even before I used git-lfs
00:23 jadesark joined #git
00:24 Gfurst for some reason a few of those images start getting "modified" even though I did nothing and they didn't actually change, but because of that git is giving a huge hassle and even checkout -- ... them will not work
00:25 causasui joined #git
00:25 nettoweb joined #git
00:26 Gfurst so even if I checkout the problem files it still says they are modified
00:27 EricPoe joined #git
00:34 thiago joined #git
00:35 TSS_ joined #git
00:38 Siegfried joined #git
00:40 _cyril_ joined #git
00:42 qws-user-1229 joined #git
00:45 TSS_ joined #git
00:50 red82 joined #git
00:51 nettoweb joined #git
00:54 Samual joined #git
00:56 ejb joined #git
00:57 sauron_ joined #git
00:58 dhollinger joined #git
00:59 Ender13 joined #git
01:03 JamesBaxter joined #git
01:05 sdothum joined #git
01:06 mehola joined #git
01:07 fahadash joined #git
01:11 Kaisyu joined #git
01:18 raijin joined #git
01:20 babilen joined #git
01:22 fstd_ joined #git
01:23 aidalgol joined #git
01:25 romerocesar joined #git
01:26 hahuang61 joined #git
01:32 liuzhen joined #git
01:33 cdown joined #git
01:44 venmx joined #git
01:52 Jameser joined #git
01:55 bruce_lee joined #git
01:55 bruce_lee joined #git
02:00 dreiss joined #git
02:04 xall_ joined #git
02:04 WizJin joined #git
02:06 morenoh149 joined #git
02:06 Urbany joined #git
02:07 fuzzmz joined #git
02:09 thiago joined #git
02:09 svm_invictvs joined #git
02:09 lindenle joined #git
02:13 a_thakur joined #git
02:13 cdown joined #git
02:17 JamesBaxter joined #git
02:19 pokalyis joined #git
02:24 finalbeta joined #git
02:30 flopsec joined #git
02:31 arand__ joined #git
02:31 arescorpio joined #git
02:32 red82 joined #git
02:33 nd_ joined #git
02:35 xall_ joined #git
02:35 netj joined #git
02:37 steelsw0rd joined #git
02:46 d^sh joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
02:49 st33lsw0rd joined #git
02:49 Limes joined #git
02:51 thiago joined #git
02:51 snthsnth joined #git
02:52 scottxu joined #git
02:52 xall_ joined #git
03:01 jezze joined #git
03:01 aavrug joined #git
03:02 SwiftMatt joined #git
03:03 aavrug joined #git
03:04 jnewt1 joined #git
03:06 jnewt1 i have a file i pulled from a project I haven't worked on in a long time.  it has a bunch of the <<<<<<HEAD <CODE> ======= <OTHER_CODE> >>>>>>><SOME_SHA>
03:06 archaic joined #git
03:06 kbs joined #git
03:06 nedbat jnewt1: those are conflict markers
03:06 jnewt1 yes.
03:07 jnewt1 i've seen them when merging
03:07 nedbat jnewt1: is the file like that in the repo?
03:08 jnewt1 nedbat: yeah, just pulled it
03:08 JamesBaxter joined #git
03:08 jnewt1 so what i want to do is get rid of them, and all the code in one side or the other, all at once, across the whole file
03:10 jnewt1 i assume the code between <<<<HEAD and ===== was the most recent, so i'd like to start there.  how do i get rid of the markers and the non HEAD code?
03:11 nedbat jnewt1: i don't know a way other than firing up your text editor
03:12 jnewt1 that's no fun
03:14 kadoban jnewt1: You can use a mergetool. meld is okay
03:14 kadoban There's a few others
03:15 venmx joined #git
03:15 Raed joined #git
03:15 Andrew_K joined #git
03:19 yohnnyjoe joined #git
03:20 jnewt1 so git can't interpret these markers it created?
03:20 Hello71 git merge --ours
03:20 Hello71 or git checkout --ours
03:20 Random832 jnewt1: whoever checked it in screwed up
03:20 Hello71 oh, you mean *that*
03:21 Hello71 yeah, GIGO
03:21 kadoban jnewt1: Why would it? The markers are there for cases when git isn't smart enough to merge it. That's your job.
03:21 kadoban If you do it wrong, what is git supposed to do about it?
03:22 BSAlb joined #git
03:24 jnewt1 kadoban: allow me to checkout which to keep (ie HEAD or some other SHA), as marked in the file, without the markers is what i think git should do, whether or not it does is the question
03:25 Hello71 the markers are *part of the file*
03:25 jnewt1 Hello71, checkout --ours doesn't work, although it seems like that's what i want
03:28 guampa joined #git
03:30 nedbat jnewt1: if the markers are in the file in the repo, there's nothing git can do to get rid of them.
03:31 thiago joined #git
03:31 govg joined #git
03:32 peepsalot joined #git
03:32 BenderRodriguez joined #git
03:34 snthsnth joined #git
03:35 hahuang61 joined #git
03:37 cqi joined #git
03:39 chachasmooth joined #git
03:39 lagothri1 joined #git
03:39 rchavik joined #git
03:40 hexagoxel joined #git
03:41 ochorocho__ joined #git
03:42 akushner joined #git
03:47 drbean joined #git
03:51 boombatower joined #git
03:52 a_thakur joined #git
03:53 acetakwas joined #git
03:54 Corosauce joined #git
03:57 inflames joined #git
04:00 justanotheruser joined #git
04:00 thiago joined #git
04:01 jost_ joined #git
04:04 jason237 joined #git
04:04 blackwind_123 joined #git
04:08 ac3takwas joined #git
04:10 OS-11711 joined #git
04:10 OS-11711 joined #git
04:12 mquin joined #git
04:14 Vortex35 joined #git
04:15 dsdeiz joined #git
04:15 Oatmeal joined #git
04:15 Anja joined #git
04:26 _cyril_ joined #git
04:28 liuzhen joined #git
04:30 yohnnyjo1 joined #git
04:36 howdoi joined #git
04:38 floatingman joined #git
04:41 nilg joined #git
04:43 xall_ joined #git
04:45 venmx joined #git
04:48 lightstalker joined #git
04:49 askb joined #git
04:52 finalbeta joined #git
04:52 subhojit777 joined #git
04:57 resurtm joined #git
05:02 Remramm No you can use git to checkout a specific version
05:02 Remramm by using `git checkout master -- myfile` for instance
05:03 govg joined #git
05:04 Rickmasta joined #git
05:04 Remramm --ours, --theirs and --merge should also work, but you have to pass paths
05:11 wxg joined #git
05:12 askb Getting a git cli error "fatal: Paths with -a does not make sense." when using option `git commit -asm`, while -a -s -m works. Any suggestions appreciated ?
05:12 a_thakur joined #git
05:13 daey_ joined #git
05:14 ELFreder1ch joined #git
05:17 laumann joined #git
05:19 a_thakur joined #git
05:24 Remramm None of those should work, options -s and -m don't exist
05:24 Remramm Wait you said git-commit, not git-add
05:25 Remramm I get the same error here, -m (--message) without a value doesn't work
05:26 zumba_ad_ joined #git
05:26 Remramm do you pass some other argument after those flags?
05:29 sdothum joined #git
05:31 snthsnth joined #git
05:31 Doginal left #git
05:31 Cabanossi joined #git
05:32 svm_invictvs joined #git
05:32 d0nn1e joined #git
05:35 cagedwisdom joined #git
05:35 phanimahesh joined #git
05:41 hahuang61 joined #git
05:41 antwon joined #git
05:41 resurtm joined #git
05:42 jfelchner joined #git
05:42 pks joined #git
05:43 ayjay_t joined #git
05:44 liuzhen joined #git
05:45 ome joined #git
05:49 DreamsandCode joined #git
05:50 dan2k3k4 joined #git
05:51 ngperfex joined #git
05:56 netj joined #git
05:58 mehola joined #git
05:58 thiago joined #git
06:00 Vinnie_win joined #git
06:02 boz_v1 joined #git
06:03 finalbeta1 joined #git
06:04 shpew12 joined #git
06:06 sdothum joined #git
06:08 ArchNoob joined #git
06:08 dreiss joined #git
06:09 bket joined #git
06:10 barteks2x joined #git
06:12 brillenfux joined #git
06:12 fatalhalt joined #git
06:16 venmx joined #git
06:16 sdothum joined #git
06:21 jozwior joined #git
06:23 a3Dman joined #git
06:28 subhojit777 joined #git
06:33 finalbeta joined #git
06:35 cqi joined #git
06:36 synthmeat joined #git
06:37 overlord_tm joined #git
06:38 robattila256 joined #git
06:41 hahuang61 joined #git
06:43 ochorocho__ joined #git
06:43 thiago joined #git
06:46 venmx joined #git
06:52 ThomasLocke joined #git
06:52 ThomasLocke joined #git
06:54 d^sh joined #git
06:54 qt-x joined #git
06:58 cagedwisdom joined #git
06:58 brk_ joined #git
06:59 Raging_Hog joined #git
07:00 LucaTM joined #git
07:00 dermoth joined #git
07:02 ThunderChicken joined #git
07:02 ThunderChicken joined #git
07:05 pijiu joined #git
07:07 thiago joined #git
07:07 ac3takwas joined #git
07:09 rscata joined #git
07:10 ahmedelgabri joined #git
07:11 _cyril_ joined #git
07:11 dan2k3k4 joined #git
07:12 cbreak joined #git
07:17 cdown joined #git
07:23 freimatz joined #git
07:25 zeroed joined #git
07:25 zeroed joined #git
07:26 jozwior joined #git
07:28 afusion joined #git
07:31 conrad_ joined #git
07:33 JeroenT joined #git
07:33 Kaisyu joined #git
07:34 meauses joined #git
07:34 flavius joined #git
07:35 _cyril_ joined #git
07:39 jnavila joined #git
07:42 elect joined #git
07:42 hahuang61 joined #git
07:43 GodEater` left #git
07:43 GodEater joined #git
07:43 GodEater joined #git
07:44 f4 joined #git
07:48 MrWoohoo joined #git
07:48 Sceorem joined #git
07:48 ferr joined #git
07:49 thiago joined #git
07:50 lb1c joined #git
07:52 realz joined #git
07:53 lss8 joined #git
07:56 danslo joined #git
07:58 JeroenT joined #git
07:58 JeroenT joined #git
08:02 Endarked joined #git
08:02 eduardas_m joined #git
08:06 BSab joined #git
08:10 afusion_ joined #git
08:11 PCatinean joined #git
08:14 Shentino joined #git
08:17 govg joined #git
08:19 zeroed joined #git
08:19 zeroed joined #git
08:20 ngperfex joined #git
08:21 danslo joined #git
08:21 laumann joined #git
08:23 thiago joined #git
08:23 a_thakur joined #git
08:25 apotry joined #git
08:26 Alienpruts joined #git
08:29 _ng joined #git
08:35 thiago joined #git
08:37 ahmedelgabri joined #git
08:39 afusion joined #git
08:40 JeroenT joined #git
08:43 sdlnv joined #git
08:43 hahuang61 joined #git
08:45 ochorocho__ joined #git
08:46 Seveas suggestion: use -a -s -m insted of -asm. -asm is probably interpreted as -a sm
08:47 Anja joined #git
08:48 JeroenT joined #git
08:48 stemid left #git
08:49 milestone joined #git
08:49 milestone hi all
08:49 milestone i have cloned a repo from github
08:49 Glooomy joined #git
08:49 milestone then i made changes to the code
08:49 milestone then i commited the changes to my local repo
08:49 milestone then i forked it on github (so i can push it)
08:50 milestone i added my new forked repo vie git add remote name url
08:50 milestone but when i run git push name branch
08:50 milestone i am getting an error
08:50 milestone error: src refspec … does not match any
08:50 milestone error: failed to push some refs to repo
08:51 Glooomy joined #git
08:52 a3Dman joined #git
08:52 cagedwisdom joined #git
08:52 Darcidride joined #git
08:53 Seveas milestone: so you're pushing a branch that does not exist.
08:53 milestone Seveas: no, the branch is remotely tracked
08:53 milestone and present on github
08:53 milestone in my fork
08:53 milestone Seveas: but git status reports: HEAD detached from
08:54 Seveas ah, so you probably did git checkout name/branch
08:54 flaviodesousa joined #git
08:54 milestone hmm. now I ran git checkout master and git reports… Warning: you are leaving 3 commits behind, not connected to any of your branches:
08:54 Seveas that means you're not on a branch and you've been igonring warnings about a detached HEAD at every commit
08:55 milestone ok, git shows me what to do i guess
08:55 jozwior joined #git
08:55 Ardethian joined #git
08:55 milestone If you want to keep them by creating a new branch, this may be a good time
08:55 danslo joined #git
08:55 Seveas yeah, in the last output, it'll have told you what to do
08:55 milestone Seveas: thanks
08:55 milestone git is great
08:56 ArchNoob joined #git
08:57 fees joined #git
08:58 snthsnth joined #git
08:58 GavinMagnus joined #git
09:00 dodobrain joined #git
09:01 encod3 joined #git
09:02 synthmeat joined #git
09:02 mikecmpbll joined #git
09:03 encod3_ joined #git
09:05 systemovich joined #git
09:06 byte512 joined #git
09:09 afusion_ joined #git
09:11 ocbtec joined #git
09:11 kamog` joined #git
09:13 sea-gull joined #git
09:13 ramsub07 joined #git
09:13 kurkale6ka joined #git
09:14 afusion joined #git
09:16 clmsy joined #git
09:17 govg joined #git
09:19 sdlnv_ joined #git
09:22 marcogmonteiro joined #git
09:22 thiago joined #git
09:24 sdlnv__ joined #git
09:26 cworth joined #git
09:34 chele joined #git
09:35 nettoweb joined #git
09:36 danslo joined #git
09:39 Serpent7776 joined #git
09:41 brillenfux joined #git
09:44 hahuang61 joined #git
09:45 sagerdearia joined #git
09:48 Endarked joined #git
09:51 courrier joined #git
09:52 mischat joined #git
09:52 Snugglebash joined #git
09:52 mischat joined #git
09:52 flavius joined #git
09:52 Snugglebash joined #git
09:53 cworth joined #git
09:53 danslo joined #git
09:53 a3Dman joined #git
09:54 a_thakur_ joined #git
09:55 realz joined #git
09:57 overlord_tm joined #git
09:59 phanimahesh joined #git
10:04 tvw joined #git
10:07 afusion_ joined #git
10:08 achadwick joined #git
10:08 leeN joined #git
10:10 paws_ joined #git
10:11 a_thakur joined #git
10:13 rnsanchez joined #git
10:13 Andrew_K|2 joined #git
10:13 lindenle joined #git
10:13 jbitdrop joined #git
10:14 P4nther joined #git
10:16 andrew710 joined #git
10:17 King_Hual joined #git
10:23 cyphase joined #git
10:25 Darcidride joined #git
10:26 Darcidride_ joined #git
10:28 moritz .oO( what if git was one of us? )
10:28 mablae joined #git
10:31 fakenerd joined #git
10:32 solf1re joined #git
10:33 troulouliou_div2 joined #git
10:35 GavinMagnus joined #git
10:36 icedwater Cxcf: did you get an answer to your HW3/HW6 issue?
10:38 icedwater If I understand correctly, you made one branch for each homework assignment, but while you were on the branch for HW3, you made some changes to HW6 and now you want HW3's copy of the HW6 file to remain as it was, as all changes on HW6 should be tracked on the HW6 branch, right?
10:38 SpeakerToMeat joined #git
10:39 icedwater My instinct would be to stash the changes to HW6 (git stash --save if you have to stash things separately), then checkout HW6. Once on the correct branch, you can git stash pop, then add/commit the relevant changes in the branch.
10:40 GavinMagnus joined #git
10:44 micdo_ joined #git
10:44 cdown joined #git
10:46 hahuang61 joined #git
10:46 phanimahesh joined #git
10:48 qpdb joined #git
10:48 interrobangd joined #git
10:49 usm4n joined #git
10:53 rbern joined #git
10:56 meauses joined #git
10:57 red82 joined #git
10:58 govg joined #git
10:58 BSaboia joined #git
10:59 Blkt joined #git
11:00 mischat joined #git
11:00 rmichnik joined #git
11:04 usm4n_ joined #git
11:06 Nikitaw99 joined #git
11:06 allaroundArtist joined #git
11:09 wizardedit joined #git
11:09 wizardedit joined #git
11:11 venmx joined #git
11:12 piwne joined #git
11:14 eivarv joined #git
11:17 ac3takwas joined #git
11:20 Rickmasta joined #git
11:23 MrMojito joined #git
11:23 MrMojito joined #git
11:28 ac3takwas joined #git
11:30 ieee joined #git
11:31 dan2k3k4 joined #git
11:32 usm4n joined #git
11:32 MafiaInc joined #git
11:34 qpdb joined #git
11:35 fakenerd joined #git
11:35 Cavallari joined #git
11:36 _cyril_ joined #git
11:36 nfk joined #git
11:36 goTAN joined #git
11:37 fuchstronaut joined #git
11:39 afuentes joined #git
11:41 JeroenT joined #git
11:42 star_prone joined #git
11:45 jeffreylevesque joined #git
11:46 hahuang61 joined #git
11:47 dimi1947 joined #git
11:47 Karazhan joined #git
11:48 re1 joined #git
11:52 netj joined #git
11:53 manuel_ joined #git
11:53 lmatteis joined #git
11:54 dsdeiz joined #git
11:56 tharuin joined #git
11:59 overlord_tm joined #git
11:59 flavius joined #git
11:59 tharuin Hey as a git-user, but still noob, I've run into this problem: I do have 1 + X repositories, one which is the backend, and X others representing different clients. All of these definately don't share stuff, so they are split into their own repos. Now I do feel like I need a master-repo, which contains config files and cmmon documentation for all of them,
11:59 tharuin especially for workflows like CI, provisioning and deploying. But I only heard bad stuff about submodules, but at the same time I'd like to have this master-repo which just has all the other repos as folders inside, but just splitted lol. Is there a way to go for this or should I gtfo and just deal with it
12:00 moritz tharuin: you can have a separate repo with config files, or things like ansible playbooks that deploy the config
12:00 moritz tharuin: and then let your CI system or so worry about correlating the versions
12:00 boxrick1 joined #git
12:01 danslo joined #git
12:01 tharuin so I should rather have all repo's without links and version every of them by tags or something
12:01 quackgyver joined #git
12:01 moritz I don't know how complex your setup is, but we haven't needed explicit verification so far
12:02 moritz we have GoCD piplines, and in that pipeline, the version of the config repo and of the code repo are fixed
12:03 moritz so we modify both as needed, and the code changes trigger a new pipeline instance, which uses the latest config
12:03 moritz that works well enough for us
12:03 mischat_ joined #git
12:03 tharuin That is too complex for that case, it is all rather simple, but I need to track the versions right, so I thought submodules would be perfect. But I guess I'll just separate configs completely
12:04 moritz GoCD isn't more complex than Jenkins, IMHO
12:05 mischat__ joined #git
12:05 moritz anyway, you can use submodules if you feel you need it; they just suck :/
12:05 kedare joined #git
12:05 tharuin We've used submodules for a customer some time ago and I know that it somehow took us a few days at some point to fix some issue, and googling also says to not use them lol
12:12 a_thakur joined #git
12:14 ams__ joined #git
12:14 ams__ joined #git
12:15 fuchstronaut is there a way to peak into a file on a certain branch without switching branches?
12:16 osse fuchstronaut: git show branch:path/to/file
12:17 PCatinean joined #git
12:17 fuchstronaut thank you
12:21 fahadash joined #git
12:22 ac3takwas joined #git
12:24 Starky joined #git
12:31 zeroed joined #git
12:33 jknetl joined #git
12:34 bsanford joined #git
12:35 annoymouse256 joined #git
12:35 ac3takwas joined #git
12:35 Learath2 joined #git
12:38 wrouesnel joined #git
12:45 p1ngarn joined #git
12:46 goTAN joined #git
12:47 venmx joined #git
12:47 hahuang61 joined #git
12:48 lmatteis joined #git
12:48 moop joined #git
12:53 mehola joined #git
12:55 johnmilton joined #git
12:55 ramsub07 joined #git
12:57 PioneerAxon joined #git
12:58 mischat joined #git
12:58 nanga joined #git
12:58 nanga joined #git
12:58 corpsicle joined #git
12:58 govg joined #git
12:58 NimeshNeema joined #git
12:59 dviola joined #git
13:00 Cavallari joined #git
13:02 jast joined #git
13:04 jknetl joined #git
13:07 aax joined #git
13:08 sdothum joined #git
13:11 pirate21994 joined #git
13:14 ArchNoob joined #git
13:15 ak5 joined #git
13:18 nilg` joined #git
13:20 thiago joined #git
13:21 Rickmasta joined #git
13:22 synthroid joined #git
13:22 zumba_ad_ joined #git
13:22 corpsicle joined #git
13:24 jeffreylevesque joined #git
13:26 flavius joined #git
13:29 irco joined #git
13:35 xall_ joined #git
13:36 Mo joined #git
13:36 CheckDavid joined #git
13:36 Mo Hi, I tried to clone via 'git p4 ' and this worked for all other P4 depots but is failing with this one like this: http://dpaste.com/23C4H12  Any idea?
13:36 _cyril_ joined #git
13:38 fakenerd joined #git
13:39 JeroenT joined #git
13:40 snowkidind joined #git
13:41 durham joined #git
13:48 hahuang61 joined #git
13:49 barteks2x joined #git
13:53 rnsanchez_ joined #git
13:54 cdown joined #git
13:58 synthroid joined #git
13:59 cdg joined #git
14:00 noidea joined #git
14:00 noidea joined #git
14:01 _noblegas joined #git
14:06 rishi joined #git
14:07 tlaxkit joined #git
14:08 Dougie187 joined #git
14:10 durham joined #git
14:10 al-damiri joined #git
14:11 l0v38ug joined #git
14:11 ExoUNX joined #git
14:13 altendky joined #git
14:13 flavius joined #git
14:15 hs366 joined #git
14:16 cdown_ joined #git
14:16 Mo joined #git
14:17 gho5t joined #git
14:19 goTAN joined #git
14:19 CEnnis91 joined #git
14:20 hs366 joined #git
14:21 Endarked joined #git
14:22 JamesBaxter joined #git
14:22 overlord_tm joined #git
14:23 red82 joined #git
14:23 d0nkeyBOB joined #git
14:26 Ryanar joined #git
14:27 Es0teric joined #git
14:27 thiago joined #git
14:29 ShekharReddy joined #git
14:32 danslo joined #git
14:32 dan2k3k4 joined #git
14:35 Junior joined #git
14:36 Es0teric joined #git
14:36 d0nkeyBOB joined #git
14:37 mischat joined #git
14:37 JeroenT joined #git
14:37 guampa joined #git
14:38 noecc joined #git
14:38 sangy joined #git
14:39 Xethron joined #git
14:40 kpease joined #git
14:43 lindenle joined #git
14:46 ajf- joined #git
14:46 Ordentlig joined #git
14:46 encod3 joined #git
14:47 shinnya joined #git
14:47 Ryanar joined #git
14:49 hahuang61 joined #git
14:49 AaronMT joined #git
14:52 Yorlik joined #git
14:53 pirate21994 joined #git
14:54 Yorlik Quick n00b question: How would I have to change the following entry in ".gitmodules" to set the branch of the submodule to be "5.2.x": [submodule "lua"]
14:54 Yorlik path = deps/lua
14:54 Yorlik url = https://github.com/lua/lua
14:55 govg joined #git
14:58 eivarv joined #git
15:00 liuzhen joined #git
15:02 boombatower joined #git
15:02 Darren_ joined #git
15:03 e14 joined #git
15:04 mmlb_ joined #git
15:07 danslo Yorlik: just add  'branch = <branch name>' apparently, http://stackoverflow.com/a/18797720
15:08 Yorlik Thanks !
15:08 Yorlik Been searching this like crazy but failed
15:08 todd_dsm joined #git
15:08 Es0teric joined #git
15:08 sangy joined #git
15:09 jstimm joined #git
15:10 kulelu88 joined #git
15:10 LeBlaaanc joined #git
15:11 jstimm joined #git
15:14 phaleth joined #git
15:14 ash_workz joined #git
15:15 LeBlaaanc joined #git
15:16 nicksloa_ joined #git
15:18 zumba_ad_ joined #git
15:18 anonymuse joined #git
15:20 mablae joined #git
15:20 EricPoe joined #git
15:22 Rickmasta joined #git
15:22 Seveas Yorlik: that's a fairly new feature. Submodules generally don't care what branch they're on, they just track which commit should be checked out.
15:23 sweatsuit joined #git
15:23 Yorlik which way ever had worked - I needed a way to fixate it somewhere.
15:24 Yorlik Since Lua has mooved to 5.3.3 already but I needed 5.2
15:25 eivarv joined #git
15:29 jknetl joined #git
15:30 nettoweb joined #git
15:31 clearcut joined #git
15:31 Es0teric joined #git
15:33 xall_ joined #git
15:34 pks_ joined #git
15:35 eduardas_m joined #git
15:35 ahf joined #git
15:35 sunny256 joined #git
15:36 demize- joined #git
15:36 finalbeta joined #git
15:37 _cyril_ joined #git
15:39 stemid joined #git
15:40 xaa__ joined #git
15:40 finalbeta1 joined #git
15:40 watabou_ joined #git
15:43 Sna4x8 joined #git
15:43 dsop joined #git
15:43 lmatteis joined #git
15:44 demize joined #git
15:44 tvl joined #git
15:44 Lowell joined #git
15:44 martin_g joined #git
15:44 aendrew joined #git
15:44 oncall-pokemon joined #git
15:45 mroth joined #git
15:45 FritzLakritz joined #git
15:45 xkr47 joined #git
15:45 unholycrab joined #git
15:45 sfan786_ joined #git
15:45 moop joined #git
15:45 reuf_ joined #git
15:45 joseph_arnstein_ joined #git
15:45 lxnch joined #git
15:45 howdoi joined #git
15:46 techntoke__ joined #git
15:46 adambrenecki joined #git
15:46 sebhoss joined #git
15:46 pizzaops joined #git
15:46 mischat_ joined #git
15:46 CheckDavid joined #git
15:46 trig-ger joined #git
15:46 jleclanche joined #git
15:46 ams__ joined #git
15:47 theresajayne joined #git
15:47 fahadash joined #git
15:47 prosody joined #git
15:47 belak joined #git
15:47 janx|beach joined #git
15:47 stealthii joined #git
15:48 amaged__ joined #git
15:48 shennyg joined #git
15:48 wenzowski joined #git
15:48 barq joined #git
15:48 bcardarella joined #git
15:48 davisonio joined #git
15:48 fcrick joined #git
15:48 epic_ joined #git
15:48 marvi joined #git
15:48 kutenai joined #git
15:48 _noblegas joined #git
15:48 meZee joined #git
15:48 al-damiri joined #git
15:48 Keridos joined #git
15:48 teadrop_ joined #git
15:48 twisted` joined #git
15:48 jstimm joined #git
15:49 timwis joined #git
15:49 midgetspy joined #git
15:49 joco42 joined #git
15:49 elmcrest joined #git
15:49 Eugene joined #git
15:49 nezZario joined #git
15:49 doppo joined #git
15:49 angelsl joined #git
15:50 saidelike joined #git
15:50 hahuang61 joined #git
15:50 Tee_Pee joined #git
15:50 nettoweb joined #git
15:51 ochorocho__ joined #git
15:51 skobes joined #git
15:52 flupke joined #git
15:52 beckyconning__ joined #git
15:52 boxrick1 joined #git
15:52 spr0tsuki joined #git
15:53 SegFaultAX joined #git
15:53 nettoweb1 joined #git
15:53 Peng_ joined #git
15:54 rom1504 joined #git
15:54 swift1_ joined #git
15:54 mkoskar joined #git
15:54 Filiphe joined #git
15:54 kyan joined #git
15:54 chrysaor joined #git
15:54 discopatrick joined #git
15:55 Furai joined #git
15:55 montyboy joined #git
15:55 mmlb_ joined #git
15:56 mischat joined #git
15:56 JeroenT joined #git
15:56 ghostlight joined #git
15:57 nettoweb_ joined #git
15:58 sylario joined #git
15:59 nettoweb joined #git
16:00 PioneerAxon joined #git
16:03 barteks2- joined #git
16:03 barteks2x left #git
16:03 LBV_User joined #git
16:04 fakenerd_ joined #git
16:04 Endarked joined #git
16:05 Khisanth joined #git
16:06 madewokherd joined #git
16:07 durham joined #git
16:07 yoh joined #git
16:08 nettoweb1 joined #git
16:08 nanga joined #git
16:09 yoh Could someone digest for me -- is gc --prune=now safe or not? ;)  doc says that "Unless the repository is quiescent, you will lose newly created objects ..." but I am not sure what it means for repo to be quiescent... if I have everything committed and all useful commits pointed to by branches/tags -- would I loose anything?
16:09 barteks2- left #git
16:09 Ryanar joined #git
16:09 renlo joined #git
16:09 barteks2x joined #git
16:10 ojdo joined #git
16:10 HedgeMage yoh: "quiescent" means exactly that: everything is committed, and there are no loose/unreferenced commits floating around without being connected to a branch
16:10 HedgeMage or at least none that you care about, I guess
16:11 yoh so, theoretically, in my case (all committed, pointed by branches) it should be safe to prune=now, correct?
16:12 lacour joined #git
16:12 nettoweb joined #git
16:14 yoh asking so persistently since I think in one of the cases I ran in the situation that an object was not found later :-/ but unfortunately I haven't caught an exact sequence of events, so may be there was some index which wasn't yet committed
16:14 ptx0 joined #git
16:14 sammyo joined #git
16:14 gareppa joined #git
16:14 sammyo left #git
16:14 martin_g joined #git
16:15 yoh would 'git fsck' catch such issues, i.e. that after some operation some objects referenced by branches etc are not reachable/found?
16:15 ptx0 i've got a missing file i'm trying to locate in a repository, i created a branch with a fix / new file, and pushed it. my coworker then force pushed(?) over my branch and my commits aren't in the 'g log' but in Assembla they are still visible (but I cannot view them for some reason)
16:15 ptx0 yoh: git fsck --lost-found
16:15 yoh ptx0: cool, thanks!  will do !
16:15 Yorlik left #git
16:16 wxg joined #git
16:17 HedgeMage yoh: when in doubt, back up, but yes git fsck should warn you and then go ahead and prune
16:17 yoh HedgeMage: yes -- I have backups (thanks btrfs for cheap snapshots ;) )
16:17 HedgeMage heh :)
16:17 cdown joined #git
16:19 vuoto joined #git
16:20 ayjay_t joined #git
16:21 nettoweb1 joined #git
16:21 davidfetter_ge joined #git
16:21 yoh HedgeMage: well... FWIW those are also sent to the backup server by btrfs (btrbk is really neat for that)
16:22 OliverJAsh joined #git
16:22 OliverJAsh When using `git add --patch`, the go to next/previous hunk options don't work across files. Is there a solution to this?
16:22 OliverJAsh I often skip a hunk accidentally and need to go back
16:23 byte512 joined #git
16:24 ArchNoob joined #git
16:24 moritz OliverJAsh: git add -i allows that, iirc
16:24 jason237 joined #git
16:26 zine joined #git
16:26 fuchstronaut How can I change the last commit on a branch that i already pushed?
16:26 fuchstronaut i know noone has pulled it
16:27 tyreld joined #git
16:27 svm_invictvs joined #git
16:27 grawity `git push --force` something else
16:28 fuchstronaut grawity: so I git amend and then do git push force?
16:28 grawity yes
16:29 Lipp joined #git
16:29 ptx0 i found my files but i used an old git tree directory reflog to merge the commits
16:29 ptx0 probably owuld have had to rewrite the stuff if i didn't have that dir, right?
16:30 joki joined #git
16:31 durham joined #git
16:31 ahmedelgabri joined #git
16:31 zeorin joined #git
16:31 zeorin !deploy
16:31 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
16:33 zeorin left #git
16:35 ramsub07 joined #git
16:36 gareppa joined #git
16:36 odxw joined #git
16:38 jccn joined #git
16:39 nettoweb joined #git
16:42 Sdieb joined #git
16:44 doener joined #git
16:44 beagleGuy joined #git
16:45 jstimm joined #git
16:45 bket joined #git
16:46 a_thakur joined #git
16:47 InfoTest joined #git
16:48 SwiftMatt joined #git
16:49 LastWish joined #git
16:50 averagedan joined #git
16:51 hahuang61 joined #git
16:56 nicksloan joined #git
16:58 tlaxkit joined #git
16:58 svm_invictvs joined #git
16:58 LastWish left #git
17:00 logikos joined #git
17:01 pijiu joined #git
17:01 lordjancso joined #git
17:01 logikos i did a commit (local, no push to remote) that had more staged files in it that an thought it had at the time i wrote the commit message .. can i undo just the commit command so that I can change my staged files and commit message ?
17:02 logikos i do not want it to modify the content of any files, just remove the last commit and message
17:02 pijiu joined #git
17:03 grawity git reset HEAD^
17:04 boombatower joined #git
17:04 pijiu joined #git
17:04 synthroid joined #git
17:05 horatiohb left #git
17:05 logikos ty
17:05 pijiu joined #git
17:05 Raging_Hog joined #git
17:06 pijiu joined #git
17:06 synthroi_ joined #git
17:07 patarr_ joined #git
17:08 a_thakur_ joined #git
17:08 barteks2x_ joined #git
17:09 pijiu joined #git
17:10 pijiu joined #git
17:11 akushner joined #git
17:11 _cyril_ joined #git
17:12 hahuang61 joined #git
17:13 bratchley joined #git
17:15 govg joined #git
17:16 cdown joined #git
17:18 cdown_ joined #git
17:18 renlo joined #git
17:20 mroth joined #git
17:21 EricPoe joined #git
17:22 BSaboia joined #git
17:23 Rickmasta joined #git
17:25 laumann joined #git
17:26 a3Dman joined #git
17:27 lindenle joined #git
17:31 synthroid joined #git
17:33 jstein_ joined #git
17:33 nbrogan joined #git
17:33 hiwk I'm in branch A. I want to switch to branch B, do something there, switch back to A, and have non-tampered timestamps. Is that possible?
17:34 hiwk right now, A-B-A followed by make re-makes way too much
17:34 Noldorin joined #git
17:34 Noldorin joined #git
17:36 tang^ joined #git
17:36 nilg joined #git
17:36 lordjancso joined #git
17:36 Darcidride joined #git
17:36 dan2k3k4 joined #git
17:38 renlo joined #git
17:39 Seveas hiwk: no.
17:40 Seveas git doesn't do anything with file timestamps, so if you check out a branch where the file differs, the timestamp will be updated
17:40 oskarkv joined #git
17:44 nicksloan joined #git
17:44 emg joined #git
17:47 hiwk Seveas: ok. I guess I have to have one clone for compiling and another for branch switching then :/
17:49 nicksloan joined #git
17:49 _cyril_ joined #git
17:51 ochorocho__ joined #git
17:53 sunri5e joined #git
17:54 aard_ joined #git
17:55 SwiftMatt joined #git
17:55 osse hiwk: man git-work-tree
17:55 osse hmm
17:55 osse hiwk: man git-work\tree
17:55 RedneckDonut joined #git
17:55 osse hiwk: man git-worktree
17:55 gitinfo hiwk: the git-worktree manpage is available at http://jk.gs/git-worktree.html
17:55 osse there we go
17:56 danslo_ joined #git
17:56 meauses joined #git
18:04 click joined #git
18:04 gho5t joined #git
18:04 robotroll joined #git
18:05 shpew12 joined #git
18:12 ahmedelgabri joined #git
18:16 barteks2x joined #git
18:18 ShekharReddy joined #git
18:19 grimdox joined #git
18:19 grimdox left #git
18:21 grimdox joined #git
18:21 daniel_rose joined #git
18:23 fenris_kcf joined #git
18:23 Gfurst joined #git
18:23 fenris_kcf saluton. how should i interpret and handle "modified content"-entries for submodules listed at "git status"?
18:23 Gfurst hey guys, any of you use git-lfs on windows? I'm having a issue where connection is refused and there is a window(?) for git credential manager?
18:23 Gfurst the window picture https://www.dropbox.com/s/0bdh​zuxj5hisnit/Untitled.jpg?dl=0
18:25 Es0teric joined #git
18:27 e14 joined #git
18:27 eivarv joined #git
18:28 osse fenris_kcf: cd to the location, run git status and see what it says
18:28 diogenese joined #git
18:29 Learath2 joined #git
18:30 fenris_kcf oh, tkx, osse!
18:30 fenris_kcf *thx
18:30 cdg joined #git
18:30 btree joined #git
18:33 meauses joined #git
18:35 vuoto joined #git
18:37 solrize joined #git
18:37 btree left #git
18:38 solrize i'm using a web host that runs the litespeed web server, does anyone know if there's a git-http-backend config for that?
18:39 causasui joined #git
18:39 robattila256 joined #git
18:42 CamonZ joined #git
18:49 Sasazuka joined #git
18:50 Gfurst I'm having problems with windows credentials and lfs-test-server
18:51 kyan joined #git
18:51 sobersabre joined #git
18:51 sea-gull_ joined #git
18:52 sobersabre hi. I am unclear when this happened, but so far when I did a git commit, only CHANGES in the index would be committed.
18:52 anonymuse joined #git
18:52 daniel_rose joined #git
18:52 sobersabre now when I commit, I see ALL changed files, incl. changes outside the index, get into the commit.
18:52 sobersabre I'm on git 2.7.4
18:53 kadoban sobersabre: Did you use -a ? Or make some weird alias?
18:53 sobersabre kadoban: maybe an alias. checking....
18:54 WayToDoor joined #git
18:54 Endarked joined #git
18:54 sobersabre kadoban: the only thing related to my LOCAL git config I did was setting [push] default=matching
18:55 gkatsev joined #git
18:55 kadoban sobersabre: Check your shell config or something? Are you sure you didn't just typo as well? It's fairly easy to add unintended options to commands, I've done it many times.
18:55 sobersabre I have some SHELL aliases gca, etc. but I did not use it
18:56 sobersabre how can I identify shell's config for git?!?!? is there a thing like this that doesn't show in 'alias' or 'env' output ?
18:56 kadoban Would depend on the shell I guess. I wouldn't really know how you can check in any of them personally.
18:57 dsantiago joined #git
18:57 eivarv joined #git
18:58 Gfurst anyone else have issues with windows credential (wincred) and lfs custom server?
18:59 dsantiag_ joined #git
19:00 Achylles joined #git
19:01 jephsf joined #git
19:01 harry1 joined #git
19:02 harry1 left #git
19:03 morenoh149 joined #git
19:03 meauses joined #git
19:03 harrymoreno joined #git
19:03 morenoh149 how do I make a pre-commit hook?
19:03 morenoh149 I wrote a python script an put it in .git/hooks/pre-commit
19:03 morenoh149 is that enough?
19:05 msonntag joined #git
19:07 kadoban morenoh149: Yep. You have to make sure it's executable and that it's set up to run as a python script, that should be it.
19:09 jstimm joined #git
19:09 kadoban morenoh149: Note that pre-commit hooks can be a bit tricky in logic. Git doesn't do anything magic with them, so by default you're testing things as they exist in the working directory, no as they will be commited.
19:10 ethylomat joined #git
19:12 d0nn1e joined #git
19:13 anonymuse joined #git
19:15 ethylomat joined #git
19:15 brillenfux joined #git
19:16 ionelmanolache joined #git
19:18 tyreld joined #git
19:19 snthsnth joined #git
19:20 jstimm joined #git
19:22 railssmith joined #git
19:23 danslo_ joined #git
19:23 ToBeFree joined #git
19:23 Gsham joined #git
19:24 Rickmasta joined #git
19:25 dtrott joined #git
19:27 dtrott Whats the easiest way to get a different return code from Git if there has (or has not) been a commit to the master branch in the last minute - sorry writing a Kludge for an already very Kludgey build server.
19:29 osse dtrott: fetch once a minute
19:29 osse then check .git/FETCH_HEAD
19:30 meauses joined #git
19:30 d0nkeyBOB joined #git
19:31 ResidentBiscuit joined #git
19:32 EricPoe joined #git
19:37 nwkj86 joined #git
19:38 dtrott osse:Not really what I was looking for, I think I have found a solution:    if [[ $(git log -p "master@{1 minute ago}..master@{now}" | wc -c ) -ne 0 ]]
19:38 dtrott Super kludgey, but it fits in the spirit of todays work ….
19:39 HoierM joined #git
19:39 hanthings joined #git
19:39 anonymus_ joined #git
19:40 osse the -p takes the cake :p
19:40 osse if (( $(git rev-list --count "master@{1 minute ago}..master@{now}") > 0 )); then
19:41 dtrott Thanks, thats a lot better.
19:42 renlo joined #git
19:44 nawwmz joined #git
19:44 matoro joined #git
19:44 paulgoulden joined #git
19:46 cagedwisdom joined #git
19:46 leeN joined #git
19:47 bket joined #git
19:48 Es0teric joined #git
19:48 shpew12 joined #git
19:49 dan2k3k4 joined #git
19:50 overlord_tm joined #git
19:50 dpower joined #git
19:52 pandeiro joined #git
19:53 mjuszczak joined #git
19:54 e14 joined #git
19:54 gho5t joined #git
19:54 gho5t_ joined #git
19:56 vuoto joined #git
19:57 GenZai joined #git
20:00 paulgoulden joined #git
20:03 VagabondAzulien joined #git
20:04 Ryanar joined #git
20:06 nbrogan joined #git
20:09 jimi_ joined #git
20:11 mellernoia joined #git
20:18 Dougie187 left #git
20:22 courrier_ joined #git
20:23 alex1a joined #git
20:23 Dougie187 joined #git
20:23 jargan joined #git
20:24 mar77i_ joined #git
20:25 hyperair joined #git
20:25 revoltingPeasant joined #git
20:25 xehbit joined #git
20:27 Rodya_ joined #git
20:27 ochorocho__ joined #git
20:29 m1dnight_ joined #git
20:31 _cyril_ joined #git
20:35 Gsham joined #git
20:36 d0nkeyBOB joined #git
20:39 sobersabre hi. I have a branch x, and out of its head there's a branch y with 3 commits.
20:39 sobersabre I would like to start pointing at the second commit in y, so that y has only 1 commit
20:39 sobersabre I have ran git checkout <2nd hash in y>
20:40 kadoban What do you mean that you want to start pointing at it?
20:40 sobersabre if I do 'git branch -f x' would the branch head become my current commit ?
20:40 osse yes
20:41 sobersabre kadoban: x branch is just a pointer. It currently points at its head, which is 3 commits behind y.
20:41 d0nkeyBOB joined #git
20:41 sobersabre osse: thanks.
20:41 sobersabre osse: for some reason after that I still am seeing 'detached:x'
20:42 osse sobersabre: you have to check it out
20:42 osse git checkout x
20:43 ionelmanolache joined #git
20:43 sobersabre osse: yep, I did some sweet sweet git loggin' and it looks ok.
20:44 vucks96 joined #git
20:46 Gsham joined #git
20:47 renlo joined #git
20:52 red82 joined #git
20:53 theseb joined #git
20:55 theseb anyone know why http://ethereumclassic.org redirects to the github page...https://ethereumclassic.github.io/ but the HTTPS version won't redirect?
20:56 kadoban Because whoever set it up didn't set it up correctly?
20:58 einnjo joined #git
21:01 theseb kadoban: ok good so i'm not crazy..i'm not a DNS guru but registrars can do this?
21:02 theseb (redirect ssl'd domains?)
21:03 annoymouse256 joined #git
21:03 ammunta kadoban: probably because they couldn't be bothered to get a cert
21:05 m0viefreak joined #git
21:05 kadoban theseb: Well, you can't really do redirects like that on the DNS level. At least, that site isn't. It's connecting to whatever server runs ethereumclassic.org, and that server is saying "Hey look over there! -->" (a 302 response, in HTTP-speak)
21:06 kadoban theseb: And that web server just isn't set up to allow connections via HTTPS
21:06 Orion3k joined #git
21:06 MickyW joined #git
21:06 kadoban Probably because of ammunta's reasoning
21:08 MickyW Im using git for windows. Pearson git-GUI. Having a pure local repo. No branches. Today I started a database check and got two messages about "dangling blobs". I am completely lost despite trying to get some help myself in the internet. I would like to know: 1. Is that a critical situation? 2. May I (in case that I can't fix it tonight) switch of the computer without making things worser? 3. What may I do to fix? Would be very kind, if you coul
21:08 MickyW d give me some hints.
21:08 akanksha__ joined #git
21:08 dsdeiz joined #git
21:08 dsdeiz joined #git
21:08 emg joined #git
21:08 atomi joined #git
21:09 Faylite joined #git
21:09 cdg joined #git
21:10 kadoban As far as I know, nothing on the DNS level really interacts with TLS at all, at least in this manner. If the redirect were happening via DNS, like a CNAME I guess it would be, it'd work identically for HTTP and HTTPS, if the final server accepted connections via both.
21:10 kadoban MickyW: I don't think dangling blobs are an actual problem by themselves, though maybe wait for confirmation from someone else.
21:11 MickyW kadoban: I am the only user. The repo is purely local. Not even a connection to internet.
21:11 kadoban AFAIK you can get dangling blobs simply by doing 'git add' several times before you commit or probably other ways as well.
21:13 MickyW kadoban: Thats probably true. I got impatient today, when the git-gui does comparison of a great file, which I didnt wanted to commit.
21:13 Limes joined #git
21:14 MickyW Clicked "in advance" to the other file and entered commit message, expecting that event buffer will do. That occured about two or three times (I do not do it that way regularily, but today I was too impatient).
21:15 atomi joined #git
21:15 Lipp joined #git
21:16 ramsub07 joined #git
21:16 kadoban I don't really use git-gui, I'm not sure what you're talking about.
21:17 MickyW kadoban: I think thats like "disturbing" a running comparison by starting an "add".
21:18 Endarked joined #git
21:19 MickyW kadoban: Not sure if they at all may interfere each other. But that's the only irregularity I remember. (Just in order to declare each possible cause to you).
21:20 kadoban MickyW: AFAIK you don't actually have a problem just because of dangling blobs. Is anything else not working as you expect?
21:20 renlo joined #git
21:20 askb joined #git
21:21 lalilulelo joined #git
21:21 HoierM joined #git
21:22 MickyW kadoban: Can't say that as I stopped using git or to do anything related to git or the files at all. (Had to leave then). As far as I can see, all commits (I remember) are listed. Didn't try anything so far. But I am used to take warnings serious (like with compiler warnings), which may be superflous in this case.
21:23 MickyW kadoban: Maybe me I am too ... :-) But this is the first time ever having problems (say warnings) from git. That impressed me a lot. :-)
21:24 crayon joined #git
21:24 kadoban MickyW: I believe the warning exists because the "blobs" won't exist forever, since it's dangling it'll get cleaned up eventually.
21:24 crayon joined #git
21:24 danslo_ joined #git
21:25 MickyW kadoban: Additionally git is a riddle to me. Would prefer to dismantle a watch and reconstruct it instead.
21:25 lalilulelo joined #git
21:26 Rickmasta joined #git
21:26 daniel_rose joined #git
21:26 MickyW kadoban: But doesn't that mean, that I did something wrong or in the wrong sequence?
21:26 kadoban I don't think so. Maybe hang around and see if anyone disagrees.
21:27 MickyW kadoban: One more question if you allow: Do you think that will "heal" itself? Say, with a database compression or likewise?
21:28 kadoban Dangling blobs eventually get garbage collected, if you call that healing.
21:28 MarceColl joined #git
21:29 MickyW kadoban:  For me it sounds like something wasn't commited, even if I can't see any irregularity. As far as I can see, the blobs will hang around if do not do anything about them.
21:29 pbrewczynski joined #git
21:29 MarceColl joined #git
21:29 Mobutils joined #git
21:29 nettoweb joined #git
21:30 MickyW kadoban: I mean, shouldn't that blobs anyhow incorporated into the repo?
21:30 MickyW kadoban: Sorry. Don't want to be too talkative or even insisting, but I am really desperate.
21:31 kadoban If you add a file, change it, add it again, and commit, why would the first blob make it anywhere? It *should* be dangling.
21:32 chris123456 joined #git
21:32 MarceColl joined #git
21:33 MickyW kadoban: Hmm. Its only that all files are added a long time ago and I only did changes and commits since then.
21:35 emg joined #git
21:35 MickyW kadoban: Sorry. That's not true. I recently added some more files. That was two days before I think. But maybe that blobs hung around for some days either and I didn't knew it, because I didn't start the database check until today. Hmm.
21:36 MickyW kadoban: OK. From what I told you, you would say, that the situation is not critical - means possible data loss? Right?
21:37 eivarv joined #git
21:40 jstimm joined #git
21:40 ResidentBiscuit joined #git
21:41 jstimm joined #git
21:42 anonymuse joined #git
21:47 Es0teric joined #git
21:48 mischat joined #git
21:48 finalbeta joined #git
21:49 gho5t_ left #git
21:50 MarceColl joined #git
21:52 rmbeer joined #git
21:52 rmbeer hello
21:52 rmbeer is good practice comment the codes or always depend of git for recover lines?
21:52 MarceColl joined #git
21:53 Zarthus why an "either this or that" when you can do both? :)
21:54 Snugglebash joined #git
21:54 eb0t joined #git
21:54 MickyW I think these are different matters. Comments will not recover and vice versa.
21:55 kadoban rmbeer: Do you mean comment out code to keep it? That's usually useless when you can just delete it and get it from history if you need it. Not always though.
21:55 MarceColl joined #git
21:56 eb0t joined #git
21:58 thebope joined #git
21:59 MickyW rmbeer: In case you meant commenting out code I would say, that depends on your usual workflow in such cases. Both are options but deleted lines will probably get out of scope of your mind. That may be compensated by revising commit history and/or using branches instead. But I usually comment out code which I intend to revise in short.
21:59 mischat joined #git
22:06 blackwind_123 joined #git
22:07 romerocesar joined #git
22:09 cyan__ joined #git
22:10 utrack joined #git
22:10 Gsham joined #git
22:11 eivarv joined #git
22:13 a3Dman joined #git
22:13 snowkidind joined #git
22:16 aidalgol joined #git
22:18 anonymuse joined #git
22:20 mablae joined #git
22:21 pijiu joined #git
22:21 MickyW Is there a way to see, what's in my dangling blobs?
22:23 LaptopBrain joined #git
22:24 thiago git show them
22:26 danslo_ joined #git
22:27 MickyW thiago: Thank you.
22:28 MickyW kadoban: Thank you too, for answers.
22:29 kadoban Anytime
22:29 mellernoia joined #git
22:31 theseb left #git
22:31 theskillwithin joined #git
22:34 eivarv joined #git
22:36 shgysk8zer0 joined #git
22:39 lucazz joined #git
22:41 mischat joined #git
22:43 WayToDoor joined #git
22:44 WaReZ joined #git
22:45 mycelium joined #git
22:47 miklcct joined #git
22:47 MickyW Oh. git fsck --lost-found found one dangling commit, one dangling tree and three(!) dangling blobs.
22:48 MickyW That's definitely not my day today.
22:49 MickyW Only two blobs. Sorry.
22:50 osse that's common
22:50 MickyW Really? Oh.
22:50 osse git commit --amend; # whoops, the previous commit object is now dangling
22:51 osse git rebase # don't get me started
22:52 osse git add file; modify file more; git add file (again) # welp, we gotta a dangling blob, boys
22:52 MickyW Think, the latter is the case.
22:53 MickyW Dont know what to do now. But I think I don't have a knack for such things today.
22:53 osse are you actually (in the human sense) looking for something you lost?
22:53 osse if not, forget about it
22:54 leTali joined #git
22:54 MickyW osse: Not so far, yet. But got unsecure now. Maybe I miss something which I do not know,that I miss it.
22:55 MickyW kadoban said something similar but didn't know then that there are dangling trees and commits too.
22:56 askb joined #git
22:57 MickyW However. Too tired and too bugged now. Will shift it until tomorrow and thotoughly go through it.
22:59 osse MickyW: just so you know, this is advanced stuff. most people never get there
23:00 osse and those that do mostly do so because they need to, because they as scientists say "fucked up"
23:00 MickyW :-)
23:00 johnmilton joined #git
23:00 Sonderblade doesnt dangling just mean it is not reachable from a branch?
23:00 MickyW As far as I understood that. Yes.
23:01 osse Sonderblade: no, that's unreachable. dangling means that it's unreachable, but *also* unreachable from other unreachable objects
23:01 osse it's like unreachable squared
23:01 MickyW Ah. Thats a difference. Indeed.
23:01 osse there is no deeper circle of hell
23:02 Sonderblade so it's a special type of garbage?
23:02 osse just a different one
23:03 dling joined #git
23:03 osse Sonderblade: ok, imagine you have this history: A - B - C - D - E (master). Now you do 'git reset --hard C' so you have A - B - C (master). D and E are now unreachable. D is reachable from E, so not dangling. E is not reachable from anywhere => dangling.
23:04 MickyW That is uncritical in case I did that reset by intent. Right?
23:04 osse yep
23:05 osse uncritical even if they didn't, for up to two weeks or something like that
23:05 osse (that's the minimum git keeps garbage around before deleting it)
23:05 MickyW Ah.
23:06 morenoh149 joined #git
23:06 rmbeer MickyW, kadoban , thank. now thinking by remove lines of code. :)
23:06 MickyW And otherwise? How may I reconnect D to C?
23:06 osse MickyW: it is already connected.
23:06 osse there just isn't any reference pointing to D or E, so that's what you gotta do
23:07 dan2k3k4 joined #git
23:07 madebymarkca joined #git
23:08 MickyW But doesn't that mean, that a reference from D to C is missing? (That what I consider "unconnected" - am I wrong).
23:08 MickyW Some ?s missing.
23:09 MickyW Do you make distinction between "connection" and "reference"?
23:10 osse MickyW: yes there is a distinction. Every commit knows which commit is its parent. That's how the chain is formed
23:10 MickyW Yes.
23:10 MickyW I thought I already knew that.
23:13 cagedwisdom joined #git
23:14 MickyW So information in D that C is its parent is deleted?
23:14 osse no
23:14 osse it's stored inside D
23:14 osse D still exists
23:15 osse you just don't know how to get to D.
23:15 mischat joined #git
23:15 Rodya_ joined #git
23:15 MickyW Where is that info stored?
23:16 osse inside the commit object
23:17 MickyW So that comit object is distinct from a "data object" - that mysterious "blob", isn't it?
23:17 osse yes
23:17 osse inside the commit object is also info about a tree object. that tree object that refer to other trees or blobs
23:18 osse tree = "directory". blob = "file"
23:18 osse sort of
23:19 MickyW Ah. OK.
23:19 MickyW Have to read about that. Thank you.
23:19 osse !bottomup
23:19 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/​pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
23:20 MickyW Uh. Fine. Thank you.
23:22 justanotheruser joined #git
23:22 jwcapps joined #git
23:22 ws2k3 joined #git
23:23 jwcapps Why does $ git checkout -p give me patch does not apply, even if I don't actually edit the hunk
23:24 osse does it say "doesn not apply to the index" ?
23:24 xall_ joined #git
23:24 vacho joined #git
23:25 vacho Saved working directory and index state WIP on master: 26197e4 Merge master with 'origin/WCP-209'
23:25 vacho HEAD is now at 26197e4 Merge master with 'origin/WCP-209'
23:25 vacho I can't stash in git.. getting this response:
23:25 vacho Saved working directory and index state WIP on master
23:25 vacho any idea?
23:25 jwcapps osse: it just says patch does not apply
23:26 jwcapps osse: even if I just go through and type y for all hunks
23:26 ramsub07 joined #git
23:26 vacho I just want to reset my branch and start fresh from remote branch
23:27 osse vacho: git reset --hard remote/branch
23:27 Rickmasta joined #git
23:27 osse presumably git reset --hard origin/WCP-209
23:27 osse jwcapps: i don't know then
23:27 finalbeta joined #git
23:27 vacho fatal: ambiguous argument 'origin/WCP-209': unknown revision or path not in the working tree.
23:28 osse find whatever is the right thing
23:29 vacho osse: ?
23:29 tyreld joined #git
23:29 vacho I just want to reset so I can continue my work, not sure why git is giving this
23:29 osse vacho: what is the name of the remote branch ?
23:30 osse i can't know that
23:30 vacho osse: how can I find out?
23:30 vacho I want origin master from remote
23:30 osse then it's origin/master
23:31 vacho thx that worked really well.
23:32 Darren_ joined #git
23:32 hahuang61 joined #git
23:33 e14 joined #git
23:33 cdown joined #git
23:34 Sasazuka joined #git
23:34 sangy joined #git
23:34 MickyW Thank you all for reading and patience. Good night (or whatever good). Bye.
23:35 stoned Hello, I have modified files accidentally, but not committed my changes. How can I restore the files to the last commit?
23:36 netj joined #git
23:36 mikecmpbll joined #git
23:37 dsdeiz joined #git
23:37 dsdeiz joined #git
23:37 thiago stoned: type git status. It will tell you what to do.
23:37 anonymuse joined #git
23:37 Marbug joined #git
23:39 vacho osse: thank u !
23:41 led_belly joined #git
23:43 stoned thiago: thanks!
23:44 e14 joined #git
23:46 venmx joined #git
23:48 Vinnie_win_r joined #git
23:52 stoned now I seem to have lost some files
23:52 stoned They are live on my website, but when I check my local repository, they're not there
23:54 aax joined #git
23:58 GavinMagnus left #git
23:58 stoned I don't udnerstand what happened
23:58 stoned https://stoned.io/authors/jasmine-miller/Solit​ude-And-Grace-Original-Poem-By-Jasmine-Miller/
23:59 stoned It's the most_recent.html file that is clearly live on my website, which I git pull on my server, but it's not in the repository on remote or local
23:59 stoned how did that disappear?

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