Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-27

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

All times shown according to UTC.

Time Nick Message
00:00 Stas tet
00:00 Stas *test
00:01 Stas Hi Evan,
00:01 Julian joined #git
00:02 Guest42403 It won't let me have my own name
00:03 evanm How do I preview the contents of a stash?
00:03 Stas git stash show -p
00:06 cdown joined #git
00:06 ertes joined #git
00:07 cmalmber joined #git
00:08 dsdeiz joined #git
00:08 dsdeiz joined #git
00:11 fatalhalt joined #git
00:13 Kyros joined #git
00:13 mjuszczak joined #git
00:14 Qria joined #git
00:14 brent__ joined #git
00:16 Qria Hi, does `git stash show` support regex in revision? I have tried `stash show stash@{/foo}` `git stash show stash:{/foo}``git stash show HEAD:{/foo}``git stash show :/foo` but all errors with ":/foo is not a valid reference"
00:17 Qria My git version is 2.11.0
00:20 courrier joined #git
00:22 roelmonnens joined #git
00:24 fatalhalt joined #git
00:26 Rodya_ joined #git
00:28 cqi joined #git
00:29 nidr0x joined #git
00:30 Noodlewitt joined #git
00:30 thiago joined #git
00:31 netj joined #git
00:32 xpika joined #git
00:33 xpika how can I copy all the files from a branch into another branch without commiting anything?
00:34 svm_invictvs joined #git
00:35 LBV_User joined #git
00:35 doMynation joined #git
00:38 zhodge joined #git
00:40 goodlluck fuck you very much
00:40 xpika ok found the answer git merge xxx --no-commit --no-ff
00:42 fstd_ joined #git
00:42 Anja_ joined #git
00:43 dstw joined #git
00:44 Rodya_ joined #git
00:44 cyphase joined #git
00:45 Random832 joined #git
00:50 jeffreylevesque joined #git
00:51 courrier joined #git
00:54 fatalhalt joined #git
00:55 aw1 joined #git
00:56 arand joined #git
00:57 re1 joined #git
00:57 paissad joined #git
00:58 paissad hello guys, i would like to remove my last commit which is not pushed yet ... knowing that i have 2 pending commit to push
00:58 rwb joined #git
00:58 paissad i don't want to remove the 2 pending commit, just the last one .. how should i proceed ?
00:59 rchavik joined #git
00:59 kadoban So you want to undo the commit, but what about the changes in the commit?
00:59 paissad git reset HEAD~1  ???
00:59 indistylo joined #git
01:00 paissad kadoban: and the changes of course (i thought that meant the same :D )
01:01 qpdb joined #git
01:01 sunrunner20 joined #git
01:01 fatalhalt joined #git
01:01 ojdo joined #git
01:02 HoierM joined #git
01:05 mjuszczak joined #git
01:09 paissad ??
01:10 Cabanossi joined #git
01:11 TikityTik joined #git
01:15 paissad i got it
01:16 paissad git reset --HARD~1
01:16 paissad --hard HEAD~1
01:17 fletom joined #git
01:18 Pilfers joined #git
01:19 NumberStation08 joined #git
01:21 johnnyfive joined #git
01:22 cyphase joined #git
01:27 DolphinDream joined #git
01:32 jiangpeng joined #git
01:33 menip joined #git
01:33 Vgr joined #git
01:33 theiostream joined #git
01:34 ping0ra joined #git
01:37 fatalhalt joined #git
01:38 cyphase joined #git
01:38 sunrunner20 joined #git
01:41 prg3 joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 duderonomy joined #git
01:50 njbair joined #git
01:51 bgerber joined #git
01:51 lagothrix joined #git
01:52 Noodlewitt joined #git
01:52 cyphase joined #git
01:52 sunri5e joined #git
01:54 jiangpeng joined #git
01:55 fatalhalt joined #git
01:55 Loomaanaatii joined #git
01:56 peepsalot joined #git
01:57 Loomaanaatii joined #git
01:59 cahoots joined #git
02:00 jameser joined #git
02:01 cyphase joined #git
02:01 lagothri1 joined #git
02:02 Hello71 !undo
02:02 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
02:04 pks joined #git
02:04 bezhermoso joined #git
02:04 shinnya joined #git
02:06 cahoots joined #git
02:10 roelmonnens joined #git
02:13 SantaClauze joined #git
02:15 xall joined #git
02:17 dreiss joined #git
02:18 doug16k joined #git
02:18 Vortex34 joined #git
02:20 doug16k I forked a project created a branch and made several improvements. I contacted the project mailing list and they want each change as a separate patch. is there a way to take each commit, and base it on the original unmodified fork and get an isolated diff for each one?
02:21 ianliu joined #git
02:21 ianliu joined #git
02:21 doug16k is cherry-pick what I am looking for?
02:22 SwiftMatt joined #git
02:23 TheSimonator joined #git
02:24 juvenal joined #git
02:25 ianliu joined #git
02:25 orbyt_ joined #git
02:26 ianliu joined #git
02:29 kfoonamalik joined #git
02:33 FuzzyWuzzyPanda joined #git
02:33 sunrunner20 joined #git
02:35 Anja_ joined #git
02:35 jiangpeng joined #git
02:37 TikityTik joined #git
02:38 NeverDie_ joined #git
02:41 skre4 joined #git
02:42 kadoban doug16k: cherry-pick should work, sure. I guess you'd want to make a new branch for each one and then cherry-pick the actual commit it or something
02:43 Rodya_ joined #git
02:44 doug16k kadoban, ok, sounds good. thanks
02:45 Random832 joined #git
02:46 chachasmooth joined #git
02:51 hexagoxel joined #git
02:52 dreiss joined #git
02:55 aavrug joined #git
02:55 fahadash joined #git
02:58 bgerber joined #git
02:59 lagothrix joined #git
03:01 onlyanegg joined #git
03:04 lucasem joined #git
03:08 ianliu joined #git
03:10 cwre joined #git
03:10 ianliu joined #git
03:11 ianliu joined #git
03:12 sunrunner20 joined #git
03:12 MattMaker joined #git
03:13 MattMaker joined #git
03:14 fakenerd joined #git
03:14 MattMaker joined #git
03:15 MattMaker joined #git
03:15 fatalhalt joined #git
03:16 MattMaker joined #git
03:16 MattMaker joined #git
03:17 MattMaker joined #git
03:18 cam27 joined #git
03:18 gradleh8 joined #git
03:20 MaggieC joined #git
03:25 Cabanossi joined #git
03:29 cqi joined #git
03:32 zhodge joined #git
03:32 xall joined #git
03:34 bongo joined #git
03:35 diogenese joined #git
03:36 atomi joined #git
03:37 bongo_ joined #git
03:37 bronson joined #git
03:39 sunrunner20 joined #git
03:39 Cabanossi joined #git
03:39 snowalpaca joined #git
03:41 otiose joined #git
03:44 dreiss joined #git
03:44 pockets joined #git
03:45 pockets are there any git devs in here?
03:45 OsmiumTrees joined #git
03:46 freddy_ joined #git
03:47 freddy___ joined #git
03:51 vamiry joined #git
03:52 ojacobson pockets: try the !list
03:52 gitinfo pockets: [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
03:53 pockets yeah, that's what i figured - was hoping i could catch someone on irc since that'd be easier to go back and forth
03:53 robotroll joined #git
03:53 howdoi joined #git
03:54 kadoban I never see any serious git deving on here
03:54 Emperor_Earth joined #git
03:54 Emperor_Earth_ joined #git
03:56 pockets ah
03:58 roelmonnens joined #git
03:59 tnecniv joined #git
03:59 onlyanegg joined #git
04:01 mmlb joined #git
04:03 aw1 joined #git
04:04 fatalhalt joined #git
04:06 dreiss joined #git
04:11 Bock joined #git
04:12 Bock joined #git
04:16 nickel_dime_look joined #git
04:18 MattMaker joined #git
04:20 juvenal joined #git
04:21 kbeflo joined #git
04:21 cdown joined #git
04:22 sunrunner20 joined #git
04:26 oaao joined #git
04:26 mattp__ joined #git
04:27 freddy___ joined #git
04:27 fakenerd joined #git
04:30 fatalhalt joined #git
04:31 svm_invictvs joined #git
04:38 mel00010 joined #git
04:44 darkbit joined #git
04:44 sea-gull joined #git
04:47 marianina8 joined #git
04:48 sunrunner20 joined #git
04:49 dsdeiz joined #git
04:50 ISmithers joined #git
04:50 acetakwas joined #git
04:52 bongo_ joined #git
04:55 bongo__ joined #git
04:55 navidr joined #git
04:55 Noodlewitt joined #git
04:59 freimatz joined #git
05:02 roelmonnens joined #git
05:03 Cabanossi joined #git
05:07 malt3 joined #git
05:08 fakenerd_ joined #git
05:11 ferr joined #git
05:15 TikityTik joined #git
05:17 ayogi joined #git
05:19 akkad_ joined #git
05:25 Cabanossi joined #git
05:25 MistahKurtz joined #git
05:26 cdown joined #git
05:28 tvw joined #git
05:28 nod joined #git
05:29 sunrunner20 joined #git
05:30 felixjet joined #git
05:31 telephone joined #git
05:31 telephone joined #git
05:32 qt-x joined #git
05:35 xall_ joined #git
05:37 imack joined #git
05:44 sea-gull joined #git
05:44 ogny joined #git
05:45 Raging_Hog joined #git
05:47 PioneerAxon joined #git
05:48 Oatmeal joined #git
05:50 cdown_ joined #git
05:51 freddy_ joined #git
05:54 ThomasLocke joined #git
05:54 ThomasLocke joined #git
05:56 jameser_ joined #git
06:00 vharsh joined #git
06:00 dermoth joined #git
06:02 Silmarilion joined #git
06:04 sunrunner20 joined #git
06:06 rscata joined #git
06:07 Karazhan joined #git
06:08 Es0teric joined #git
06:09 Cabanossi joined #git
06:09 MineCoins joined #git
06:10 PtxDK joined #git
06:11 darkbit joined #git
06:13 Brski joined #git
06:16 fakenerd joined #git
06:17 chele joined #git
06:17 jagob joined #git
06:20 MattMaker joined #git
06:23 freddy___ joined #git
06:23 roelmonnens joined #git
06:25 theiostream joined #git
06:25 idlemind joined #git
06:26 jdahm joined #git
06:27 jdahm I have set the upstream of this branch "a-feature" to say, somerepo/some-branch. I want to now force push just this one branch to that upstream. How do I push just that one branch to whatever is set as the upstream?
06:28 todd_dsm_ joined #git
06:28 kadoban jdahm: I think it depends on what your push.default config is
06:28 jdahm 'git push -f somerepo a-feature' wasn't correct. It pushed to somerepo/a-feature.
06:29 jdahm kadoban: oh ok, do you know how to get this single-branch workflow to work then? I suppose I could just reset what push.default is, but I want to be careful
06:29 jdahm this is a private branch
06:29 onlyanegg joined #git
06:29 kadoban If you're trying to do it explicitly, hmm. Maybe something like  'git push -f HEAD:@{u}' ? No idea if that works even slightly
06:30 freimatz joined #git
06:30 kadoban I think if you have push.default as "current" or "upstream" you can just do 'git push -f'  or "simple" too, though it sounds like your branch names don't match that.
06:31 jdahm I'm trying to be really careful beacuse I once did 'git push -f' and overwrote someone's branch
06:31 kadoban Yeah, you'd want to make sure what your push.default is for sure first
06:31 jdahm ... because it force pused not only the activate branch but the others I had upstreams set for too
06:31 King_Hual joined #git
06:31 King_Hual joined #git
06:31 kadoban Yeah, if it's set to "matching" I think it'll do that. I don't like "matching", I find in pretty unintuitive
06:32 jdahm so 'git config push.default upstream' is what I want, right?
06:32 jdahm 'push the current branch to its upstream branch'
06:33 kadoban I think so, probably with --global, unless you only want to set it for that one repo
06:33 sunrunner20 joined #git
06:35 schleppel joined #git
06:36 mSSM joined #git
06:36 fakenerd joined #git
06:37 jstimm joined #git
06:41 Chuguniy joined #git
06:42 dersand joined #git
06:43 acetakwas joined #git
06:47 Nilesh_ joined #git
06:48 Tobbi joined #git
06:48 manuelschneid3r joined #git
06:51 lb1c joined #git
06:52 ams__ joined #git
06:57 zerow joined #git
06:57 Random832 joined #git
06:57 mar77i_ joined #git
07:00 _ng joined #git
07:02 tarkus joined #git
07:02 ToBeCloud joined #git
07:05 Tobbi joined #git
07:08 sbulage joined #git
07:08 Spinkzeit joined #git
07:10 bket joined #git
07:11 sunrunner20 joined #git
07:13 zhodge joined #git
07:15 berndj joined #git
07:15 ThomasLocke joined #git
07:20 seaman joined #git
07:20 nickel_dime_look joined #git
07:21 aFeijo joined #git
07:21 TheWild joined #git
07:22 TheWild hello
07:22 TheWild some time ago I did "git stash save"
07:23 osse ♫ ♪ A long long time ago / I can still remember how / That music used to make me smile ♪
07:23 aFeijo hello friends. I need to revert my last 5 commits, I used git cherry-pick [5th last commit id]. Is this the right way?
07:23 TheWild hah... wait, I'm typing
07:23 TheWild made a bunch of commits, and today out of curiosity did "git stash list". And yeah, that temporary stuff is still here.
07:24 kadoban aFeijo: Doesn't sound right. What kind of revert? !revert
07:24 gitinfo aFeijo: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
07:24 TheWild I want to see what's there, but not risk merge conflicts thus I would be happy to go back to the commit from where the "git stash save" as done
07:24 aFeijo kadoban, undo all of my past 5 commits
07:24 TheWild but I don't know what commit it was. "git stash list" doesn't display it.
07:25 osse TheWild: git stash show -p stash@{x}
07:25 aFeijo oh, git checkout [commid id]!
07:25 rominronin joined #git
07:26 kadoban aFeijo: Fairly likely not actually what you want
07:26 aFeijo no, it let me check what it was before my 5 commits, almost there, now I need to commit that state and push
07:27 aFeijo to "loose" my last 5 commits, I run: git reset --hard $COMMIT ?
07:27 brent__ joined #git
07:27 kadoban To modify history by discarding the commits and their changes, yes.
07:27 masuberu joined #git
07:28 aFeijo thanks!
07:28 aFeijo didnt work, it set me back 5 commits, it didnt let me save it (create new commit)
07:29 _xor joined #git
07:29 aFeijo with that command, if I run git push, it download the 5 commits again
07:29 JeroenT joined #git
07:29 kadoban Neither you nor I said anything about a new commit. Undo that and do an actual revert perhaps?
07:29 kadoban push doesn't download new commits, I figure you mean pull?
07:30 aFeijo sorry, yes git pull. I'm tired and its 4h30 am here
07:30 aFeijo how can I cancel my last 5 pushed commits? I need to undo all code changes I did
07:30 osse the reset --hard might be correct
07:30 osse but then you need to push -f after, not pull
07:31 Spinkzeit joined #git
07:31 rokups joined #git
07:31 aFeijo wow! Thanks a lot osse, now I can sleep
07:32 aFeijo g'night, guys!
07:34 TheWild thanks osse
07:34 pbandark joined #git
07:34 jdahm joined #git
07:35 TheWild I don't know which commit it was though. Does "git stash save" store such information, or just diff?
07:37 Noodlewitt joined #git
07:37 dminuoso left #git
07:38 osse TheWild: the stash itself is a commit, the first parent is the commit you were on when the stash was made
07:40 TheWild ok, did "git log stask@{1}" and it worked. Thanks
07:43 Tobbi joined #git
07:45 cahoots joined #git
07:45 grayjoc joined #git
07:46 zefferno joined #git
07:47 TheWild interesting. that stash is a merge: https://kopy.io/DJxbZ
07:47 osse TheWild: all stashes are
07:50 austin987 joined #git
07:50 TheWild I don't get it. When I do "git stash save", the parent of that stash is HEAD I had at the moment. What's there to merge?
07:50 dvaske joined #git
07:50 tnecniv joined #git
07:51 dvaske_ joined #git
07:51 xaa joined #git
07:51 JeroenT_ joined #git
07:52 TheWild oh my, the other stash I created while ago is even triple merge.
07:53 tnecniv joined #git
07:53 mdw joined #git
07:55 osse TheWild: stashing creates two commits. one which records the state of the index, and one which records the whole state. the latter is a merge of HEAD at the time and the "index commit"
07:55 freddy_ joined #git
07:55 osse man git-stash, see DISCUSSION
07:55 gitinfo the git-stash manpage is available at https://gitirc.eu/git-stash.html
07:56 indistylo joined #git
07:56 koneko joined #git
07:56 tnecniv joined #git
07:56 elect joined #git
07:59 sunrunner20 joined #git
08:00 Gloomy joined #git
08:01 jameser joined #git
08:03 n3wborn joined #git
08:04 Tobbi joined #git
08:04 TheWild I think I have to experiment on clean repo
08:08 JanC_ joined #git
08:09 kurkale6ka joined #git
08:09 mikecmpbll joined #git
08:10 zeroed joined #git
08:10 zeroed joined #git
08:11 austin987 joined #git
08:12 skered What does a ^ at the start of the commit mean when looking at git-blame output
08:12 pengolinux joined #git
08:12 skered commit-id rather
08:12 Gloomy joined #git
08:13 Gloomy joined #git
08:14 marcogmonteiro joined #git
08:14 bitmod joined #git
08:14 Gloomy joined #git
08:14 skunkz joined #git
08:14 netj_ joined #git
08:15 Gloomy joined #git
08:15 Gloomy joined #git
08:16 Gloomy joined #git
08:17 Gloomy joined #git
08:17 XenophonF joined #git
08:18 Gloomy joined #git
08:19 Gloomy joined #git
08:20 Gloomy joined #git
08:20 Gloomy joined #git
08:20 skered er nm... I think this is from a non-full checkout.
08:20 mikecmpbll joined #git
08:20 MattMaker joined #git
08:21 skered It pull in all the commit history.
08:21 Gloomy joined #git
08:24 TomyLobo3 joined #git
08:24 GT4066 joined #git
08:24 sea-gull joined #git
08:26 ertes joined #git
08:27 Gloomy joined #git
08:27 styx_ joined #git
08:28 TheWild https://kopy.io/GsPxu - based on what the doc says, 89af0df (index...) should have 84aab5c (initial commit) as a parent.
08:32 cqi joined #git
08:32 finalbeta joined #git
08:32 sunrunner20 joined #git
08:33 TheWild nvm, took a peek at git rev-list and in fact it is.
08:34 TheWild what is the reason for git stash of storing index and working tree in separate commits?
08:34 catphish joined #git
08:35 canton7 TheWild, so that when you stash apply/pop, it will restore the working tree and the index
08:36 Raging_Hog joined #git
08:37 catphish am i right in thinking that at some point a change resulted in submodules having their repositories stored outside of their tree by default?
08:37 canton7 yeah, it was quite a while ago
08:38 catphish it seems to be causing me issues, although i'm unclear why, is it configurable?
08:39 canton7 I don't see anything in man git config or man git submodule
08:39 gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html
08:39 gitinfo the git-submodule manpage is available at https://gitirc.eu/git-submodule.html
08:39 canton7 what issues are you seeing?
08:39 catphish i'm seeing an error "fatal: Not a git repository: '/path/to/repo/path/to/submodule/.git'" (not sure yet what command is generating this error) but the file referenced is indeed not a git repository, it's a file that points to a repository elsewhere
08:39 peacememories joined #git
08:39 canton7 what command gives that?
08:39 canton7 what git version?
08:40 notebox joined #git
08:40 catphish i'm not sure yet, just trying to find out, i'll come back when i have better information
08:40 canton7 well, what do you type to trigger that error?
08:40 osse did it appear automatically?
08:40 osse heh
08:40 felixjet joined #git
08:41 catphish osse: unfortunately yes, deep inside some automation
08:41 canton7 ah, funtimes
08:41 catphish i got got pasted the error
08:42 osse catphish: set GIT_TRACE=1 in the environment somewhere suitable
08:42 osse ideally before, but not too long before that thing happens
08:42 catphish makes sense, thanks, i'll come back when i have more info :)
08:44 freddy_ joined #git
08:44 catphish looks like i have actually upgraded git since the problem was reported, so i'm hoping it's already fixed
08:44 catphish thanks for the pointers anyway
08:44 slidercrank joined #git
08:45 canton7 fingers crossed!
08:46 JeroenT joined #git
08:47 snthsnth joined #git
08:48 seni joined #git
08:48 xall joined #git
08:49 mar77i joined #git
08:51 freddy___ joined #git
08:52 cstratak joined #git
08:53 mdw joined #git
08:55 dhollinger joined #git
08:55 Raging_Hog joined #git
08:56 rasto joined #git
08:57 chll_ joined #git
08:57 cstratak joined #git
08:58 Snugglebash joined #git
08:58 ti2 joined #git
08:59 Tobbi joined #git
09:00 JeroenT joined #git
09:02 sarri joined #git
09:02 sarri joined #git
09:02 acresearch joined #git
09:02 acresearch people, i am new to git and trying to learn, what is the difference between clone and pull?
09:03 Snugglebash joined #git
09:04 sunrunner20 joined #git
09:05 osse acresearch: clone obtains a repo you don't have. pull updates one you already have.
09:06 osse for every repo you work in you only really use clone once in normal circumstances, and that is when you first get it
09:07 kbeflo joined #git
09:07 Sound joined #git
09:07 Sound joined #git
09:07 ispn joined #git
09:07 dsdeiz joined #git
09:08 pythdasch joined #git
09:08 acetakwas joined #git
09:08 pythdasch Hey everyone
09:09 pythdasch I'm trying to debug my application and needs to jump into the history to see where the bug happened. How can I jump into history with git log ?
09:09 kbeflo joined #git
09:09 Cabanossi joined #git
09:10 tymczenko joined #git
09:10 acresearch osse: oh ok makes sense
09:10 osse pythdasch: git log just shows, not jumps. use git checkout to jumo
09:10 osse pythdasch: you might like git bisect
09:10 kbeflo joined #git
09:10 Random832 joined #git
09:11 pythdasch git bisect ? that's nice so I can either do git checkout #Hashcommit or git bisect ?
09:11 pythdasch thx
09:11 pythdasch wow that's so cool bisect
09:11 zachary12 joined #git
09:11 cstratak joined #git
09:12 safe joined #git
09:12 kbeflo joined #git
09:14 pythdasch thx osse
09:14 kbeflo joined #git
09:15 kbeflo joined #git
09:17 Brski joined #git
09:18 Endarked joined #git
09:19 Raging_Hog joined #git
09:20 kexmex joined #git
09:21 mrkake joined #git
09:24 User458764 joined #git
09:27 Levex joined #git
09:29 ij Why would I ever see this with a «directory -> bare repo» fetch?
09:29 ij "! [rejected]          master       -> refs/remote/origin/master  (non-fast-forward)"
09:29 cqi joined #git
09:35 ignatiz- joined #git
09:38 ti2 you will always see this when your local 'master' and your remote 'master' branch have diverged history (e.g. you amended/rebased commits)
09:38 Murii joined #git
09:39 adgtl left #git
09:39 Cabanossi joined #git
09:40 alburaq joined #git
09:41 sunrunner20 joined #git
09:42 dsdeiz joined #git
09:42 dsdeiz joined #git
09:43 brent__ joined #git
09:44 osse pythdasch: indeed
09:44 osse pythdasch: you can even automate it
09:45 osse ij: because the refspec is wrong.
09:45 osse ij: a fetch is sort of like push but in the other direction, right? The usual case is that fetches basically use --force
09:46 rasto joined #git
09:47 tarkus joined #git
09:48 IRQ` joined #git
09:48 routingsparks joined #git
09:49 ij osse, So you're saying git fetch should usually be used with -f for bares?
09:49 osse no
09:49 osse ij: what does 'git config remote.origin.fetch' say ?
09:49 zhodge joined #git
09:50 ij I fetch with «git fetch origin '+*:*'» and «git config remote.origin.fetch => refs/heads/*:refs/remote/origin/*»
09:50 osse well, yes, you can use -f, but the default is that it works like -f even without it
09:50 ij Oh!
09:50 osse git config remote.origin.fetch '+refs/heads/*:refs/remote/origin/*'
09:50 WayToDoor joined #git
09:51 osse I guess +*:* should work... but i don't think that's what has happeend in your error
09:51 ij Also, how does this syntax decompose?
09:52 osse what do you mean?
09:52 Acerific joined #git
09:52 aspiers joined #git
09:52 osse i'm not good with fancy words
09:52 moritz what are the elements of this syntax?
09:52 moritz like, what does the + and the : mean
09:53 * moritz trying to translate ij's question
09:53 ij You've done your job well. :)
09:53 osse it's a mapping from source to destination
09:53 osse * is a wildcard
09:53 osse the + basically just means --force
09:54 snthsnth joined #git
09:55 ij Nice!
09:55 osse so take whatever refs/heads/foo points to at origin and store it as refs/remotes/origin/foo locally, for all possible foo. and do it even if refs/remotes/origin/foo currently points to something that would be lost
09:56 Snugglebash joined #git
09:56 osse inshallah
09:56 jpX joined #git
09:57 _dirt joined #git
09:58 indistylo joined #git
09:59 cstratak joined #git
10:00 courrier joined #git
10:01 Tobbi joined #git
10:02 notebox joined #git
10:06 govg joined #git
10:06 jarard joined #git
10:07 jarad01 joined #git
10:08 jarard hi everyone I have a question about branching
10:08 jarard I checked out a copy of my project on my local machine and created a develop branch, all works well
10:09 jarard on my 2nd local develop machine I checked out and copy of my project, how do i get access to the develop branch, or do i create my own new one?
10:09 moritz jarard: do you have a central repo that you cloned from?
10:09 Cabanossi joined #git
10:10 _dirt push the develop branch to the central repo
10:10 jarard moritz, yes i have central which I merge the develop to
10:10 moritz jarard: then on local machine 1, push the branch. On the second machine, git fetch
10:10 moritz and then git checkout develop
10:11 _dirt git push -u origin develop
10:11 jarard ok I think I got confused because i am using sourcetree and it just checked out the main master I think
10:11 moritz !gui
10:11 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
10:12 mdw joined #git
10:13 jarard I understand, makes sense
10:15 jarard there is an option to use terminal, so I just did "git checkout develop", is that all that is required?
10:15 entuland joined #git
10:15 _dirt should be fine
10:16 _dirt you can use git log
10:16 _dirt to see what the last commit on that develop branch was...just to be sure its the same on both dev machines
10:17 entuland hello everybody, I'm not sure I get this detail: I'm creating files with Linux EOLs on Windows, and when I stage a file from GIT GUI it warns me that the file will be converted to Windows EOLs
10:17 sunrunner20 joined #git
10:17 theoceaniscool joined #git
10:17 Remram joined #git
10:17 entuland should I set any property to avoid getting such a warning?
10:17 mdw joined #git
10:17 dsdeiz joined #git
10:18 jarard _dirt, thanks
10:19 IRQ` joined #git
10:19 entuland uhm... I found this: git config --global core.safecrlf false
10:21 peacememories joined #git
10:21 MattMaker joined #git
10:23 _dirt joined #git
10:25 entuland so far so good, have good gitting everyone
10:25 stduolc joined #git
10:25 entuland left #git
10:26 stduolc hi, I want to delete the settings file in all commits, because the settings file contains some passwords, how can I do that?
10:26 osse !sensitive
10:26 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
10:26 _ikke_ jarard: the reason that git checkout develop works is because git guesses that you want to create a new branch based on the remote one
10:30 h12o joined #git
10:36 stduolc I use gitlab in my company, Can I use push --force --all flags?
10:39 _ikke_ stduolc: Depends if there are 'protected' branches
10:39 rkazak joined #git
10:43 mar77i joined #git
10:44 xall joined #git
10:48 HoierM joined #git
10:50 Tobbi joined #git
10:51 dsdeiz joined #git
10:51 dsdeiz joined #git
10:53 sunrunner20 joined #git
10:54 neunon joined #git
10:54 borkr joined #git
10:55 ertes joined #git
10:57 neunon joined #git
10:59 Shock_ joined #git
11:02 Joel joined #git
11:03 Gloomy joined #git
11:04 dsdeiz joined #git
11:06 zefferno joined #git
11:09 earnestly joined #git
11:09 Cabanossi joined #git
11:10 Random832 joined #git
11:14 WayToDoor joined #git
11:14 theoceaniscool joined #git
11:15 cousteau joined #git
11:15 cousteau is a `master` branch mandatory?  Can I delete it temporarily and then recreate it?
11:16 cousteau ...then again, for what I'm about to do it'd be more elegant to just merge everything into master
11:16 kurkale6ka joined #git
11:17 bongjovi joined #git
11:18 demize no ref is mandatory.
11:19 ollie__ joined #git
11:20 joelthepirate joined #git
11:20 joelthepirate joined #git
11:21 davimore joined #git
11:21 cousteau ok, so I did a massive merge of all the branches I had, and I got the message "Simple merge did not work".  Does this mean there were conflicts, or only that some files were modified by more than one branch but could be merged seamlessly?
11:22 * cousteau did `grep === -R .` and found no matches, yay
11:23 _ikke_ cousteau: did it mention something about merge by recursive?
11:23 fahadash joined #git
11:24 cousteau the problem is that I decided to use a GUI (git extensions) and instructed it to close the message window as soon as it was done, so let me see if I find a log or something
11:25 alburaq joined #git
11:26 ollie__ Hi guys, I hope somebody can help I've tried lots of suggestions from google (stackoverflow mainly...) but nothing I do seems to work. I'm trying to revert my master branch to an older commit - have the files at HEAD exactly how they were at xyz commit. I've tried to checkout the older version and commit, tried to checkout to a temp branch and rebase (gave merge conflicts) and tried to do a git rm -rf which g
11:26 ollie__ ave conflicts also. Two of the things I tried are here with the errors: https://pastebin.com/FNhqDuXN
11:26 CussBot_ joined #git
11:28 sunrunner20 joined #git
11:28 WayToDoor joined #git
11:28 cousteau _ikke_: nvm, it seems that git-extensions displays a big red message if there are conflicts, so I'm good
11:29 _ikke_ cousteau: Right, I think it just meant git is using a different merging strategy (which is pretty common)
11:29 cousteau yeah, that's what I thought, but wanted to make sure
11:30 cousteau I guess first strategy is "if modified files are disjoint sets, then just copy all the new files"
11:30 YuGiOhJCJ joined #git
11:30 _dirt_ joined #git
11:30 cousteau and second is "ok, let's try to merge changes on same file"
11:31 _ikke_ I don't think git sees that as two different strategies
11:31 _ikke_ It's more about finding the common ancestor
11:31 zachary12 joined #git
11:31 cousteau ah
11:31 adgtl joined #git
11:34 Xenophon1 joined #git
11:36 ollie__ Hi guys, I hope somebody can help I've tried lots of suggestions from google (stackoverflow mainly...) but nothing I do seems to work. I'm trying to revert my master branch to an older commit - have the files at HEAD exactly how they were at xyz commit. I've tried to checkout the older version and commit, tried to checkout to a temp branch and rebase (gave merge conflicts) and tried to do a git rm -rf which g
11:37 ollie__ ave conflicts also. Two of the things I tried are here with the errors: https://pastebin.com/FNhqDuXN
11:39 Cabanossi joined #git
11:40 vrach joined #git
11:40 roelmonn_ joined #git
11:40 Endarked joined #git
11:41 bitmod joined #git
11:45 ollie__ nobody?
11:47 sunrunner20 joined #git
11:48 osse !revert > ollie__
11:48 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
11:48 osse ollie__: seems like you want (e)
11:49 ollie__ I'm lost tbh, I just want the easiest way to put the files/state at xyz commit to HEAD
11:49 tvl joined #git
11:49 freddy_ joined #git
11:49 ollie__ everything I've tried has either given me merge conflicts or put me into a headless state
11:50 ollie__ I'm about to give up on doing it 'the proper way' and just rename a dev branch into master branch
11:51 osse git checkout master; git reset --hard xyz
11:51 osse that's what you want. based on your description
11:51 osse s/\./,/
11:52 ollie__ will that set the repo to that commit or do I need to push/commit/something after that?
11:52 freddy_ joined #git
11:52 osse both.
11:53 osse it will set the repo on your computer to that commit
11:53 osse but you have to share that with the world by pushing (possibly with --force)
11:53 ollie__ ok
11:53 gradleh8 joined #git
11:53 ianliu left #git
11:54 ollie__ so to be clear: if I do a "git reset --hard xyz" and then "git push -f origin master" that should achieve what I want?
11:54 ianliu joined #git
11:54 osse yes
11:54 Shock_ joined #git
11:54 osse (well, assuming my interpretation of you is correct. but i think it is)
11:54 cyphase joined #git
11:54 Tobbi joined #git
11:54 ollie__ ty I will try it in a minute
11:56 Panacea joined #git
11:57 EmilQ joined #git
11:58 EmilQ I'm having an odd issue with some commits that are seemingly missing from the history, I managed to locate them in the corresponding origin branch and got their hashes
11:58 cam27 joined #git
11:59 IRC-Source_57274 joined #git
11:59 EmilQ Then I ran git branch --all --contains <hash> and surprisingly enough, git said they are actually in my working branch
11:59 EmilQ Yet git log on that branch does NOT list that commit in the history of the file
12:00 netroxen joined #git
12:00 EmilQ git log --all does, though
12:00 rnsanchez joined #git
12:00 tobiasvl EmilQ: !repro
12:00 gitinfo EmilQ: [!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
12:01 EmilQ Unfortunately it's at work, on the computers of some coworkers of mine
12:01 EmilQ NDAed names and such
12:01 EmilQ I'd have to falsify most of the information
12:01 tobiasvl then it's hard to help
12:02 tarkus joined #git
12:02 EmilQ I suppose :'(
12:02 EmilQ At first, I thought it was a discrepancy between libgit2 and command-line git
12:02 EmilQ Most of them were using TortoiseGit
12:03 pbandark joined #git
12:03 EmilQ But the same discrepancy occurs in the command-line, too
12:03 Shock_ joined #git
12:08 osse EmilQ: try git log --full-history
12:09 roelmonnens joined #git
12:09 doug16k left #git
12:11 Tobbi joined #git
12:12 gradleh8 joined #git
12:14 oskarkv joined #git
12:14 synthroid joined #git
12:15 freddy_ joined #git
12:16 freddy_ joined #git
12:16 EmilQ osse: it appears to be in there - what does that mean?
12:17 EmilQ What does the discrepancy between git log and git log --full-history indicate?
12:17 cousteau left #git
12:17 osse Seems like you have useless merges
12:17 EmilQ Does that mean that the changeset has been pruned away?
12:17 osse Merges that don't change anything
12:17 mkoskar joined #git
12:18 synthroi_ joined #git
12:18 ertes joined #git
12:19 EmilQ But the latest modifications to the file in question are missing in git log
12:19 EmilQ And the current state of the file is different from the latest one in git log --all
12:19 Cavallari joined #git
12:21 osse Git log by default lists from HEAD and backwards
12:21 EmilQ Yet git branch --contains says it's in there, curiously enough
12:21 osse "
12:21 EmilQ Yes, in topological order, rigth?
12:21 EmilQ Rather than temporal order
12:21 osse And HEAD isn't necessarily the newest
12:21 osse Yes
12:22 MattMaker joined #git
12:23 digidog joined #git
12:23 WayToDoor joined #git
12:24 marcogmonteiro joined #git
12:25 Dev0n joined #git
12:25 osse with --all you might get commits even newer than the one represented by the files on disk
12:27 sunrunner20 joined #git
12:27 dglambert joined #git
12:27 dglambert yo
12:27 thiago joined #git
12:28 i7c oy
12:31 ertes joined #git
12:32 Shock_ joined #git
12:33 bongjovi joined #git
12:34 p4trix joined #git
12:35 elichai2 joined #git
12:36 p4trix I have "production" checked out. Now want to reset "master" to "origin/master" --hard, but without doing the checkout to master.
12:36 p4trix Staying in the "production" branch
12:37 p4trix "git update-ref master origin/master" did not work for me
12:37 canton7 p4trix, git fetch origin && git branch -f master origin/master
12:37 p4trix Ow, sure! Thx canton7
12:37 osse p4trix: for update-ref you need to type out the whole thing with "refs/heads" in front etc
12:37 p4trix Thx osse
12:38 davimore joined #git
12:38 MistahKurtz joined #git
12:39 MrLawrence joined #git
12:39 EmilQ A coworker believes he found the source of the problem, something involving adventurous merges performed by some other team, I didn't really get it
12:39 gugah joined #git
12:40 _dirt joined #git
12:40 borkr joined #git
12:43 peacememories joined #git
12:43 cstratak joined #git
12:45 livingstn joined #git
12:46 kurkale6ka joined #git
12:47 otiose joined #git
12:47 Shock_ joined #git
12:48 juvenal joined #git
12:52 jeffreylevesque joined #git
12:53 gugah joined #git
12:56 Achylles joined #git
12:57 wERT joined #git
13:01 _dirt joined #git
13:02 seni joined #git
13:02 Tobbi joined #git
13:03 telephone joined #git
13:03 telephone joined #git
13:04 _ng joined #git
13:04 koneko joined #git
13:05 wERT left #git
13:06 mohan joined #git
13:06 h12o joined #git
13:06 marianina8 joined #git
13:07 bitmod joined #git
13:09 Cabanossi joined #git
13:09 Random832 joined #git
13:10 mar77i joined #git
13:10 _Stumbler joined #git
13:11 Guest75659 joined #git
13:13 sunrunner20 joined #git
13:14 freddy_ joined #git
13:15 kexmex joined #git
13:15 lagothrix joined #git
13:18 relipse__ joined #git
13:19 mdw joined #git
13:20 sz0 joined #git
13:20 ankit01ojha joined #git
13:22 ExoUNX joined #git
13:24 theoceaniscool joined #git
13:24 vmiklos joined #git
13:25 gnixev joined #git
13:26 doMynation joined #git
13:26 TheSimonator joined #git
13:30 Endarked joined #git
13:33 cstratak joined #git
13:36 vmiklos joined #git
13:37 freddy_ joined #git
13:41 tnecniv joined #git
13:42 rastos2 joined #git
13:43 rwb joined #git
13:46 AaronMT joined #git
13:46 Levex joined #git
13:47 acetakwas joined #git
13:47 sunrunner20 joined #git
13:49 tnecniv joined #git
13:50 otiose joined #git
13:50 mekhami left #git
13:50 psprint joined #git
13:51 psprint Hello. Anyone familiar if notabug.org gained any momentum? I'm writing a git tool and there are predefined sites, not sure if should add notabug.org there. What could I add besides GH, GitLab, BitBucket ?
13:51 dosmachko joined #git
13:54 ollie__ osse: thank you btw
13:54 ollie__ worked :)
13:56 osse ollie__: yet another proof that i'm the best person in the world at everything
13:56 catphish psprint: i would have to recommend adding codebase disclaimer: i own it
13:56 jameser joined #git
13:58 tnecniv joined #git
13:59 psprint catphish: I have 62 free slots, I think I will add your site, trying to balance adding sites to not regret later that there are no free slots, but as I can see notabug.org disappearing because "it's free software" or something doesn't work today, I rather don't see your site closing, at least as it presents itself
13:59 cdg joined #git
14:00 pengolinux joined #git
14:00 catphish psprint: you'd probably do well to google "git hosting" and see what pops up
14:00 catphish my site used to be #2, seems there are many more competitors these days
14:01 catphish codebase sits on page 3 now :(
14:01 jast psprint: possibly repo.or.cz which is one of the earliest public hosting sites
14:01 jast it's not nearly as shiny as the others but oh well
14:01 catphish yep, that one too, and obviously the 3 you mentioned
14:02 catphish repo.or.cz is old and stable though
14:02 Harzilein jast: i once wanted to fork its girocco codebase
14:02 Nerbrun joined #git
14:02 Harzilein jast: i like repo.or.cz a lot
14:02 jast I've contributed to girocco... but it's a little tricky to set up :)
14:03 chele joined #git
14:04 chele joined #git
14:04 psprint many competitors, better postpone adding sites to do it at users requests, the thing is I use Huffman prefix codes, and have 69 of them, with 3 already taken by gh, glab, bbucket
14:04 NimeshNeema joined #git
14:05 jast Huffman prefix codes? 62 slots? this is sounding fancy
14:05 fahadash joined #git
14:06 psprint yeah but I will reveal the project when I do a release, should be a week or so
14:09 Njvpg joined #git
14:10 felixjet joined #git
14:11 felixjet joined #git
14:13 TikityTik joined #git
14:14 hotpancakes joined #git
14:15 ResidentBiscuit joined #git
14:15 nevodka joined #git
14:15 ResidentBiscuit joined #git
14:15 tnecniv joined #git
14:16 Gsham joined #git
14:17 _dirt joined #git
14:20 peacememories joined #git
14:21 livingstn joined #git
14:26 lknd joined #git
14:26 peacememories joined #git
14:26 h12o joined #git
14:31 cdg_ joined #git
14:31 Es0teric joined #git
14:32 ertes joined #git
14:32 Gianormagantrous joined #git
14:33 scottjl joined #git
14:33 _dirt joined #git
14:37 scottjl joined #git
14:39 Cabanossi joined #git
14:41 shinnya joined #git
14:46 otiose joined #git
14:46 lewix joined #git
14:46 chardan Question... is there a way to get this command to list files that /would/ have had conflicts? git cherry-pick --strategy=recursive -X ours <sha>
14:46 chardan I guess maybe that doesn't make a lot of sense, but I figure I'd ask.
14:46 chardan (eg. if "ours" were not active)
14:47 TheSimonator joined #git
14:48 Tobbi joined #git
14:49 lewis joined #git
14:49 kpease joined #git
14:50 tnecniv joined #git
14:51 darkbit joined #git
14:52 davidfetter_ge joined #git
14:52 scorphus joined #git
14:52 davidfetter_ge hi
14:53 synthroid joined #git
14:53 Levex joined #git
14:53 davidfetter_ge what's git-ese for "show the diff from HEAD~5 to HEAD as one patch" ?
14:54 davidfetter_ge or do i need to make a branch, do the squash, and look at that?
14:54 kfunk `git diff HEAD~5..HEAD`?
14:55 davidfetter_ge thanks :)
14:56 zhodge joined #git
14:56 davidfetter_ge left #git
14:57 dhollinger joined #git
14:57 al-damiri joined #git
14:59 rmesta joined #git
14:59 nowhereman joined #git
15:00 jtoy joined #git
15:02 roelmonn_ joined #git
15:06 tnecniv joined #git
15:07 h12o joined #git
15:07 aruns joined #git
15:08 Raging_Hog joined #git
15:08 kexmex joined #git
15:09 Random832 joined #git
15:11 zivester joined #git
15:12 Achylles joined #git
15:12 hhee joined #git
15:13 Endarked joined #git
15:14 hhee joined #git
15:14 zhodge joined #git
15:15 Tobbi joined #git
15:15 Taikibansei joined #git
15:15 Murii joined #git
15:17 theoceaniscool joined #git
15:19 zerow joined #git
15:20 MattMaker joined #git
15:20 tnecniv joined #git
15:21 sea-gull joined #git
15:22 Introoter joined #git
15:22 Raging_Frog joined #git
15:22 romin_ joined #git
15:24 hotpancakes joined #git
15:25 uva joined #git
15:25 publio joined #git
15:26 uva I would like `git log A..B`, but exclude all commits for which `git describe --contains` returns something. Is this trivially achievable?
15:28 uva Like, for i in $(git rev-list --reverse A..B); do git describe --contains "$i" &>/dev/null || git log -1 "$i"; done, but with something built-in.
15:29 cstratak joined #git
15:31 XenophonF joined #git
15:36 tsetair joined #git
15:38 hotpancakes joined #git
15:39 frankkahle joined #git
15:39 Cabanossi joined #git
15:39 _ikke_ There is nothing built-in
15:41 onlyanegg joined #git
15:41 freddy_ joined #git
15:42 mekhami joined #git
15:42 robotroll joined #git
15:42 chll_ joined #git
15:42 cahoots joined #git
15:45 Levex joined #git
15:45 lb1c joined #git
15:47 diogenese joined #git
15:48 vmiklos joined #git
15:48 Noldorin joined #git
15:48 rebrec joined #git
15:50 Dougie187 joined #git
15:50 jstimm joined #git
15:51 marcogmonteiro joined #git
15:51 brent__ joined #git
15:51 sea-gull joined #git
15:53 mekhami left #git
15:56 adlaistevenson joined #git
15:56 cagomez joined #git
15:57 Starky joined #git
15:58 h12o joined #git
15:59 dreiss joined #git
16:00 mostlybadfly joined #git
16:02 ayogi joined #git
16:03 mel00010 joined #git
16:03 nixjdm joined #git
16:05 jackrandom joined #git
16:06 freimatz joined #git
16:06 Raging_Hog joined #git
16:06 resi joined #git
16:07 hotpancakes joined #git
16:07 govg joined #git
16:09 jackrandom joined #git
16:09 livingstn joined #git
16:09 resi can anyone recommend a place to learn fundamentals of git or validate this [0] is a good place ot start
16:09 resi [0] https://try.github.io/levels/1/challenges/1
16:10 tarkus joined #git
16:11 bremner !book
16:11 gitinfo 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
16:11 darkbit joined #git
16:11 resi thanks
16:12 Gloomy joined #git
16:13 Gustavo6046 joined #git
16:13 monjwf joined #git
16:14 cagomez joined #git
16:14 resi left #git
16:16 h12o joined #git
16:19 fakenerd joined #git
16:19 kexmex joined #git
16:20 navidr joined #git
16:20 bitmod joined #git
16:22 kurkale6ka joined #git
16:22 gareppa joined #git
16:23 mjuszczak joined #git
16:27 hotpancakes joined #git
16:28 boombatower joined #git
16:28 TheSimonator joined #git
16:30 King_Hual joined #git
16:32 cdown joined #git
16:32 marianina8 joined #git
16:32 tnecniv joined #git
16:33 mjuszczak joined #git
16:34 nickel_dime_look joined #git
16:38 _dirt joined #git
16:39 Achylles joined #git
16:41 fazer2 joined #git
16:41 adlaistevenson left #git
16:41 fazer2 hi, how can I change git gui colors? it ignores system theme on Xfce
16:43 tyreld joined #git
16:44 uva left #git
16:48 duderonomy joined #git
16:49 Cavallari joined #git
16:50 mjuszczak joined #git
16:50 fazer2 is git gui still being developed?
16:51 fatalhalt joined #git
16:53 Alexber joined #git
16:54 romin_ joined #git
16:54 _Vi joined #git
16:54 livingstn joined #git
16:55 cdown joined #git
16:55 _Vi How do I list parents of the given commit? Like "git cat-file commit ..... | grep '^parent'", but proof against occurrences of "parent ...." inside commit messages?
16:57 cdown_ joined #git
17:01 synthroid joined #git
17:03 Ardethian joined #git
17:03 hobodave joined #git
17:04 madewokherd joined #git
17:04 zeroed joined #git
17:04 zeroed joined #git
17:08 Random832 joined #git
17:09 Cabanossi joined #git
17:10 jost joined #git
17:11 roelmonnens joined #git
17:11 endiruna joined #git
17:11 courrier joined #git
17:14 raynold joined #git
17:14 Tobbi joined #git
17:17 imack joined #git
17:18 cdown joined #git
17:20 Es0teric joined #git
17:22 fatalhalt joined #git
17:23 mjuszczak joined #git
17:26 hotpancakes joined #git
17:28 ResidentBiscuit joined #git
17:28 gopar joined #git
17:29 ResidentBiscuit joined #git
17:29 ResidentBiscuit joined #git
17:30 joshszep joined #git
17:30 livingstn joined #git
17:30 fatalhalt joined #git
17:33 robotroll joined #git
17:35 mSSM joined #git
17:35 Sound joined #git
17:42 mekhami joined #git
17:45 causasui joined #git
17:46 roelmonnens joined #git
17:47 roelmonnens joined #git
17:48 weakdan joined #git
17:49 fatalhalt joined #git
17:49 mjuszczak joined #git
17:50 sea-gull joined #git
17:51 Quetzal joined #git
17:51 livingstn joined #git
17:51 tarkus joined #git
17:52 danemacmillan joined #git
17:52 marianina8 joined #git
17:54 cagomez joined #git
17:56 roelmonnens joined #git
17:56 apotry joined #git
17:59 quite joined #git
17:59 quite joined #git
17:59 hotpancakes joined #git
17:59 fatalhalt joined #git
18:00 hotpanca_ joined #git
18:01 shinnya joined #git
18:01 zeroed joined #git
18:01 alburaq joined #git
18:01 Sasazuka joined #git
18:01 Cavallari joined #git
18:02 nezZario This is really frustrating.  Is there a way to force-apply a stash ?
18:02 Gloomy joined #git
18:02 mekhami left #git
18:03 nezZario I have miles and miles of node_modules/some-dependency/... already exists, no checkout
18:03 brent__ joined #git
18:03 Gloomy joined #git
18:04 Gloomy joined #git
18:05 Yeeu joined #git
18:06 Kulrak joined #git
18:06 Kulrak joined #git
18:06 theoceaniscool joined #git
18:08 cagomez joined #git
18:09 brent___ joined #git
18:09 brent__ joined #git
18:12 mel00010 joined #git
18:13 mikecmpbll joined #git
18:16 livingstn joined #git
18:21 bitmod joined #git
18:21 tmsmith joined #git
18:21 chubek__ joined #git
18:22 Nugget joined #git
18:23 kadoban force apply doesn't really make any sense. What's the actual error message you're getting? And what's 'git status' and such?
18:25 duderonomy joined #git
18:25 chu_ubek_ joined #git
18:25 whitby nezZario: it should be possible to `git checkout $stash -- node_modules/`
18:26 gnixev joined #git
18:26 romin_ joined #git
18:27 chubek_ joined #git
18:29 robattila256 joined #git
18:29 hotpancakes joined #git
18:29 ssarah joined #git
18:31 apotry joined #git
18:32 MattMaker joined #git
18:33 ahrs joined #git
18:34 mar77i joined #git
18:34 jackrandom joined #git
18:34 mozzarella joined #git
18:35 hyperair joined #git
18:35 leprechau joined #git
18:36 cha1800 joined #git
18:36 dust_ joined #git
18:37 cjohnson_ joined #git
18:37 hexa- joined #git
18:37 cahoots joined #git
18:37 bambams_ joined #git
18:37 bambams_ joined #git
18:37 sea-gull joined #git
18:38 BlessJah_ joined #git
18:38 stfn1 joined #git
18:38 spb_ joined #git
18:38 Daviey_ joined #git
18:38 hashtagstrashtag joined #git
18:38 Xenophon1 joined #git
18:38 jj-_ joined #git
18:39 Virox- joined #git
18:39 FilipNor2ic joined #git
18:39 forgot joined #git
18:39 reality404 joined #git
18:39 synthroi_ joined #git
18:39 Murii joined #git
18:39 nevodka joined #git
18:40 sonOfRa joined #git
18:40 uther joined #git
18:40 uther joined #git
18:40 _Stumbler joined #git
18:41 mekhami joined #git
18:42 cliluw joined #git
18:43 leeN joined #git
18:45 dvaske_ joined #git
18:45 brent__ joined #git
18:46 hexa- joined #git
18:46 Es0teric joined #git
18:47 telephone joined #git
18:47 telephone joined #git
18:48 YuGiOhJCJ joined #git
18:48 Levex joined #git
18:48 dsdeiz joined #git
18:48 dsdeiz joined #git
18:50 rkazak joined #git
18:51 Dougie187 joined #git
18:53 grumble joined #git
18:56 mekhami why
18:56 mekhami why does my client keep making me join this channel
18:57 mekhami whhhhhyyyy
18:57 bgerber joined #git
18:57 livingstn joined #git
18:58 zeroed joined #git
18:58 gnixev joined #git
18:59 kadoban mekhami: It's hinting that you belong with us gits.
19:01 finalbeta joined #git
19:01 paws_ joined #git
19:02 nezZario whitby: - what I ended up doing
19:02 whitby mekhami: :(
19:02 whitby nezZario: alrighty
19:03 hexa- joined #git
19:04 elichai2 joined #git
19:05 gnixev joined #git
19:06 drupol hi all,
19:06 rmesta joined #git
19:07 drupol I'm looking for a bit of help. I'm trying to checkout an old commit-id and re-apply the changes of the next commit-id, so I can debug what's wrong.
19:07 ghoti joined #git
19:07 drupol How to do ?
19:09 Random832 joined #git
19:09 Darren_ joined #git
19:12 rmesta1 joined #git
19:12 Acerific joined #git
19:12 Acerific joined #git
19:14 bezhermoso joined #git
19:14 garyserj Unlink of file 'hprog1/McDonaldAnalogy.docx' failed. Should I try again? (y/n) n
19:14 scoobertron joined #git
19:14 garyserj sorry..
19:14 garyserj I did >git checkout d6dd30c,  then I got that message
19:15 garyserj I hit 'n' and it's just waiting for ages
19:15 garyserj not checking out
19:15 drupol Ok I found the solution.
19:16 garyserj oh well, i risked it and did ctrl-c then checkout again and it was fine. i also closed that file.
19:16 sea-gull joined #git
19:17 chubek_ drupol: just us rebase and squash them together if u dont mind merging them, else just reset HEAD~ on the commit u want to to take changes from stash them and go to the other commit and apply/pop the stash
19:17 chubek_ you might experience some conflicts while poping the stash
19:18 juvenal joined #git
19:18 phase3 joined #git
19:18 drupol chubek, let's say that I want to check what where the changes between commit-id 19 and 20, HEAD commit-id is 50. What I did is: git checkout commit-id-20; git reset --soft commit-id-19;
19:19 WayToDoor joined #git
19:19 drupol chubek_: your solution seems harder :-)
19:20 kadoban git diff 19 20  ?
19:20 kadoban Alternatively, maybe git log --patch 19...20
19:20 chubek_ you said you wante dto apply the changes, now you're saying you want to check them
19:20 yqt joined #git
19:20 chubek_ those are different things
19:21 drupol kadoban: I don't want the diff, I want to be able to modify the changes as if they were just done in my IDE.
19:21 chubek_ if u want to get the files that were modified in the commit that sits on your current head
19:21 chubek_ you reset HEAD~ and get them in your cwd
19:21 drupol kadoban: yes, to get a diff, I got that.
19:21 uther joined #git
19:21 drupol Okay
19:22 drupol Thanks all :-)
19:23 mda1 joined #git
19:23 anuxivm joined #git
19:24 NeXTSUN joined #git
19:24 Cabanossi joined #git
19:28 brent__ joined #git
19:29 cahoots joined #git
19:30 rmesta joined #git
19:30 ssarah joined #git
19:30 Atm0spher1c joined #git
19:31 MrLawrence joined #git
19:32 choki joined #git
19:34 dsdeiz joined #git
19:34 dsdeiz joined #git
19:34 Levex joined #git
19:38 rmesta joined #git
19:39 Es0teric joined #git
19:39 scoobert1on joined #git
19:39 prg3 joined #git
19:42 ekinmur joined #git
19:43 p4trix joined #git
19:44 cjohnson drupol: isn't bisect what you want?
19:44 _ng joined #git
19:44 drupol cjohnson: I never used bisect yet...
19:44 cjohnson it lets you walk through time to find the commit where something broke/changed
19:44 cjohnson in a hand-holdey way
19:45 sunrunner20 joined #git
19:46 drupol Aaah
19:46 drupol cjohnson: that's super interesting indeed !!!
19:46 Levex joined #git
19:46 drupol cjohnson: this is exactly what I'm doing right now.
19:47 drupol Trying to find which commit broke the app.
19:47 fatalhalt joined #git
19:47 gopar joined #git
19:47 cjohnson haha then yep, this is by far the easier way
19:47 cjohnson https://git-scm.com/docs/git-bisect
19:47 cjohnson you mark a known good commit and then mark the current commit as bad
19:47 cjohnson and it will basically split the difference again and again until it can narrow down the bad one
19:47 kadoban It can even be scripted, 'git bisect' is super cool
19:48 cjohnson in the example it suggests that you can probably find the bad commit out of 675 in only 10 steps
19:48 _Vi joined #git
19:48 preaction binary search is awesome
19:48 synthroid joined #git
19:50 winny joined #git
19:52 mjuszczak joined #git
19:54 phase2 joined #git
19:55 _ng joined #git
19:55 livingstn joined #git
19:55 cagomez joined #git
19:56 pfloyd joined #git
19:57 pfloyd I'd like to do a git diff of FETCH_HEAD..HEAD but avoid having to fetch in order to do so. Is there any way to fetch to a different ref name somehow so that I don't overwrite FETCH_HEAD to do the diff?
19:57 romin_ joined #git
19:58 rubenb joined #git
19:58 kadoban pfloyd: Do you already have the commit(s) you care about locally? You can just refer to the remote ref itself, like origin/master  or @{u} or some short thing might be possible.
19:58 _ikke_ iirc, FETCH_HEAD is always udated
19:59 aidalgol joined #git
19:59 pfloyd kadoban: yes basically I'm doing a pre-commit check and the script needs to be able to look at the lines that were added and look for certain patterns
20:00 kadoban pre-commit? Shouldn't it look at just what's about to be commited?
20:01 kadoban git grep might help, otherwise it gets a bit more complicated
20:01 pfloyd kadoban: yeah it's more of a pre-push hook but done outside the scope of git itself (long story)
20:01 pfloyd I suppose git diff orign/branch..branch  would work unless one of the commits locally had already been pushed by someone else
20:01 kadoban pre-push sounds like a pretty bad time to be caring about the contents of the commit(s)
20:02 kadoban What are you supposed to do if it fails, go back and fix all of the commits? Kind of ick
20:02 tnecniv joined #git
20:02 cjohnson ^
20:02 pfloyd I know, I would think so to if I were in your place and don't know the whole picture. suffice to say, I can't share that methodology (confidential) but that it's done that way for ar eason and not something I can change
20:02 livingstn joined #git
20:03 cjohnson a git workflow being confidential? that's a first
20:03 pfloyd yup, welcome to Intel. Only the paranoid survive.
20:03 rizonz joined #git
20:03 kadoban Probably using git to implement something else, sound funky.
20:04 mostlybadfly joined #git
20:04 rizonz what is the best way to git pull with a local storage password for the pull ?
20:05 pfloyd guess I'll go with just using git diff origin/<branch>...<branch>, thanks!
20:05 gnixev joined #git
20:05 brent__ joined #git
20:06 rkazak joined #git
20:07 TheSimonator joined #git
20:07 mquin joined #git
20:09 pfloyd left #git
20:09 Cabanossi joined #git
20:09 grayjoc joined #git
20:10 m0viefreak joined #git
20:11 danemacmillan joined #git
20:11 Ratler joined #git
20:12 fatalhalt joined #git
20:12 maroloccio joined #git
20:13 TheSimonator joined #git
20:14 fahadash joined #git
20:15 brent__ joined #git
20:15 lightstalker joined #git
20:17 jagob joined #git
20:19 dsdeiz joined #git
20:19 matsaman joined #git
20:20 Nerbrun hello, i have a question about the repo tool. I'm attempting to switch branches on some of my projects, but after doing a repo init and repo sync --force-sync. The project have not switched branches
20:21 TbobbyZ joined #git
20:21 cdg joined #git
20:21 matsaman that's some third party tool, right?
20:21 matsaman I don't know why saying 'sync' would switch branches, regardless
20:22 Pyrogerg joined #git
20:22 svm_invictvs joined #git
20:22 jast I believe 'repo' is a tool from the android project...
20:22 jast !repo
20:22 gitinfo Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html
20:23 Nerbrun yeah i didn't see a good forum for repo. It's the android tool that manages multiple git projects through an xml manifest
20:23 Nerbrun thought some of you might be familiar with it
20:23 jast I've never used it, sorry
20:23 thallada joined #git
20:23 dhollinger joined #git
20:23 sea-gull joined #git
20:24 fatalhalt joined #git
20:24 Nerbrun that's ok, i'll just git the projects directly.
20:25 Ratler joined #git
20:25 matsaman android, xml
20:25 matsaman double ew
20:25 matsaman but again, I don't see why 'sync' would change branch
20:26 ResidentBiscuit joined #git
20:26 gopar joined #git
20:27 Es0teric joined #git
20:27 jast my first raa
20:28 matsaman raa?
20:29 jast yeah, that was gibberish, I had a major hiccup in my SSH connection
20:30 jast I don't even remember what I was saying, possibly something actually meant for another channel
20:30 rmesta joined #git
20:30 jast oh, no, it was a poor joke that was supposed to go here, I remember now
20:31 rmesta joined #git
20:32 brent__ joined #git
20:32 satifant joined #git
20:33 cam27 joined #git
20:35 fatalhalt joined #git
20:37 matsaman aw man, thought I was gonna learn a new jargonism
20:37 AaronMT joined #git
20:38 synthroi_ joined #git
20:39 griff joined #git
20:39 jast egyptian sun god perhaps
20:39 cdown joined #git
20:41 thiago joined #git
20:44 NeXTSUN joined #git
20:46 LordRyan joined #git
20:50 rkazak joined #git
20:51 pengolinux left #git
20:52 Achylles joined #git
20:52 sunri5e joined #git
20:53 Karazhan joined #git
20:54 griff joined #git
20:55 nikivi how can I effectively swap and override what is commited to master on one git repo
20:55 nikivi for example I have a folder with old project with some code but I created a new folder and git init it
20:55 nikivi I can change git origin master
20:56 nikivi to the old location but it doesn't let me override it
20:57 cjohnson You want to totally replace your master with a different branch?
20:57 cjohnson you can delete master then create a new master
20:58 nikivi yeah I have some code commited in a project
20:58 nd joined #git
20:58 nikivi but I don't want to create new project and I just want to make this new folder I create with some files become that 'old git repo'
20:58 cjohnson repo and folder are not really interchangeable terms
20:59 nikivi yes, sorry
21:00 nikivi I am trying to look at how I can delete master branch and replace it
21:00 cjohnson sure, do you already have the branch you want to replace it with?
21:00 Ratler joined #git
21:00 nikivi currently I have two folders both only have one branch 'master'
21:01 cjohnson I'm not sure why you keep saying folders
21:01 nikivi directories*
21:01 cjohnson you have two totally unrelated repositories?
21:01 cjohnson folders, directories, neither of them have anything to do with branches or repos
21:01 nikivi one is repository, the other is just new directory with new code
21:01 cjohnson Ok I see
21:02 cjohnson So here's what I would do. In the repository, create a new branch off master and call it
21:02 cjohnson master-old
21:02 cjohnson Then delete the master branch
21:02 cjohnson Well nevermind, no need to delete teh branch
21:02 cjohnson just delete / replace all the files in the master branch with your new code
21:02 cjohnson then commit that change
21:03 nikivi yeah I was thinking of that
21:03 cjohnson and also you probably can get away with using a tag for master-old
21:03 AbleBacon_ joined #git
21:03 cjohnson And in the future, instead of writing new code in a separate dir, just make a new branch
21:03 cjohnson that way you can keep your history
21:03 nikivi need to get familiar with branches
21:03 nikivi sorry for such newbie questions
21:04 dsdeiz joined #git
21:05 cjohnson no problem
21:06 arecaceae joined #git
21:06 salamanderrake joined #git
21:08 digidog joined #git
21:08 bdonnahue joined #git
21:11 robattila256 joined #git
21:11 livingstn joined #git
21:12 clandestino joined #git
21:13 nivag joined #git
21:14 BlaXpirit hi, I'm in a bit of a situation here. trying to rebase onto a rebased branch, see illustrated:  https://bpaste.net/show/28917dfb7c1e
21:16 drodger joined #git
21:16 rivarun joined #git
21:16 hotpancakes joined #git
21:16 julia_c BlaXpirit: see "Recovering from upstream rebase" in git help rebase
21:17 julia_c (one answer is the use of git rebase --onto)
21:17 BlaXpirit thx
21:18 BlaXpirit wow i'm not grasping this doc
21:18 rwb joined #git
21:18 midnightmagic joined #git
21:19 gnixev joined #git
21:20 onlyanegg joined #git
21:21 hashpuppy joined #git
21:22 BlaXpirit why does every illustration have actual branching drawings :/  in my rebase-only world i look at them like parallel lines that happen to have the same preceding commit history
21:22 raijin joined #git
21:24 rkazak joined #git
21:24 Cabanossi joined #git
21:26 doMynation joined #git
21:26 Ratler joined #git
21:26 mjuszczak joined #git
21:27 raijin joined #git
21:27 mjuszczak joined #git
21:27 gopar joined #git
21:28 serialoverflow joined #git
21:29 gnixev joined #git
21:29 romin_ joined #git
21:29 Gsham joined #git
21:29 brent__ joined #git
21:31 cahoots joined #git
21:31 BlaXpirit i don't understand --onto
21:31 BlaXpirit i might try  rebase -i  and manually drop those commits
21:32 Aven joined #git
21:32 Aven hi
21:32 Aven I pushed changes before then ended up putting them in .gitignore
21:32 Aven how do I remove those changes without removing them locally?
21:32 Karazhan joined #git
21:33 osse Aven: git rm --cached
21:33 arecaceae joined #git
21:35 Aven osse: thank you
21:36 Karazhan joined #git
21:36 jtoy joined #git
21:37 MacGyver joined #git
21:39 fatalhalt joined #git
21:40 Karazhan joined #git
21:40 thiago joined #git
21:41 Starky joined #git
21:42 xaa joined #git
21:44 raijin joined #git
21:46 brent__ joined #git
21:47 Karazhan joined #git
21:47 Milos joined #git
21:49 dsdeiz joined #git
21:50 MarioBranco joined #git
21:51 MarioBranco joined #git
21:52 Spinkzeit joined #git
21:52 rkazak joined #git
21:54 bezhermoso joined #git
21:56 peterbec` joined #git
21:56 alexandre9099 joined #git
21:57 Noldorin joined #git
21:58 BlaXpirit yeah, my plan worked. i guess it was nice to draw my diagram, only then i understood why it was wrong
21:59 bitmod joined #git
22:02 Dougie187 left #git
22:03 peterbecich joined #git
22:06 mel00010 joined #git
22:06 Ratler joined #git
22:07 mjuszczak joined #git
22:08 Starky joined #git
22:09 Cabanossi joined #git
22:10 sequence joined #git
22:10 Starky joined #git
22:11 invisbl joined #git
22:12 rishi` joined #git
22:13 nezZario_ joined #git
22:13 gnixev joined #git
22:13 mehs_ joined #git
22:14 theresajayne_ joined #git
22:14 govg joined #git
22:14 Ovsyanka_ joined #git
22:14 jor_ joined #git
22:14 ikonia joined #git
22:14 tabakhase__ joined #git
22:14 strayArc- joined #git
22:15 BrAsS_mOnKeY joined #git
22:15 Danzeel joined #git
22:15 wcpan joined #git
22:15 forrestv joined #git
22:15 mitzip joined #git
22:15 Nickeeh joined #git
22:16 SleePy joined #git
22:16 DrForr joined #git
22:16 tabakhase__ joined #git
22:16 Mixologic joined #git
22:16 sangy joined #git
22:17 atrus joined #git
22:17 davisonio joined #git
22:17 chu joined #git
22:17 BlackPanx joined #git
22:17 hiroki joined #git
22:17 hiroki joined #git
22:18 jdiez joined #git
22:18 c^ joined #git
22:18 tezar joined #git
22:18 WillMoogle joined #git
22:18 nopf joined #git
22:18 mutex joined #git
22:18 avar joined #git
22:18 avar joined #git
22:18 Xe` joined #git
22:18 cttttt joined #git
22:18 ohcibi joined #git
22:19 canton7 joined #git
22:19 martinklepsch joined #git
22:19 ertes joined #git
22:19 linuxmodder- joined #git
22:19 bittyx joined #git
22:20 AlexanderS joined #git
22:20 SporkWitch joined #git
22:20 WakiMiko joined #git
22:20 scarcry joined #git
22:20 cxreg joined #git
22:20 maestrojed joined #git
22:21 ahf joined #git
22:21 jeffreylevesque joined #git
22:21 qlkzy joined #git
22:21 krainboltgreene joined #git
22:22 Bengi joined #git
22:22 altendky joined #git
22:22 cmn joined #git
22:22 Takumo joined #git
22:22 Takumo joined #git
22:22 Erik1 joined #git
22:22 Chinorro joined #git
22:22 ablackack joined #git
22:22 justanotheruser joined #git
22:23 manitu joined #git
22:24 sunny256 joined #git
22:25 LyndsySimon joined #git
22:25 snthsnth joined #git
22:26 mroth joined #git
22:26 ulkesh joined #git
22:27 gyre007 joined #git
22:27 belak joined #git
22:27 NeXTSUN joined #git
22:28 prg3 joined #git
22:28 dedicated joined #git
22:28 belak joined #git
22:32 varesa joined #git
22:32 hotpancakes joined #git
22:34 infernix joined #git
22:34 hotpanca_ joined #git
22:34 brent__ joined #git
22:34 dsdeiz joined #git
22:34 JanC_ joined #git
22:35 mjuszczak joined #git
22:36 YuGiOhJCJ joined #git
22:36 brent__ joined #git
22:37 hotpancakes joined #git
22:39 blackwind_123 joined #git
22:39 jwest1 joined #git
22:39 gugah joined #git
22:39 dsdeiz joined #git
22:39 dsdeiz joined #git
22:41 digidog joined #git
22:42 jwest joined #git
22:42 hotpancakes joined #git
22:45 eMBee joined #git
22:46 dedicated joined #git
22:46 roflin joined #git
22:46 erik-linux joined #git
22:47 griff left #git
22:47 orbyt_ joined #git
22:47 mda1 joined #git
22:49 duderono_ joined #git
22:52 Bhootrk_ joined #git
22:54 peterbecich joined #git
22:54 juvenal joined #git
22:55 masuberu joined #git
22:55 gugah joined #git
22:55 theoceaniscool joined #git
22:56 peepsalot joined #git
22:58 erik-linux left #git
22:59 peepsalot i haven't made any local commits that haven't been pushed to origin for a specific branch, when i go to pull it, i get merge conflicts, this means someone else rewrote history in some screwy way?
22:59 grafted joined #git
23:00 joshszep joined #git
23:00 romin_ joined #git
23:01 durham joined #git
23:02 Eugene It could be a lot of things. `git fetch` would say something about "forced update" if there was a remote history rewrite
23:02 Eugene !lol may also tell you quite a bit
23:02 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
23:03 Eugene Of course, we can't say anything about what you're seeing unless we see a !transcript or a repo URL
23:03 gitinfo 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
23:03 peepsalot but if i do pull --rebase then there's no conflict and everything is up to date
23:04 peepsalot i don't really understand why
23:04 safe joined #git
23:09 grafted help: when using "git clone --recursive" on local repository, submodue is pulled, however, when using git/ssh I receive error: "fatal: '/home/.../something.git' does not appear to be a git repository"
23:09 askb joined #git
23:10 hotpancakes joined #git
23:10 griff joined #git
23:12 grafted https://gist.github.com/aletheia7/ef38c59edec46b17fc8fa3ca8902be48
23:14 menip joined #git
23:14 rudrab joined #git
23:15 jtoy joined #git
23:15 LordRyan so i know that i should use https or ssh instead of the git protocol, but this is just for development purposes and probably(?) won't make it into production
23:15 LordRyan what is the proper way to serve all repositories in `~/repos/` ?
23:15 LordRyan I figured it was, git daemon --base-path=$HOME --reuseaddr --export-all $HOME/repos/
23:16 LordRyan then i could `git clone git://domain.info/repos/repo_here`
23:16 LordRyan but it doesn't seem to work
23:17 hexa- joined #git
23:23 Puffball joined #git
23:23 hotpancakes joined #git
23:25 mjuszczak joined #git
23:26 hotpancakes joined #git
23:27 LordRyan if i cd into the directory then use --base-path=. it seems to work.
23:28 LordRyan it looks like it's not adding the $HOME/repos to the whitelist?
23:28 LordRyan and ignoring --export-all ?
23:30 mozzarella joined #git
23:31 pandeiro joined #git
23:33 Qria joined #git
23:34 TbobbyZ_ joined #git
23:34 e joined #git
23:34 Hello71 did you try --verbose
23:34 mehwork joined #git
23:34 TbobbyZ_ joined #git
23:35 onlyanegg joined #git
23:35 LordRyan [21121] Request upload-pack for '/repos/fusionscript'
23:35 TbobbyZ_ joined #git
23:35 LordRyan [21121] './repos/fusionscript/.git': not in whitelist
23:35 LordRyan that's the output with `--verbose`
23:36 LordRyan git daemon --base-path=. --reuseaddr --informative-errors --verbose repos
23:36 hotpancakes joined #git
23:36 LordRyan that's what i'm trying now
23:36 mehwork i'm working on a branch that is completely different but we can't have a code freeze so people have been changing some things in master. There are only a _few_ of their changed files that I need for my branch, so i can't just merge everything. What's the easiest way to merge specific stuff?
23:36 mehwork into my branch
23:36 LordRyan same thing happens with `--export-all`
23:36 TbobbyZ_ joined #git
23:37 TbobbyZ_ joined #git
23:37 SCHAPiE joined #git
23:38 TbobbyZ joined #git
23:39 LordRyan Hello71: i've now extensively tested with having `git-daemon-export-ok` as well, to no different result
23:39 mehwork i would just normally keep my branch up to date by merging the develop branch but i have had to move stuff around and make some changes already. So i need to apply their changes more like a patch
23:39 otiose joined #git
23:39 LordRyan mehwork: `git diff > stuff.patch` then edit stuff.patch, then `git apply < stuff.patch` in your working branch
23:40 mehwork thanks
23:40 dsdeiz joined #git
23:40 LordRyan that's how i'd do it
23:40 LordRyan not sure if it's the most efficicent way
23:40 LordRyan technically it works with the least `git` commands? ;D
23:41 Hello71 something rev-list modifies file merge
23:42 jimmyrcom joined #git
23:42 cagomez joined #git
23:43 serialoverflow joined #git
23:46 LordRyan i had a thought
23:47 LordRyan it might be that `git-daemon` expects the directories listed to be Git repositories
23:47 LordRyan brb testing
23:47 bezhermoso joined #git
23:47 LordRyan .. nope.
23:47 hotpancakes joined #git
23:51 justanotheruser joined #git
23:52 dsdeiz joined #git
23:52 dsdeiz joined #git
23:55 otiose joined #git
23:57 cagomez joined #git
23:57 madewokherd joined #git
23:57 LordRyan this is a bit strange. it's almost like it's forcing --strict-paths
23:58 hotpancakes joined #git
23:59 LordRyan and now i can't get it working at all. O.o

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