Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-05

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

All times shown according to UTC.

Time Nick Message
00:00 ToBeCloud joined #git
00:03 jimi_ joined #git
00:03 govg joined #git
00:04 owen1 this tag is 20 commits behind
00:05 xall joined #git
00:08 tesuji_ joined #git
00:08 shmuli joined #git
00:09 bremner owen1: so you want to move the master branch pointer?
00:10 shgysk8zer0 joined #git
00:12 dreiss joined #git
00:13 star_prone joined #git
00:14 rlb joined #git
00:17 cqi joined #git
00:22 zarubin joined #git
00:27 fairuz joined #git
00:29 shmuli joined #git
00:30 owen1 sure
00:31 byteflame joined #git
00:32 kadoban git checkout master && git reset --hard thetag      note that this changes history, obviously.
00:33 mar77i joined #git
00:34 danslo_ joined #git
00:35 mischat joined #git
00:36 hahuang61 joined #git
00:39 bremner so, see in particular !rewrite
00:39 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
00:40 zivester joined #git
00:41 sin3t joined #git
00:42 boombatower joined #git
00:42 byteflame joined #git
00:45 aghalarp joined #git
00:46 Rodya_ joined #git
00:46 titanium17 joined #git
00:51 rominronin joined #git
00:57 jstimm joined #git
00:58 red_ joined #git
01:04 shmuli joined #git
01:05 stormlrd_ joined #git
01:06 mellernoia joined #git
01:14 ResidentBiscuit joined #git
01:15 star_prone joined #git
01:17 shmuli joined #git
01:17 Exagone313 joined #git
01:22 shinnya joined #git
01:22 zarubin joined #git
01:26 dreiss joined #git
01:27 Vampire0_ joined #git
01:28 chartractegg joined #git
01:29 stormlrd joined #git
01:31 wxg joined #git
01:33 Dougie187 joined #git
01:34 Exagone313 joined #git
01:35 pks joined #git
01:36 mischat joined #git
01:36 sangy joined #git
01:36 fairuz joined #git
01:38 Exagone313 joined #git
01:39 jost_ joined #git
01:39 david007 joined #git
01:41 zumba_addict joined #git
01:41 Exagone313 joined #git
01:47 interne7y joined #git
01:50 Aces_Charles joined #git
01:52 rominronin joined #git
01:54 d^sh joined #git
01:57 shmuli joined #git
01:57 afusion joined #git
01:59 livingstn joined #git
02:01 Exagone313 joined #git
02:02 ytl joined #git
02:03 piling joined #git
02:03 owen1 bremner: thanks!
02:03 owen1 left #git
02:05 thiago joined #git
02:11 rgrinberg joined #git
02:13 durham_ joined #git
02:14 chartractegg joined #git
02:22 harish_ joined #git
02:23 gtristan joined #git
02:24 beyertech joined #git
02:25 sdothum joined #git
02:25 unbalancedparen joined #git
02:26 chid joined #git
02:26 chid_ joined #git
02:26 Exagone313 joined #git
02:27 ksolv joined #git
02:27 sim590 joined #git
02:27 cdg joined #git
02:31 shmuli joined #git
02:32 RedneckDonut joined #git
02:35 Lunatrius joined #git
02:37 hahuang61 joined #git
02:37 star_prone joined #git
02:40 durham joined #git
02:42 chachasmooth joined #git
02:45 nitin joined #git
02:46 david007 joined #git
02:46 david007 joined #git
02:46 nydel07 joined #git
02:47 Goplat joined #git
02:47 fission6 joined #git
02:48 shmuli joined #git
02:48 peepsalot joined #git
02:49 rkazak joined #git
02:49 erko joined #git
02:50 texasmynsted joined #git
02:50 lagothrix joined #git
02:51 sangy joined #git
02:53 hexagoxel joined #git
02:53 rominronin joined #git
02:54 peepsalot can i see the commit history for a specific file? i want to roll a file back to an earlier version
02:55 NerudaLY joined #git
02:55 skylite joined #git
02:58 texinwien_ joined #git
02:58 thiago peepsalot: git log filename
02:59 thiago if the file no longer exists, put -- between log and the file name
03:00 peepsalot ok, thanks
03:02 beyertech joined #git
03:04 aavrug joined #git
03:05 beyertech joined #git
03:06 titanium17 joined #git
03:06 aavrug joined #git
03:07 rkazak joined #git
03:09 arescorpio joined #git
03:10 lu_zero joined #git
03:10 lu_zero joined #git
03:10 red_ joined #git
03:12 cdg joined #git
03:15 _August_ joined #git
03:19 shmuli joined #git
03:20 tesuji joined #git
03:22 jaequery joined #git
03:22 snowkidind joined #git
03:23 mischat joined #git
03:25 Dougie187 left #git
03:28 fstd_ joined #git
03:29 govg joined #git
03:31 zhiwliu joined #git
03:31 zhiwliu left #git
03:35 HanClinto joined #git
03:38 ThinTim joined #git
03:39 fii left #git
03:40 fairuz joined #git
03:41 noyb joined #git
03:48 interne7y joined #git
03:49 a_thakur joined #git
03:50 xall joined #git
03:53 Sasazuka joined #git
03:54 rominronin joined #git
04:02 thecomedian joined #git
04:02 rkazak joined #git
04:03 netj joined #git
04:03 nydel07 joined #git
04:05 Anupkumar joined #git
04:10 a_thakur joined #git
04:11 rscata joined #git
04:17 ytl joined #git
04:18 boombatower joined #git
04:23 dsantiago joined #git
04:25 dsantiago joined #git
04:27 sarbs joined #git
04:33 MrWoohoo joined #git
04:34 romerocesar joined #git
04:37 Cabanossi joined #git
04:37 hahuang61 joined #git
04:38 pwnz0r joined #git
04:40 Darren_ joined #git
04:44 Lauven joined #git
04:44 cqi joined #git
04:44 zumba_addict joined #git
04:50 vacho joined #git
04:50 tango_ joined #git
04:51 vacho I have a serious "git" situation. I have added/committed a set of files. I want to uncommit 1 file from that commit and then push it to master repo
04:52 johnny56 joined #git
04:52 azwieg103 joined #git
04:53 tango_ vacho: is this a single commit or multiple ones, and jas it been pushed already or not?
04:54 afusion_ joined #git
04:54 Raging_Hog joined #git
04:55 rominronin joined #git
04:58 vacho tango_: has been pushed as a different branch asking to merge with master. I can delete that merge.
04:58 vacho tango_: I mean. it has been pushed as a pull request to master
04:58 vacho but I have not merged yet
04:59 subhojit777 joined #git
04:59 freimatz joined #git
04:59 tango_ so you can rewrite history, good
05:01 tango_ vacho: if it's a single commit you can just git rm --cached filenottobepushed and then git commit --amend
05:01 vacho ok let me try.
05:02 tango_ otherwise (multiple commits) git filter-branch is what you want
05:04 vacho how do I push to origin master?
05:09 Garen joined #git
05:13 tango_ vacho: after an amend you need a push -f
05:14 vacho tango_: I messed up everything now lol
05:15 titanium17 joined #git
05:16 TomyLobo joined #git
05:17 tango_ vacho: pushed the wrong branch?
05:18 a3Dman joined #git
05:20 noyb joined #git
05:26 rkazak joined #git
05:29 sagerdearia joined #git
05:32 vacho tango_: i got it to work thank you tango for your help!
05:33 ThinTim joined #git
05:37 nydel07 joined #git
05:38 Sucks joined #git
05:39 BenderRodriguez joined #git
05:40 zeroed joined #git
05:41 bocaneri joined #git
05:41 Sucks joined #git
05:42 pwnz0r joined #git
05:42 moop joined #git
05:46 jceb joined #git
05:53 shmuli joined #git
05:53 robi251 joined #git
05:54 afusion joined #git
05:56 rominronin joined #git
05:57 M-shine joined #git
06:00 xlegoman joined #git
06:00 JeroenT joined #git
06:03 safe joined #git
06:06 Lauven joined #git
06:09 tax joined #git
06:10 Rodya_ joined #git
06:12 Lewix joined #git
06:15 robson joined #git
06:15 tax joined #git
06:16 zeroed joined #git
06:20 red_ joined #git
06:20 shmuli joined #git
06:22 alanwill joined #git
06:22 star_prone joined #git
06:23 mischat joined #git
06:23 Ineentho[m] joined #git
06:23 M-mistake joined #git
06:23 M-meznak joined #git
06:24 shmuli joined #git
06:25 _August_ joined #git
06:26 rominronin joined #git
06:28 fairuz joined #git
06:28 Rodya_ joined #git
06:29 Lunatrius` joined #git
06:31 lernaean_hydra joined #git
06:32 lernaean_hydra is there a way to download a snapshot of a repo from history?
06:33 kfunk joined #git
06:34 lernaean_hydra I have an android ROM that I ported, and at some point between June 28 and July 17, the WiFi was broken by something so I am looking for a way to go back to the soure as it stood on June 28th, and cherry pick subsequent commits until I find which one broke it.
06:36 thiago lernaean_hydra: no, that's not possible
06:36 destr0yr joined #git
06:36 thiago download the entire repository (or at last the branch containing those)
06:37 shmuli joined #git
06:38 thiago check your .pro file. Find the line where you added -WX. Don't add it.
06:38 lernaean_hydra thanks thiago!! I guess I'll have to look for some other way to approach it,
06:38 hahuang61 joined #git
06:38 cdesai you could checkout to the 28th though.
06:38 lernaean_hydra cdesai: how would I do that?
06:39 ambro718 joined #git
06:39 cdesai something like git checkout @{2016-06-28 00:00:00}
06:39 cdesai so for your use case lernaean_hydra, you can do repo forall -c 'git checkout ...'
06:39 thiago that's not checking out the commit of that date
06:39 lernaean_hydra or is there a tutorial/walkthrough, etc that would be a good utility for learning to work with GIT more proficiently?
06:39 thiago it's checking out what your repository had on that date
06:39 cdesai ah right.
06:41 harish_ joined #git
06:42 freimatz joined #git
06:42 lernaean_hydra so would that checkout what the repo had on the selected date?
06:44 lernaean_hydra e.g., if I used git checkout @{2016-06-28 00:00:00} would it give me the git as it stood then, then if I ran it with a date of 2016-06-29, would it move it up by a day, etc?
06:45 thiago as it stood on 2016-06-29
06:45 thiago if you didn't check out anything different, didn't commit, etc., it will be the same
06:46 lernaean_hydra but would it pull commits made by others?
06:46 jceb joined #git
06:47 thiago there's no pull
06:47 michaelj_ joined #git
06:47 lernaean_hydra repo forall -c 'git checkout @{2016-06-28 00:00:00}' returns error: pathspec '00:00:00}' did not match any file(s) known to git.
06:47 lernaean_hydra and error: pathspec '@{2016-06-28' did not match any file(s) known to git.
06:47 lernaean_hydra repeatedly
06:48 NwS joined #git
06:48 michaelj_ left #git
06:49 luc4 joined #git
06:49 shmuli joined #git
06:50 thiago lernaean_hydra: the space
06:50 robi251 joined #git
06:50 stormlrd joined #git
06:54 luc4 Hello! I'm trying to migrate some projects from svn to git. I succeeded for all of them except one. This is more difficult because the project is inside a SVN repo with a layout like this: http://pastebin.com/jzFgt7GW. Is it possible to migrate trunk and specify each single directory from tags and branches?
06:54 Sceorem joined #git
06:54 luc4 Like say I want to port Project2 from that layout.
06:56 constant joined #git
06:57 lernaean_hydra which space?
06:58 thiago lernaean_hydra: the one between 28 and 00
06:58 lernaean_hydra ahh, gotcha
07:00 lernaean_hydra that's got things happening :)
07:00 lernaean_hydra thanks!!
07:01 submitnine joined #git
07:01 nobso joined #git
07:03 star_prone joined #git
07:03 meZee joined #git
07:04 ahmedelgabri joined #git
07:04 mithenks joined #git
07:05 xaa joined #git
07:05 danslo_ joined #git
07:08 JeroenT joined #git
07:10 jbu joined #git
07:10 danmulvey joined #git
07:10 lordjancso joined #git
07:12 DevAntoine joined #git
07:16 dreiss joined #git
07:17 jbu all: if I have master at A, develop at A-B-C, and then I merge develop into master so now master is A-B-C, but now I need to RESET master back to A, will develop be affected in any way?
07:17 danslo_ left #git
07:18 danslo joined #git
07:19 kadoban jbu: No
07:19 danslo jbu: no
07:19 ISmithers jbu: No develop is its own branch.
07:19 jbu thanks
07:20 shmuli joined #git
07:25 danslo joined #git
07:26 fees joined #git
07:26 tjone270_ joined #git
07:28 danslo joined #git
07:28 markgrady joined #git
07:28 jknetl joined #git
07:31 ahmedelgabri joined #git
07:32 jbu all: I had someone create a pull request from his master to remote master.  Now when I look at the pull request I see conflicts but I don't know how to merge conflicts since he didn't create a new branch where I can resolve the conflicts.  Is the only reasonable solution here for him to create a new branch with the changes, push them, allow me to fix the conflicts in his branch, then I can merge into master?
07:33 tobiasvl jbu: you add his repo as a remote in your local repo, then you get his branch as a remote-tracking branch and can merge locally
07:34 p4trix joined #git
07:35 cyan__ joined #git
07:35 danslo joined #git
07:36 jbu tobiasvl, can I do this all without his intervention? How do I know sets up his remote
07:37 tobiasvl you can probably get its url from whatever web interface I assume you're using
07:40 cqi joined #git
07:40 jbu tobiasvl, ok I'm using bitbucket, did "git remote add jason http://jason@..." and it appeared to work, however when I try to pull his master branch locally, I have to enter his password...this is expecteD?
07:40 tobiasvl don't add his username
07:40 tobiasvl remove jason@
07:41 Balliad joined #git
07:44 jbu tobiasvl, ok very confused now...if I use his origin (we do share the same origin) then how do I specify his version of master?
07:44 tobiasvl well did you add his repo as a remote?
07:44 tobiasvl I assume he has a separate repo, since you said "his master"
07:44 tobiasvl don't just add the main repo with his username in front, add his actual repo
07:46 texinwien_ joined #git
07:46 jceb joined #git
07:47 jstein joined #git
07:50 interne7y joined #git
07:51 sweb joined #git
07:51 sweb http://stackoverflow.com/questions/38783945/git-no-history-for-special-folder-and-files-just-sync-no-revision
07:52 kadoban Don't track built stuff, just track some script or description of how to build them.
07:52 jast sweb: git does not really cover that use case, you're probably better served using some kind of binary distribution concept (i.e. build things and upload them to a deployment server or something like that)
07:53 jast for instance, given the infrastructure, you can have your git server notify a build server, then the build server can build your production files and store them somewhere
07:53 ISmithers left #git
07:54 sweb jast: is there any command to tell git remove old commits for special files and just rememebr last one ?
07:54 ki0 joined #git
07:55 jbu tobiasvl, yes they are separate repos.  he merged his-repo/master into our-repo/master.  Merge steps indicate I'm supposed to pull his master in and merge the conflicts there, but I don't have permissions to that repo.  I think it makes sense that he has to create a branch in our repo and then do the pull request there.  That way if there's a conflict I can pull his changes and/or make changes there"
07:55 jast sweb: you could do that, but it would regenerate all the other commits, and merging (and collaboration in general) becomes extremely tricky due to that
07:55 jast basically 'git pull' and such become unusable
07:55 tobiasvl jbu: he can make a branch in your repo instead, yes. but are you sure you don't have read access to his repo?
07:56 jbu tobiasvl, yeah, they keep their repo separate, dont want our company to see "secrets", I would think
07:56 _August_ joined #git
07:56 jbu tobiasvl, no I'm not sure, but it makes sense that I don't have access
07:56 _August_ joined #git
07:58 Lomex joined #git
07:58 gtristan joined #git
07:59 stormlrd joined #git
08:00 harish_ joined #git
08:03 _August_ joined #git
08:04 shmuli joined #git
08:04 timmu joined #git
08:06 SwiftMatt joined #git
08:10 liuzhen joined #git
08:11 ribasushi joined #git
08:12 _August_ joined #git
08:13 tomog999 joined #git
08:13 stormlrd joined #git
08:16 GavinMagnus joined #git
08:16 chll_ joined #git
08:17 _August_ joined #git
08:18 star_prone joined #git
08:19 alcohol joined #git
08:20 rchavik joined #git
08:20 JeroenT joined #git
08:20 hwoarang joined #git
08:22 linuxmint joined #git
08:23 marcogmonteiro joined #git
08:23 fahadash joined #git
08:25 clmsy joined #git
08:28 stormlrd joined #git
08:28 The_Phoenix1 joined #git
08:30 The_Phoenix1 joined #git
08:30 The_Phoenix1 joined #git
08:32 The_Phoenix1 joined #git
08:33 The_Phoenix1 joined #git
08:33 Sasazuka joined #git
08:35 ams__ joined #git
08:39 hahuang61 joined #git
08:39 inflames joined #git
08:41 wrouesnel1 joined #git
08:41 fairuz joined #git
08:43 danslo joined #git
08:45 zumba_addict joined #git
08:45 Rish joined #git
08:48 stormlrd joined #git
08:53 shmuli joined #git
08:53 neunon_ joined #git
08:54 mohabaks joined #git
08:54 shmuli joined #git
08:56 anuxivm joined #git
08:59 alcohol joined #git
08:59 djb-irc joined #git
09:00 shmuli joined #git
09:01 spudowiar joined #git
09:05 darkbit joined #git
09:06 jstein__ joined #git
09:06 fuchstronaut joined #git
09:07 cjuner joined #git
09:08 tvw joined #git
09:10 GavinMagnus left #git
09:11 notebox joined #git
09:11 GavinMagnus joined #git
09:11 hahuang61 joined #git
09:12 fuchstronaut joined #git
09:14 notebox joined #git
09:19 vuoto joined #git
09:20 vuoto joined #git
09:22 marcogmonteiro joined #git
09:22 _August_ joined #git
09:23 jimi_ joined #git
09:23 ArchNoob joined #git
09:24 marcogmonteiro joined #git
09:29 t0by joined #git
09:29 MadLamb joined #git
09:31 piling_ joined #git
09:35 JeroenT joined #git
09:37 Anticom joined #git
09:37 david002 joined #git
09:39 cdown joined #git
09:40 marcogmonteiro joined #git
09:41 cjuner joined #git
09:43 nikitasius joined #git
09:45 PCatinean joined #git
09:48 MrMojito joined #git
09:50 interne7y joined #git
09:51 phanimahesh joined #git
09:51 Sceorem_ joined #git
09:52 Sceorem__ joined #git
09:53 luc4 joined #git
09:54 Tachyon_ joined #git
09:54 star_prone joined #git
09:56 stormlrd joined #git
10:02 darkbit joined #git
10:08 shmuli joined #git
10:09 fuchstronaut joined #git
10:16 sdothum joined #git
10:17 ShekharReddy joined #git
10:18 danslo_ joined #git
10:19 narendraj9 joined #git
10:19 rivarun joined #git
10:27 ahmedelgabri joined #git
10:27 mrkat joined #git
10:28 danslo joined #git
10:31 jorj joined #git
10:31 irco joined #git
10:31 texinwien_ joined #git
10:31 danslo joined #git
10:31 notebox joined #git
10:37 realz joined #git
10:40 JeroenT joined #git
10:43 phanimahesh joined #git
10:45 shum joined #git
10:50 cdown_ joined #git
10:50 blackwind_123 joined #git
10:54 piling joined #git
10:56 phanimahesh joined #git
10:57 star_prone joined #git
11:04 GavinMagnus joined #git
11:04 ToBeCloud joined #git
11:08 danslo joined #git
11:08 sdothum joined #git
11:10 fuchstronaut joined #git
11:10 zeroed joined #git
11:12 korolev joined #git
11:13 korolev left #git
11:14 sdothum joined #git
11:15 fuchstronaut joined #git
11:15 fuchstronaut joined #git
11:16 star_prone joined #git
11:16 bongjovi joined #git
11:17 ojdo joined #git
11:19 WhiskerBiscuit joined #git
11:19 jceb joined #git
11:20 doppo joined #git
11:21 cyan__ joined #git
11:23 WhiskerBiscuit joined #git
11:27 shirty joined #git
11:27 cjuner joined #git
11:28 poweruser joined #git
11:30 livingstn joined #git
11:32 WhiskerBiscuit joined #git
11:32 WhiskerBiscuit I've preferred mercurial mostly because of the GUI tools that are available are more robust.  Or at least they were two years ago when I last looked.  Has anything changed much?  I've been of a fan of tortoise for Hg
11:32 The_Phoenix1 joined #git
11:40 Hoxolotl joined #git
11:41 Hoxolotl good afternoon. could somebody help me with tortoisegit, "error: Your local changes to the following files would be overwritten by merge:
11:41 Hoxolotl " I don' t want to stash the files, I just want them to be overwritten.
11:41 Hoxolotl the joys of Unity (game engine) changin some .asset files on its own.
11:42 Seveas git reset --hard will undo all your uncommitted changes
11:42 Seveas git checkout -- path/to/file does the same for a single file
11:42 livingstn joined #git
11:42 Zarthus stashing is essentially letting them be overwritten, too. you can later just drop the stash
11:45 Hoxolotl Seveas, thanks, it worked, but I had to use the command line ;)
11:45 CheckDavid joined #git
11:45 Seveas Hoxolotl: !gui :)
11:45 gitinfo Hoxolotl: 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.
11:51 interne7y joined #git
11:53 mischat joined #git
11:55 Vampire0 WhiskerBiscuit, there is also TortoiseGit that integrates Git into the Windows explorer. But basically !gui
11:55 gitinfo WhiskerBiscuit: 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.
11:56 WhiskerBiscuit Yeah, I prefer command line
11:56 yoan joined #git
11:56 WhiskerBiscuit But my team are a bunch of lazy fucks
11:57 yoan joined #git
11:57 WhiskerBiscuit I need to read up on git, apparently there is a feature that after a set time (30 days?) it will make unwanted diffs go poof?
11:58 WhiskerBiscuit not sure what you call changesets in git
11:59 Sceorem__ joined #git
11:59 Vampire0 WhiskerBiscuit, it is called "commit". And yes, there is regular automatic housekeeping done
12:00 WhiskerBiscuit so how do you prevent something from being garbage collected?  Do you simply have a name a commit?
12:01 sweb left #git
12:04 ToxicFrog WhiskerBiscuit: anything named (branch heads and tags) and anything reachable from anything named is safe.
12:04 ToxicFrog It won't clean up reachable history.
12:04 Hoxolotl is there a way to force git to only pull/overwrite the local repo WITHOUT messing with the local changed files?
12:04 UrsoBranco joined #git
12:04 Vampire0 WhiskerBiscuit, as long as the commit is not dangling (still reachable from tag, branch, stash, reflog, ...) it will not be garbage collected
12:05 WhiskerBiscuit so does the cleanup actually make the repository smaller?
12:05 Vampire0 Hoxolotl, do you mean man git fetch?
12:05 gitinfo Hoxolotl: the git-fetch manpage is available at http://jk.gs/git-fetch.html
12:06 Hoxolotl Vampire0, unfortunatly those docs are unreadable to the common mortal I happen to be.
12:06 Vampire0 WhiskerBiscuit, if there are dangling commits that get thrown away or stuff is packed (you can also do a manual repack where everything is stuffed inside one big packfile) the size will be reduced
12:07 Noldorin joined #git
12:07 Vampire0 Hoxolotl, a common mortal that uses Git usually should be able to understand those docs. git fetch fetches the remote changes into the local remote-branches without affecting your local branch or your locally changed files
12:08 ferr joined #git
12:08 airdisa joined #git
12:09 Hoxolotl " local remote-branches" creates a mental dissonance, how can something be local and remote at the same time? - Common mortal
12:09 Codfection joined #git
12:10 WhiskerBiscuit joined #git
12:10 pasadinhas joined #git
12:10 WhiskerBiscuit Might have missed that answer.  So when a repository is garbage collected, does it actually shrink in size?
12:11 canton7 we normally talk about "remote-tracking branches", which are local copies of the states of remote branches
12:11 canton7 so e.g. "origin/master" is a local copy of the state of the branch "master" in the remote "origin"
12:11 str joined #git
12:12 anuxivm joined #git
12:12 ash_workz joined #git
12:12 JanC_ joined #git
12:13 pasadinhas joined #git
12:13 flaguy48 left #git
12:13 nicksloan joined #git
12:14 HanClinto joined #git
12:14 nicksloan If I do an interactive rebase and drop commit A on branch Y, but that commit is also in branch X, branch X will be unaffected, right?
12:15 Lomex joined #git
12:16 canton7 correct
12:17 nicksloan alright. I was like 90% confident. Thanks for the confirmation
12:17 dreiss joined #git
12:17 Vampire0 WhiskerBiscuit, if there are dangling commits that get thrown away or stuff is packed (you can also do a manual repack where everything is stuffed inside one big packfile) the size will be reduced
12:17 SteffanW joined #git
12:18 * Hoxolotl couldn't find a fetch -overwrite local changes (that behaves like svn update, yes I'm migrating and having trouble).
12:18 Hoxolotl but I' ll run into it borking again soon enough :)
12:19 Vampire0 canton7, origin/master is not a remote-tracking branch per se. It is a remote branch in the local repository. If you have a local branch that tracks origin/master, *then* origin/master is the remote-tracking branch of the local branch that tracks it
12:19 cjuner joined #git
12:19 anuxivm joined #git
12:19 Maple__ joined #git
12:20 hahuang65 joined #git
12:20 Vampire0 Hoxolotl, don't compare svn and git, learn the few basic git concepts and wrap your head around it. ;-)
12:20 canton7 Vampire0, it's called a remote-tracking branch in git terminology. You're getting the term "remote-tracking branch" confused with the concept of "tracking", which applies to branches
12:20 leeN joined #git
12:20 canton7 the term "remote-tracking branch" came about before anyone tried to create a link between local branches and remote branches, afaik
12:21 Vampire0 Hoxolotl, doing an svn update with local changes is approximately like doing git stash, then merging or rebasing your local branch and then doing git stash pop
12:21 Hoxolotl Vampire0, wish I could, but I am not a coder but an artist, as such half the terminology goes over my head unless there's somebody elses meatware involved.
12:22 Hoxolotl and most of the docs end in recursive loops when I try to parse them.
12:22 Vampire0 canton7, ah, ok, then I had it wrong in mind, sry
12:23 JeroenT joined #git
12:23 kyan joined #git
12:24 Hoxolotl I got the local and master and main branches, but I interpret it as just being two subversion servers on which to do checkouts. ( one remote, and one local)
12:25 cdown__ joined #git
12:25 jceb joined #git
12:25 anuxivm joined #git
12:26 Hoxolotl the issues start with being in game development, and having local changes which do not need to go to the main branch, and me not having found a way to convince git that it can ignore the local changes whilst still downloading the changed files from the main branch.
12:26 nicksloan joined #git
12:26 Vampire0 Hoxolotl, didn't really understand that. Btw. if the man pages are too cryptic for you, maybe !book will be helpful instead
12:26 gitinfo Hoxolotl: 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
12:26 rgrinberg joined #git
12:27 Vampire0 Hoxolotl, and as you said you are an artist, maybe also !designer is for you
12:27 gitinfo Hoxolotl: [!designers] 'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/
12:27 sanketdg joined #git
12:28 EduardoMartins joined #git
12:28 danslo joined #git
12:31 Didac joined #git
12:32 flaguy48 joined #git
12:32 anuxivm joined #git
12:32 veilig2000 joined #git
12:33 star_prone joined #git
12:33 Hoxolotl Vampire0, to give you a practical examples, when I do a light bake it changes several files locally, it even adds and removes some depending on the light bake settings. it also changes the project settings and few other files all around my local repository. At that point somebody adds a .fbx file to the main branch, and I'd like to have it, but git screeches to a halt, because of modified local files all over the place.
12:34 Hoxolotl and when I say a .fbx, it could be about 50 files.
12:34 Hoxolotl now I have 50 local files changed locally, which I would like to keep, 50 files on the main branch, most of which need to overwrite my local changes.
12:35 Hoxolotl these are sometimes binary files.
12:35 jeffreylevesque joined #git
12:36 Hoxolotl git was not designed to handle this as far as I' m aware through the documentation.
12:37 Hoxolotl as in, the amount of files changing make it impossible to know which ones to save. all that is known is that the main branch should overwrite the local branch files.
12:37 Vampire0 Hoxolotl, as I said, do a stash, then merge or rebase as usual and then stash pop. stash will save your uncommitted modifications and revert them and stash pop applies them again, forgetting what it remembered
12:37 Hoxolotl *main branch and local branch* *I do not know how to call this*
12:39 Hoxolotl I' ll try stashing at next time, and see what happens :)
12:40 Erati joined #git
12:42 Hoxolotl so, stash, fetch, and *does not know command* guessing* *overwrite local fetch with the stuff from the stash* -something like that?
12:43 fuchstronaut joined #git
12:43 Vampire0 Hoxolotl, fetch just gets the new changes in the remote repository and stores them in the remote-tracking branches in your local repository (the branches named <remote>/<branch>)
12:43 jceb joined #git
12:44 Vampire0 Hoxolotl, if you only do fetch you must then do rebase or merge to get the changes into your local branch
12:44 Vampire0 Hoxolotl, or you can use pull which either is fetch+merge or fetch+rebase according to parameters and config settings
12:45 Vampire0 Hoxolotl, for a fetch you do not need to stash as it doesn't mangle with your local branch and thus locally modified files are not of intereset
12:45 Vampire0 s/intereset/interest/
12:45 * Hoxolotl is still wrapping his head around what happens if local(50 lightmaps) and main(55 lightmaps, 3other) where the lcoal(50lightmaps) needs to overwrite main(55lightmaps) and thus deletes main(5lightmaps).
12:45 ahmedelgabri joined #git
12:46 Vampire0 Hoxolotl, if the changed files are the same, you will get conflicts that you need to resolve. If the changed files are different, it will work flawlessly
12:46 Tachyon_ joined #git
12:48 Hoxolotl the lightmap files are usually lightmap01.png to lightmap56.png ish.
12:48 Hoxolotl so I guess I'll have 50 conflicts to solve.
12:49 Vampire0 Hoxolotl, well, how to merge binary files if there come changes from the remote and you have local changes is up to you. How should any software resolve this.
12:50 mikecmpbll joined #git
12:50 Vampire0 Hoxolotl, or let me ask you a counter-question. What exactly do you expect, what is your expected / wanted result if you have 1,2,3 and 4 changed locally and 2,3 and 6 were changed on the remote?
12:52 daniel_rose joined #git
12:53 zivester joined #git
12:53 daniel_rose joined #git
12:54 Hoxolotl download 2,3, 6 and have them overwrite local changes, while leaving 1,4 alone.
12:54 flaguy48 joined #git
12:56 rkazak joined #git
12:57 Hoxolotl "update using theirs" in svn ;)
12:57 NoOutlet joined #git
12:58 Vampire0 Hoxolotl, well, then you stash, merge or rebase, and then stash pop. You will get conflicts on 2 and 3 that you simply resolve by choosing the one from the remote
12:58 veilig2000 joined #git
12:59 livingstn joined #git
13:00 Vampire0 Hoxolotl, alternatively you could commit your local changes and *then* rebase your local branch onto the remote changes, giving via parameters the merge strategy that tells Git to use the incoming file completely on conflicts
13:02 fuchstronaut joined #git
13:07 * Hoxolotl is being called for a hardware test, bbl :) but thanks a lot Vampire0 for taking the time with a half dunce like me.
13:07 pasadinhas joined #git
13:07 Vampire0 Hoxolotl, you're welcome
13:08 jimi_ joined #git
13:11 BlackMaria_netsp joined #git
13:12 kinlo left #git
13:12 poweruser joined #git
13:13 xlegoman joined #git
13:14 BlackMaria joined #git
13:18 anli joined #git
13:20 BlackMaria_netsp joined #git
13:22 tjone270 joined #git
13:24 MadLamb joined #git
13:24 jimi_ joined #git
13:31 dsdeiz_ joined #git
13:31 fmcgeough joined #git
13:32 shinnya joined #git
13:35 cqi joined #git
13:35 PCatinean hey guys
13:35 PCatinean I have a repository with 4 python modules in there, I want to make a fork of that same repository with only two modules and regulary update from the source
13:35 PCatinean how can one do that?
13:36 daniel_r_ joined #git
13:36 cqi joined #git
13:37 ojacobson joined #git
13:40 Vampire0 PCatinean, what prevents you from cloning the whole repo?
13:42 byteflame joined #git
13:42 dsop joined #git
13:44 PCatinean Vampire0, nothing I guess
13:44 PCatinean Just that how can I continously update from the fork
13:44 al-damiri joined #git
13:44 PCatinean and keep tracking history of the updates?
13:44 PCatinean without revealing the two other modules
13:45 Dougie187 joined #git
13:46 Vampire0 PCatinean, define "revealing" please
13:47 tango_ joined #git
13:49 pasadinhas joined #git
13:49 zacts joined #git
13:51 netj joined #git
13:51 bouncy joined #git
13:53 PCatinean Vampire0, not showing up in history or the tree
13:54 PCatinean as in they should never gain access to the modules in any shape or form
13:54 griffindy joined #git
13:55 ryez joined #git
13:57 PCatinean Vampire0, even keep it in a separate branch would be fine but just take the updates on two modules not all
13:57 robotroll joined #git
13:57 moritz then the best thing you can do is to put the modules into separate repositories
13:57 moritz with access control on them
13:58 moritz and then use subtree or submodules to incorporate the modules where you need them
13:58 moritz (or use a proper deployment process)
13:58 star_prone joined #git
13:59 PCatinean what do you mean by proper deployment process?
14:00 AaronMT joined #git
14:01 PCatinean @moritz
14:02 dhollinger joined #git
14:02 catag87 joined #git
14:02 catag87 joined #git
14:03 Guest5 joined #git
14:03 moritz PCatinean: if an application needs some custom modules, you can develop each module in a separate git repo, and then automatically test and build them, upload them to a pypi mirror, and then declare dependencies to them in the application you develop
14:03 Lyqyd joined #git
14:03 beyertech joined #git
14:03 liuzhen joined #git
14:04 dhollinger joined #git
14:04 PCatinean hmm
14:04 phaleth joined #git
14:04 PCatinean not sure if that will work for me
14:04 moritz why not?
14:05 AaronMT joined #git
14:06 PCatinean I don't want to tupload them on pypi and having one repo per module does not sound good
14:06 PCatinean 10 modules = 10 repos
14:07 zeroed joined #git
14:07 moritz it can be a local pypi mirror that nobody else has access to
14:08 moritz and, why not 10 repos? If they are actually 10 independent pieces of software, why lump them together?
14:08 moritz if they are highly interdependent, then not. But then you shouldn't have access restrictions on some of them either
14:09 sangy joined #git
14:09 MZAWeb joined #git
14:11 leeN joined #git
14:11 kaldoran joined #git
14:11 PCatinean hmm
14:13 PCatinean one is the base, 2 depend on the base, 1 more depends on one of the previous two
14:14 ResidentBiscuit joined #git
14:15 axl_ joined #git
14:16 cyan__ joined #git
14:20 darkbit joined #git
14:20 hahuang65 joined #git
14:20 beyertech joined #git
14:21 moritz ask yourself: if they were released on pypi, would they be in separate tarballs?
14:21 moritz if yes, have separate git repos
14:22 spudowiar joined #git
14:23 guampa joined #git
14:24 codeman joined #git
14:26 snowkidind joined #git
14:27 jayc joined #git
14:27 fuchstronaut joined #git
14:28 notebox joined #git
14:29 GavinMagnus joined #git
14:29 snowkidind joined #git
14:32 jceb joined #git
14:35 wwwi joined #git
14:35 l4v2 joined #git
14:36 tjone270 joined #git
14:36 narendraj9 joined #git
14:36 danslo joined #git
14:38 StuartMI joined #git
14:41 SuperKaramba How does git detect file changes?
14:41 SuperKaramba File size change? Md5 hash?
14:42 vktec I doubt it's a size change
14:42 vktec Probably a hash or a comparison with the previous commit
14:42 dsdeiz joined #git
14:42 dsdeiz joined #git
14:43 kpease joined #git
14:44 zacts joined #git
14:47 gargola joined #git
14:47 pks SuperKaramba: file size, modification time
14:48 mflow joined #git
14:48 pks It can be instructed to refresh its cache, though, in which case it will use its contents and SHA1
14:50 LionsMane joined #git
14:50 robotrolll joined #git
14:52 carif joined #git
14:52 LionsMane joined #git
14:54 noyb joined #git
14:57 fished joined #git
14:59 Lomex joined #git
15:01 rgrinberg joined #git
15:02 crose joined #git
15:02 shiriru joined #git
15:03 cdown_ joined #git
15:04 Darcidride joined #git
15:04 Sazhen86 joined #git
15:06 Lomex joined #git
15:09 sdothum joined #git
15:11 Tachyon_ joined #git
15:11 danslo_ joined #git
15:11 fairuz joined #git
15:12 jimi_sanchez joined #git
15:15 GavinMagnus left #git
15:15 gtristan joined #git
15:15 danslo joined #git
15:15 ChristopheT joined #git
15:16 ChristopheT left #git
15:16 GavinMagnus joined #git
15:18 daniel_rose joined #git
15:20 meLon joined #git
15:22 subhojit777 joined #git
15:24 daniel_rose joined #git
15:25 netj joined #git
15:25 gtristan joined #git
15:26 crayon joined #git
15:27 thiago joined #git
15:27 harish_ joined #git
15:28 fuchstronaut joined #git
15:28 hoangtranwork joined #git
15:33 lindenle joined #git
15:33 xlegoman joined #git
15:34 LionsMane joined #git
15:36 RDove joined #git
15:37 crayon joined #git
15:38 Darren_ joined #git
15:38 netcarver joined #git
15:38 madewokherd joined #git
15:38 ambro718 joined #git
15:40 HoierM joined #git
15:43 GavinMagnus left #git
15:44 eka joined #git
15:47 lindenle joined #git
15:47 rwb joined #git
15:49 crayon joined #git
15:50 luc4 joined #git
15:51 mischat joined #git
15:52 anli joined #git
15:52 fairuz joined #git
15:52 TomyLobo joined #git
15:54 alanwill joined #git
15:56 ResidentBiscuit joined #git
15:58 hashpuppy joined #git
15:58 KeyboardNotFound joined #git
15:59 le_melomane joined #git
15:59 kulelu88 joined #git
16:04 KeyboardNotFound I'm trying to pull from github, but I got error, I have no changes made after my last commit and push to github
16:06 sanketdg joined #git
16:08 rpd KeyboardNotFound: what do you mean you "got error?" What's the error
16:08 iota_pi joined #git
16:13 thiago KeyboardNotFound: if you want us to help you, please pay attention to IRC and reply to our questions
16:14 KeyboardNotFound rpd, thiago, sorry guys I didn't reply, I resolved problem with deleting the folder and again cloning it ( I know it's not the best option but because no changes were made after my last commit it worked )
16:17 GavinMagnus joined #git
16:19 InfoTest joined #git
16:21 hahuang65 joined #git
16:21 GavinMagnus left #git
16:22 jaequery joined #git
16:23 EvilPeng2 joined #git
16:23 kyan joined #git
16:24 nitric joined #git
16:24 star_prone joined #git
16:25 ytl joined #git
16:25 durham joined #git
16:27 BlackMaria joined #git
16:28 fuchstronaut joined #git
16:30 dmto joined #git
16:31 mohabaks joined #git
16:32 vuoto joined #git
16:33 robotrolll joined #git
16:34 vuoto joined #git
16:35 kpease joined #git
16:37 zacts joined #git
16:38 The_Phoenix1 joined #git
16:38 relgar joined #git
16:38 sargas joined #git
16:41 dreiss joined #git
16:41 catag87 joined #git
16:41 mikecmpbll joined #git
16:42 cyan__ joined #git
16:42 eivarv joined #git
16:43 Derperperd joined #git
16:44 govg joined #git
16:46 sdothum joined #git
16:47 armyriad joined #git
16:48 wagle joined #git
16:48 freimatz joined #git
16:50 ashley_ joined #git
16:50 ashley_ Hi guys, looking for some advice here. I have a website which is source controlled. In the config file there is a debug setting which we want true on development machines and false on the hosted site
16:51 ashley_ The hosted site is uploaded to by clicking a button on the admin side which does nothing extravagant, just issues a pull command
16:51 daynaskully joined #git
16:52 ashley_ It is critical that this debug setting is not accidentally uploaded to the server as it exposes all sorts of private information, potentially including SQL and SMTP passwords. I was wondering how most people handle cases like this?
16:52 ashley_ I am considering looking into hooks and issuing a warning when a change to the config file is pushed, but this seems troublesome
16:52 notebox joined #git
16:52 preaction i make the debug setting an environment variable, or i make a separate config file for development
16:53 fahadash joined #git
16:53 zumba_addict joined #git
16:53 shmuli joined #git
16:53 ashley_ Environmental variable sounds good, actually. Thanks!
16:54 sdothum joined #git
16:54 ashley_ One more... Sorry :( I've been struggling with this one for a week. I allow asset (image) uploading and gitignore the folder they are uploaded to in my repo since I don't want them version controlled because there's thousands and they change all the time.
16:54 ashley_ That said, I do want *some*, so we can actually test. Is the easiest way just removing the ignore temporarily, adding the ones I want, committing it, then re-adding the gitignore?
16:56 preaction you can git add -f <file> without removing the ignore
16:56 ashley_ once I've done that, it won't ever try removing itself from git due to the ignore affecting it, right?
16:56 preaction ignore does not work on files already added to git
16:56 Vampire0 joined #git
16:57 ashley_ Awesome, thanks so much! :)
17:00 shmuli_ joined #git
17:01 inflames joined #git
17:01 sleepee joined #git
17:01 paul424 joined #git
17:02 Guest5_ joined #git
17:05 eivarv joined #git
17:05 phanimahesh joined #git
17:05 Ediz joined #git
17:08 cdg joined #git
17:09 BSaboia joined #git
17:11 dalias joined #git
17:13 mohabaks joined #git
17:15 kfunk joined #git
17:16 paul424 joined #git
17:17 JLL joined #git
17:17 Guest5 joined #git
17:21 rubyonrailed joined #git
17:22 JLL Hello, I'm very new to Git and have some questions on using Git and Dropbox. I've already seen many forums warning against using both together. Most talk about using Dropbox as a remote repository. But what if I want to use Dropbox as my working directory? So the context is: we have a project team of 5 and are currently using Dropbox to save and edit all of our files. We are using the archaic system of version numbering filenames.
17:23 JLL So someone suggested we use Git for versioning. Is there a way to do this?
17:23 preaction you shouldn't mix git and dropbox, you've already ready why
17:24 JLL The team is already using Dropbox for all of our file saving and likes using the desktop client, because it acts as just another computer window.
17:25 preaction what desktop client?
17:25 JLL Dropbox desktop client
17:25 MihaiTodor joined #git
17:25 JLL I've found a "solution" git-remote-dropbox (https://github.com/anishathalye/git-remote-dropbox), but I think that just makes Dropbox a remote repository? But I want to use Dropbox as the working directory
17:26 rpd Why don't you just use git and pretend it is dropbox?
17:26 preaction use tortoisegit or some other client with shell integration
17:27 preaction you can make your working copy be in dropbox, but then you need to ensure that your actual repository data is not in dropbox, and that's going to end up really weird
17:27 MacGyver And it doesn't give you anything.
17:27 JLL I'm not sure about using Git as Dropbox? But we are using Dropbox and have been for a long time
17:27 MacGyver Because you're still limited to global file locks and the like.
17:28 JLL where would we save the actual repository if not in dropbox?
17:28 satifant joined #git
17:28 preaction somewhere else
17:28 JLL like on our local machines?
17:28 MacGyver There's a repository on each of your local machines anyway.
17:28 MacGyver The problem is synchronizing.
17:28 veilig2000 joined #git
17:28 kc8wxm joined #git
17:28 MacGyver And dropbox is completely unfit as a synchronization mechanism.
17:29 MacGyver So bottom line, don't use that, and stop thinking that there may be a way to use it.
17:29 JLL Why is it unfit as a synchro mechanism?
17:29 fuchstronaut joined #git
17:29 MacGyver Because it doesn't handle merges the way it should.
17:29 MacGyver It's not git-aware.
17:29 JLL I see
17:30 kc8wxm left #git
17:30 MacGyver If you commit, and your colleague commits before the dropbox synchronizes, you get a conflict.
17:30 preaction all of this should be explained by all the forum posts, blog posts, and otherwise that you read saying not to do this
17:31 rpd JLL: why not store the repo on some private repo hosting like Github's private w/e or bitbucket?
17:31 JLL Yes, I have read this. I just very new to Git and was not sure if I understood whether they were saying not to use Dropbox as the remote repo, local repo, or working directory, or just all of them
17:31 rpd you're already storing it on dropboxes servers anyways
17:31 MacGyver JLL: All of them.
17:31 FroMaster joined #git
17:31 diegoviola joined #git
17:31 daniel_rose joined #git
17:31 pwnz0r joined #git
17:31 rpd JLL: it's all of them because dropbox is not a VCS
17:31 JLL We were considering Bitbucket
17:31 ejnahc joined #git
17:31 kc8wxm joined #git
17:32 MacGyver Bitbucket works, github works, self-hosting with e.g. gitolite works.
17:32 MacGyver Anything that actually uses git itself for the synchronization is fine.
17:32 MacGyver So if you're considering bitbucket, by all means.
17:32 JLL What do people suggest then? If we want to use Git, then we would have to migrate all of our project team files off Dropbox to just everyone having a copy on our local machines? Then just push/commit versions to Git/Bitbucket?
17:33 MacGyver That's how it works. With dropbox you *also* have a local copy on your machine, it just gets synchronized all the time.
17:33 JLL I'm confused on where our actual files (code, etc.) will live
17:33 rpd Where do they live now?
17:33 JLL In Dropbox, but I guess MacGyver just answered that question
17:33 rpd On your local filesystem, until they decide to be synced to some dropbox server
17:34 rpd Just s/dropbox/git/ and you'll see it's not as different as you think
17:34 rpd Except git actual is a version control system
17:34 JLL Yes, we would really benefit from a version control system
17:34 Limes_ joined #git
17:34 JLL other than this version numbering filenames...
17:34 kc8wxm joined #git
17:35 JLL The other thing we like use DropBox for is adding resources (like background articles, etc.) in the shared folder. But these aren't files that would need to be tracked for version control.
17:36 cdg joined #git
17:36 Spec-Chum joined #git
17:36 MacGyver Then either keep using dropbox for those, or add them to git anyway.
17:36 rpd might as well keep those on dropbox, but you can also use something like github's wiki feature to associate those
17:36 daniel_rose joined #git
17:36 MacGyver I write academic papers and use git for version control; all the literature pdfs also go into the git repo.
17:37 Limes__ joined #git
17:37 JLL Ok, and do you organize your repos like organizing folders in a Dropbox shared folder (e.g. one repo for "Background Articles"
17:37 JLL Sorry for the basic questions
17:37 kyan joined #git
17:37 JLL Just very very new, and super confused with Git
17:39 JLL I'm just used to structuing projects through Dropbox/regular folder organization. For examples, having a "Programs" folder for all of our code, but sub folders inside "Programs" for different projects
17:40 MacGyver I turn that around.
17:40 MacGyver The project is the hierarchy top, and 1 project = 1 git repo.
17:40 MacGyver Sometimes 2 repos if there's a need to keep paper and software separate.
17:41 dreiss joined #git
17:41 JLL Right
17:41 JLL ok thanks, everyone! This was very helpful, I appreciate your patience
17:42 JLL might be back on later with more basic questions...but that's all for now. Thanks!
17:43 armyriad joined #git
17:44 kyan_ joined #git
17:45 wberrier joined #git
17:45 wberrier left #git
17:47 Fabricio20 joined #git
17:47 Vampire0_ joined #git
17:48 shmuli joined #git
17:48 kadoban joined #git
17:51 Sasazuka joined #git
17:52 zeroed joined #git
17:53 Vampire0 joined #git
17:54 GenZai joined #git
17:57 Cassiopaya joined #git
17:59 IlNominePatre joined #git
18:01 Davey OK… this is a new problem for me. I have a branch "PHP-7.1.0beta2" and a tag "php-7.1.0beta2" — on OS X I can't checkout the *branch*, git checkout PHP-7.1.0beta2 will checkout the tag. :/
18:02 narendraj9 joined #git
18:03 kadoban Davey: 'git checkout refs/heads/PHP-whatever'
18:04 relgar joined #git
18:05 Davey kadoban: hrm; doesn't exist. Probably because it was created remotely, and never checked out locally?
18:05 xall joined #git
18:05 kadoban Davey: Then yes ... you don't have that branch. You can create it I guess if you want. I'd probably give it a different name personally, if your push.default setting allows that.
18:05 xall joined #git
18:06 MadLamb joined #git
18:08 Vampire0_ joined #git
18:10 uebera|| joined #git
18:12 Lomex joined #git
18:15 deepanshu joined #git
18:16 Vampire0 joined #git
18:17 Davey kadoban: got it, thanks :)
18:21 grayjoc joined #git
18:22 hahuang65 joined #git
18:23 HoierM joined #git
18:23 Manuel15 joined #git
18:23 Manuel15 joined #git
18:25 tanuki joined #git
18:26 foist joined #git
18:28 fairuz joined #git
18:30 charginghawk joined #git
18:31 charginghawk in my git repo, got some long long long minified files, tons of text on one line
18:31 charginghawk when I run git log -p, I hit these minified files and I have to scroll for like 20 seconds to get past it
18:31 kadoban charginghawk: Don't track the minified versions, just track the actual content. And if you want, track a script to minify them automatically.
18:31 charginghawk can I run git log -p without wrapping?
18:32 despoil joined #git
18:32 charginghawk kadoban: that's what I should do, yes, but that's not something I can do now
18:32 charginghawk team workflow thing
18:33 kadoban Talk your team into doing the obviously better thing.
18:33 kyan_ joined #git
18:33 charginghawk found it! git config --global core.pager 'less -S'
18:34 workkevin joined #git
18:36 veilig2000 joined #git
18:36 EvilPenguin joined #git
18:37 rlb left #git
18:38 usm4n joined #git
18:38 workkevin Apparently during an ill-fated rebase, moving a file created a conflict so git chose a new name for the file, <original-name>~<commit-hash>. Then when I aborted the rebase it left that file in my working tree.
18:39 kadoban workkevin: I know of no circumstances where git will do anything like that.
18:40 vdv joined #git
18:41 johnny56 joined #git
18:41 tristanp joined #git
18:42 workkevin It's little hard to explain the whole circumstance. The rebased commits were already squashed and added to the upstream branch. So the file was created in the final location upstream, but in the rebased commits it was created in a different location, then moved.
18:44 eivarv joined #git
18:47 kadoban I still no of no circumstances that git will do that, or anything like that.
18:47 kadoban Probably some other tool?
18:49 workkevin Here's the sanitized output: http://pastebin.com/MY8zg1ZF
18:50 diphtherial joined #git
18:50 diphtherial hey, kind of a tall order -- i ran chmod -R <perms> . and now i have a ton of files that are pending commit
18:51 rubyonrailed joined #git
18:51 diphtherial is there some way for me to filter down to only the files that have just a permissions change so i can commit them in one go?
18:51 peepsalot joined #git
18:53 diphtherial (i unfortunately also have quite a few files that do have edits that i'd like to commit individually)
18:55 moritz diphtherial: not really, but a 'git add -p' will ask you for each change, including the file mode changes, separately
18:55 workkevin Oh well, seems like a bug to me but I couldn't reproduce it with a simple test repository.
18:55 shmuli joined #git
18:58 sagerdearia joined #git
18:58 fuchstronaut joined #git
18:59 diphtherial moritz: ah, that could work; thanks
18:59 Jackneill joined #git
19:00 nwkj86 joined #git
19:00 Jackneill joined #git
19:01 ediz_ joined #git
19:03 vassagus joined #git
19:03 rardiol joined #git
19:06 altendky joined #git
19:06 tyreld joined #git
19:08 Derperperd joined #git
19:09 algae joined #git
19:18 star_prone joined #git
19:18 vassagus joined #git
19:19 ksolv joined #git
19:24 veilig2000 joined #git
19:26 elux joined #git
19:29 elux left #git
19:29 sarbs joined #git
19:33 Lunatrius` joined #git
19:35 cdg joined #git
19:36 kpease joined #git
19:42 yoan joined #git
19:43 Sazhen86 joined #git
19:43 lel joined #git
19:44 diphtherial huh, git add -p is really handy. i'll have to remember that one
19:44 diphtherial thankfully there weren't as many files to manually approve as i thought :D
19:47 moritz diphtherial: many git commands have a similar -p option. Like checkout, commit (same as with add), reset
19:50 paul424 joined #git
19:53 Spec-Chum joined #git
19:53 netj joined #git
19:54 ZeDestructor joined #git
19:54 lamont joined #git
19:54 veilig2000 joined #git
19:55 interne7y joined #git
19:59 govg joined #git
20:00 zacts joined #git
20:01 diphtherial neat :)
20:08 Rodya_ joined #git
20:10 Kicer86 joined #git
20:13 cagedwisdom joined #git
20:14 m0viefreak joined #git
20:14 dsdeiz joined #git
20:14 dsdeiz joined #git
20:14 crayon joined #git
20:15 ki0 joined #git
20:18 cdg joined #git
20:18 shinnya joined #git
20:21 netj joined #git
20:22 hahuang65 joined #git
20:23 MZAWeb joined #git
20:24 boombatower joined #git
20:27 jost joined #git
20:29 nwkj86 joined #git
20:30 pikajude joined #git
20:30 pikajude joined #git
20:32 jeffreylevesque joined #git
20:33 cdown_ joined #git
20:38 cyan__ joined #git
20:39 stasmakarov joined #git
20:39 aghalarp joined #git
20:41 eschu joined #git
20:43 heroux joined #git
20:45 invex joined #git
20:47 invex joined #git
20:54 The_Phoenix joined #git
20:54 armyriad joined #git
20:59 lolmac joined #git
21:00 fuchstronaut joined #git
21:00 MattMaker joined #git
21:00 WhiskerBiscuit joined #git
21:02 _kreo joined #git
21:03 SoItBegins joined #git
21:03 cdown_ joined #git
21:04 rahtgaz joined #git
21:04 SoItBegins I have an interesting problem where I’m trying to set up a version control system, but I’m not quite sure how to go about configuring it to work with the kludge we currently have.
21:05 rpd What are you doing that's special/a corner case for a typical VCS?
21:05 SoItBegins Basically, there are some files stored on local computer A. These files are the local copy of a website on web server F, and data is transferred by FTP. User 1 uses Computer A.
21:06 SoItBegins User 2 uses computer B, and has been using a programmer’s text editor to directly edit the remote copies of the files on server F when changes need to be made. This causes local computer A to get out of sync.
21:06 SoItBegins Is there a way User 2 can save to the repository and the FTP at the same time? The user doesn’t have a FTP program other than the text editor. User 1 has DreamWeaver, but it can’t be installed on User 2’s computer (software licensing).
21:07 SoItBegins Alternately, it’d be even better if User 2 could edit the local copies then push them up over FTP like a civilized person, but the main store is on Computer A, so there’s the issue of having to be in LAN range.
21:08 rpd I think you're adding a lot of variables that aren't related to the problem; e.g. the text editor and FTP blah blah blah. Just have a central location where the real version of the source lives and requires users 1,2, up to one thousand to push and pull changes from that central location
21:10 armyriad joined #git
21:10 mablae joined #git
21:11 Isla_de_Muerte joined #git
21:12 SoItBegins rpd: Fair enough. The primary problem is as follows: That central location would probably be computer A. If User 2 pushes changes to computer A’s repository, which seems sensible, they then can’t upload them from computer A to server F, because they don’t have a FTP program, and (as an implied subset of that) they don’t have an FTP program that works over a LAN. And physically walking to computer A is right out. User 1 is usually using it!
21:12 Cata|Work joined #git
21:13 the_cybersphinx joined #git
21:13 SoItBegins The other option is to somehow make the web server be the repository. I’m not sure if that is achievable / secure.
21:13 rpd Computers A and B don't really sound like good central locations for anything. Why not make server F be a central location that always runs code from a certain branch. Users 1 and 2 will make changes and someone with the right permission will push these changes to that deployment branch.
21:13 fahadash joined #git
21:14 SoItBegins Server F is the web server. It’s rented from a hosting company. I do not know if git can be installed on it, but if I can have the repository be there, that’s probably the best choice.
21:14 rpd Or, make the central location a repo hosting site like bitbucket and github. Whoever can log into the server can pull the correct changes
21:15 jave joined #git
21:15 rpd Talking about security, ftp doesn't sound particularly secure anyways, so that's another problem.
21:16 SoItBegins That’s shared hosting for you.
21:19 SoItBegins But yeah, I’ll try and figure something out. Thanks.
21:20 rpd Well, anyways, there's a lot of options. Let's talk about non-options. Hosting your central repository on a physical computer is a non-option. Either use the server or some repository host. This way you don't have to worry about details related to the editors or ftp programs when thinking about where your source lives.
21:20 SoItBegins [listening politely]
21:20 dunpeal joined #git
21:21 dunpeal I created a local branch foo. What's the most concise way to push it to origin/foo + set it to track origin/foo?
21:21 Cata|Work joined #git
21:21 rpd I used to have a cron job on a server that would pull a branch of a repo every once in a while. You can also just have the server host the code to skip that. You could also just make it be user 2's job to pull down updated changes and push via ftp.
21:22 rpd dunpeal: I think you need to just `git branch --set-upstream-to=...` and just push as usual
21:22 invex left #git
21:22 rpd The most concise way would have been to track origin/foo from checkout
21:22 rpd but now you have to manually set it
21:24 shmuli joined #git
21:30 Cata|Work joined #git
21:31 leehambley joined #git
21:34 meLon joined #git
21:36 wwwi joined #git
21:36 catbeard To prevent you from losing history, non-fast-forward updates were rejected
21:36 catbeard Merge the remote changes before pushing again.
21:39 Cata|Work joined #git
21:40 LiohAu joined #git
21:40 durham joined #git
21:43 Dougie187 left #git
21:47 nettoweb joined #git
21:48 vuoto joined #git
21:48 GyrosGeier joined #git
21:51 rubyonrailed joined #git
21:52 jaafar joined #git
21:56 interne7y joined #git
22:01 fuchstronaut joined #git
22:03 spudowiar joined #git
22:06 rkazak joined #git
22:07 usm4n joined #git
22:10 Dyonisos joined #git
22:10 Dyonisos joined #git
22:11 me_and joined #git
22:12 spudowiar joined #git
22:13 veilig2000 joined #git
22:13 Hobbyboy joined #git
22:14 stephanie joined #git
22:15 xall joined #git
22:16 xlegoman joined #git
22:21 dunpeal left #git
22:22 rubyonrailed joined #git
22:23 stephanie joined #git
22:23 hahuang65 joined #git
22:24 stormlrd joined #git
22:25 byteflame joined #git
22:25 safe joined #git
22:26 Derperperd joined #git
22:30 psacrifice joined #git
22:31 mischat_ joined #git
22:33 spudowiar joined #git
22:34 mohabaks joined #git
22:35 SpottyYouth joined #git
22:37 Noldorin joined #git
22:38 veilig2000 joined #git
22:38 mostlybadfly joined #git
22:40 spudowiar joined #git
22:44 BSaboia joined #git
22:44 BSaboia joined #git
22:45 BSaboia joined #git
22:45 BSaboia joined #git
22:52 red_ joined #git
22:53 SwiftMatt joined #git
22:55 mehdi__ joined #git
22:56 wizonesolutions_ joined #git
22:56 Rodya_ joined #git
22:57 snowkidind joined #git
23:01 fuchstronaut joined #git
23:02 MistahKurtz joined #git
23:16 piling joined #git
23:17 ki0 joined #git
23:17 theskillwithin joined #git
23:19 d0nn1e joined #git
23:21 Rodya_ joined #git
23:26 fairuz joined #git
23:29 gambler joined #git
23:31 ki0 joined #git
23:32 cagedwisdom joined #git
23:32 durham_ joined #git
23:35 cbreak joined #git
23:36 ycun joined #git
23:37 boombatower joined #git
23:38 ffabi joined #git
23:39 ShekharReddy joined #git
23:42 byteflame joined #git
23:43 eruditehermit joined #git
23:44 eruditehermit hey, I have a question about submodules. I created a git repository and inside it are folders which have a .git because they are git repositories in their own right. It didn't add the files in those directories to my top level git. Is that because git add detects they are their own repositories and doesn't include them by default? How do I properly include those files in my top level repository?
23:46 frogonwheels eruditehermit: yeah - git will detect that it's a git folder and exclude it.   There are a bunch of ways to include sub-repos... !subrepo
23:46 gitinfo eruditehermit: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
23:47 frogonwheels eruditehermit: It depends a lot on the nature of the relationship between the main project and the submodule as to which way you go.
23:48 madewokherd joined #git
23:49 eruditehermit frogonwheels: basically I have a bunch of vim plugins. I'm trying to create a repository that just has my vim settings so that when I go to a new box, I can just clone my vimrc and plugins to it
23:49 eruditehermit frogonwheels: which of the 4 would you advise?
23:50 kyan joined #git
23:51 frogonwheels eruditehermit: hmm.. possibly submodule  with  add -b (for adding a branch) - for minimal external overhead.
23:51 frogonwheels eruditehermit: either that or a Makefile script that clones/updates your external dependancies?
23:51 eruditehermit !submodule
23:51 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules
23:51 rpd eruditehermit: if they're just some random plugins that you always want an updated version up you can just add a .gitsubmodules file with them listed and clone your repo with --recursive
23:51 eruditehermit rpd: that sounds like a good idea
23:52 durham joined #git
23:52 frogonwheels eruditehermit: The   git submodule add -b   adds a 'branch' rather than a 'commit' pointer for a submodule which is why I was suggseting that. Haven't used it tho'
23:53 sbeller frogonwheels: eruditehermit: the branch option doesn't make git track the branch *instead* of the sha1. It adds the branch *additionally*
23:53 frogonwheels oh ok.
23:53 sbeller that makes "git submodule update --remote" easier
23:53 sbeller but it still tracks sha1s
23:54 frogonwheels that makes sense;
23:54 frogonwheels thx
23:54 eruditehermit so what is the consensus then?
23:54 ffabi joined #git
23:54 frogonwheels If I were doing it I'd just make a script and have a list of modules to clone.
23:55 frogonwheels so put the list and the script in the main repo.
23:55 eruditehermit hmm, but I want to only run git clone
23:55 rpd Uh, that's so complicated honestly
23:55 eruditehermit I like the submodule idea
23:55 eruditehermit but I'm not sure I understand branch vs not branch option
23:56 griffindy joined #git
23:56 rpd me neither; just do git submodule add, etc then commit the .gitmodules file
23:56 frogonwheels but rpd's idea of using the  .gitsubmodules is pretty solid imho
23:56 rpd then clone recursively; I think that's the step you missed.
23:56 eruditehermit so when I try to do submodule add it yells at me
23:57 kyan joined #git
23:57 interne7y joined #git
23:57 eruditehermit git submodule add https://github.com/kien/ctrlp.vim.git .vim/bundle/ctrlp.vim/ '.vim/bundle/ctrlp.vim' already exists in the index
23:57 frogonwheels rpd: generally you would add the submodule when it's not there already. adding it clones and fetches it.  - but I know there's a way you can do it in situ
23:57 rpd sounds like it already exists as a not submodule. Just delete it first? Or manually add the gitmodule entry
23:58 mablae_ joined #git
23:59 leehambley joined #git
23:59 rubyonrailed joined #git

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