Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-30

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

All times shown according to UTC.

Time Nick Message
00:02 MrCircuitMatt Vampire0: OK. What will happen to HEAD@{14} to HEAD@{0} now? Are they just going to sit around forever or are they gone (somehow I doubt that)?
00:02 _28_ria joined #git
00:02 Vampire0 And yes MrCircuitMatt, I think HEAD@{15} should be where you want to go back to
00:02 Vampire0 MrCircuitMatt, what do you mean?
00:02 Vampire0 MrCircuitMatt, they are around as long as they are in the reflog
00:03 Vampire0 MrCircuitMatt, after that they are unreferenced if you don't have any tags or branches pointing to them and are garbage collected and finally deleted
00:03 MrCircuitMatt ooh
00:03 MrCircuitMatt I think I  got it, thank you
00:04 gitinfo MrCircuitMatt: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
00:04 Vampire0 yw MrCircuitMatt
00:04 tribly joined #git
00:04 MrCircuitMatt OK, I will comply with the bot and try once more. Thank you Vampire0
00:05 MuffinMedic joined #git
00:13 col joined #git
00:16 NeverDie joined #git
00:17 MrCircuitMatt Vampire0: OK I think I broke it even more now :-/. http://paste.debian.net/911425/
00:17 mizu_no_oto joined #git
00:17 MrCircuitMatt Vampire0: this all looks exactly like it should except for the master branch being at 9d3a9a63481e9fca836bb50ad703f0e34028fc6f, yielding a detached head warning
00:19 z3t0 joined #git
00:20 nowhereman joined #git
00:20 tmsmith joined #git
00:21 MuffinMedic joined #git
00:22 z3t0 joined #git
00:24 MrCircuitMatt hm I guess I could just merge my detached head commits into master
00:24 Vampire0 MrCircuitMatt, a branch cannot be detached. !zombie
00:24 gitinfo MrCircuitMatt: Brainzz! More brainzzzz!  For information about detached heads, see !detached
00:25 Gsham joined #git
00:27 donught joined #git
00:27 donught joined #git
00:27 MrCircuitMatt Vampire0: right I think I got the picture and managed to merge it, thanks again Vampire0
00:28 cdown_ joined #git
00:30 Vampire0 MrCircuitMatt, you're welcome
00:32 safe joined #git
00:33 dumacdev joined #git
00:34 akkad joined #git
00:34 dumacdev joined #git
00:34 matoro joined #git
00:36 col joined #git
00:36 ozmage joined #git
00:37 griffindy joined #git
00:39 ozmage_ joined #git
00:39 cdown_ joined #git
00:43 ozmage joined #git
00:46 dreiss joined #git
00:47 mizu_no_oto joined #git
00:47 col joined #git
00:48 acetakwas joined #git
00:52 a_thakur joined #git
00:54 otiose joined #git
00:55 ozmage joined #git
00:55 Cabanossi joined #git
00:55 iananananan joined #git
00:56 iananananan heyo, i'm trying to set up my first git remote on a server. i want the repo on the remote to look the same as the repo on my local - but when i follow this page, i get a bunch of directories that i don't recognize.
00:56 iananananan https://git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server
00:56 iananananan i might be abusing git since googling around "make git remote look like git local" doesn't return what i want
00:57 ToxicFrog iananananan: remote repos are generally what's called "bare" repos, meaning they just contain what would normally be in the .git directory, with no user-editable working tree
00:57 iananananan i guess i could make the remote somewhere else on the server, and then git clone from the remote (on the same server) but that feels wrong.
00:58 ToxicFrog This is because, for safety reasons, there are restrictions on pushing to non-bare repos
00:58 rwp iananananan, The remote is usually a "bare" repository. Are you seeing files there like HEAD, branches, config and so forth there?
00:58 ToxicFrog If you're always going to pull between them and never push (or if you understand and accept the risks), recreate it without the "--bare" or use "git clone" to copy it from the existing repo>
00:59 iananananan rwp: ToxicFrog: yep, that sounds right! i "git init --bare" initially
00:59 rwp Then that is all correct. For the normal use.
00:59 pur3eval joined #git
01:00 iananananan this is on a box that's not connected to the external internet, and i'm the only one pushing to it
01:00 * rwp ponders the huge lag I am experiencing with IRC at the moment. I am two lines behind ToxicFrog.
01:00 rwp iananananan, Same thing even if it is just you pushing to it.
01:00 rwp You normally only "push" to a bare repository.
01:01 rwp A full working copy is one that you would normally "pull" from.
01:01 iananananan i tried pushing to a remote that i created without --bare, but it threw me errors
01:01 rwp That is the main thought process difference. If you want to pull you can pull from anywhere. But if you want to push then the remote should be a bare one.
01:02 rwp Describe the setup you are trying to achieve. You have two working copy clones both pulling from and pushing to a 3rd shared repository?? Is that it?
01:02 Vampire0 iananananan, why do you want to push to a non-bare repository? Is this about deploying your work, or what is the reason?
01:03 iananananan rwp: Vampire0: i have a folder full of .ogg and .sm (stepmania pack folder). we're making slight changes to it as we update the pack for a tournament.
01:04 rwp First I have to comment that git is not the best tool for managing binary files such as music files.
01:04 iananananan they're not changing between commits, just the .sm files
01:04 Vampire0 iananananan, what does that mean? That you intend to use the files on the location where you want to push to?
01:04 iananananan Vampire0: yes.
01:04 rwp But if I put that to the side for the moment then does this mean you have a working copy and your friend has a working copy and you are trying to work between you?
01:04 Vampire0 iananananan, then this is a deployment workflow, so please read !deploy
01:04 gitinfo iananananan: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
01:05 Vampire0 iananananan, besides that as rwp already said, a VCS is not the best tool for binary files
01:05 iananananan rwp: no, we're updating a google drive folder with changes, and i want to be able to sync changes to the machine w/o worrying about missing things.
01:05 iananananan Vampire0: thanks for the link, i'll read through it.
01:05 Vampire0 iananananan, !binary about the binary lifes
01:05 gitinfo iananananan: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions
01:05 Vampire0 s/lifes/files/
01:06 rwp I think the info in that deploy link will cover what you want to do.
01:08 iananananan rwp: Vampire0, thank you very much! have a good one.
01:08 iananananan left #git
01:10 sorressean left #git
01:10 nanga joined #git
01:10 CussBot joined #git
01:11 nanga joined #git
01:12 ResidentBiscuit joined #git
01:17 dirtyroshi joined #git
01:17 mizu_no_oto joined #git
01:17 otiose joined #git
01:17 drawkula joined #git
01:18 MuffinMedic joined #git
01:20 nanga joined #git
01:20 nanga joined #git
01:20 ozmage joined #git
01:20 matsaman joined #git
01:20 ozmage joined #git
01:23 star_pro_ joined #git
01:24 a_thakur joined #git
01:24 mizu_no_oto joined #git
01:26 svm_invictvs joined #git
01:26 Tobbi joined #git
01:27 nckpz joined #git
01:30 drawkula joined #git
01:31 solenodic joined #git
01:31 otiose joined #git
01:37 arescorpio joined #git
01:38 Derperperd joined #git
01:41 justanotheruser joined #git
01:44 mizu_no_oto joined #git
01:53 Gsham joined #git
01:55 Cabanossi joined #git
01:57 ozmage joined #git
01:58 ozmage joined #git
02:02 Nilesh_ joined #git
02:07 d^sh joined #git
02:09 nettoweb joined #git
02:10 finalbeta joined #git
02:10 nettoweb1 joined #git
02:11 Darren_ joined #git
02:13 ecuanaso joined #git
02:17 pks joined #git
02:18 Log1x_ left #git
02:20 Log1x joined #git
02:22 _geoff joined #git
02:22 ozmage joined #git
02:23 Gsham joined #git
02:23 ozmage joined #git
02:26 Noldorin joined #git
02:28 rmandev joined #git
02:28 Noldorin joined #git
02:30 ozmage joined #git
02:30 rivarun joined #git
02:30 ozmage joined #git
02:34 Goplat joined #git
02:38 cdown joined #git
02:39 Derperperd joined #git
02:40 Cabanossi joined #git
02:41 vidjogamer joined #git
02:42 kyan So, there's a lot of info about detached worktrees, but I'd like the opposite: I want to be able to run "git add" from the directory containing the ".git" directory, but have it add files from somewhere else in the filesystem. How can I do that (or what can I google for)? Thanks!
02:46 thiago set GIT_DIR and GIT_WORKTREE
02:46 kyan mhmmm, but I'd like to be able to have that metadata in the .git folder
02:46 kyan so that I can use existing scripts on it
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and alternative commits | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-slushie: submit your best punch line to https://madeitwor.se/git-jokes
02:49 kyan (my specific situation is: foo/ = git repo 1, foo/(bar,etc) = submodules, foo/bar/baz = git repo 2, with a different subset of the files in foo/ from repo 1
02:50 kyan and running a script on the whole foo tree that goes through it and pulls/pushes changes to the remote git server)
02:52 d^sh joined #git
02:54 stickperson joined #git
02:54 adymitruk deleting branches doesn't hit the update hook
02:55 adymitruk is the proper way to add pre-update hooks now done via pre-receive?
02:56 gugah joined #git
02:58 Gsham joined #git
03:00 msonntag joined #git
03:04 aavrug joined #git
03:05 aavrug joined #git
03:05 kyan On further investigation, I'm thinking maybe I should just teach the scripts to be able to handle the workdir stuff...
03:06 dx left #git
03:06 aavrug joined #git
03:07 aavrug joined #git
03:08 MarioBranco joined #git
03:09 aavrug joined #git
03:09 robinsmidsrod joined #git
03:10 jon-mac joined #git
03:12 _28_ria joined #git
03:16 fstd_ joined #git
03:17 kyan thiago: Cool, I think I have wrapped my head around that, thanks for poking me in that direction :)
03:17 adymitruk what is the best way to treat errors in a git hook? I'd like to see any failure on the client side
03:18 Vortex34 joined #git
03:18 jeffreylevesque joined #git
03:19 jozwior joined #git
03:22 armyriad joined #git
03:25 cagedwisdom joined #git
03:29 dsdeiz joined #git
03:29 dsdeiz joined #git
03:37 msonntag joined #git
03:37 MuffinMedic joined #git
03:38 SwiftMatt joined #git
03:39 rgrinberg joined #git
03:39 Derperperd joined #git
03:42 dreiss joined #git
03:44 mizu_no_oto joined #git
03:44 armyriad joined #git
03:45 Gsham joined #git
03:45 nckpz joined #git
03:47 otiose joined #git
03:52 a_thakur joined #git
03:53 tmcmahon joined #git
03:54 kyan That makes me wonder if it's possible to have a submodule with the same working directory as the repository it's a submodule of
03:55 chachasmooth joined #git
03:56 boombatower joined #git
03:57 jost__ joined #git
03:57 Limes joined #git
04:00 dtype I have a svn repo with odd and inconsistent branch/tag locations, and 50000+ revisions. I'm working on a git migration, and so far working plan is git svn-ing the trunk, then editing .git/options to manually point to each svn branch...
04:00 sunri5e joined #git
04:00 dtype then probably just manually set the tags
04:00 dtype any flaw to that logic other than the slowness that the git svn sync of the branches seems to take?
04:00 hexagoxel joined #git
04:01 xall joined #git
04:02 dtype to clarify, editing options "branches=" lines for each branch in svn (again, they're all in odd locations), then "git svn fetch" to get the sync, track the remote svn repo, then push these basically one by one to the new migration git server
04:02 bilb_ono joined #git
04:03 Derperperd joined #git
04:03 dtype seems to be generally working, but thought I'd ask if the overall process is sane. And happy Sunday evening to folks. :)
04:08 Cabanossi joined #git
04:11 matoro joined #git
04:11 pks joined #git
04:13 valar joined #git
04:13 solenodic joined #git
04:13 lucasem joined #git
04:17 mizu_no_oto joined #git
04:19 ignacio joined #git
04:19 ignacio joined #git
04:20 ignacio joined #git
04:20 ignacio joined #git
04:31 robotroll joined #git
04:31 Phenix joined #git
04:33 rossome joined #git
04:34 Nugget_ left #git
04:34 Nugget joined #git
04:38 Cabanossi joined #git
04:43 dreiss joined #git
04:49 stickperson joined #git
04:50 mohabaks joined #git
04:52 solenodic joined #git
04:58 blackwind_123 joined #git
04:58 ayogi joined #git
04:59 Motoko joined #git
04:59 msonntag joined #git
04:59 pks joined #git
05:00 sbulage joined #git
05:00 dermoth joined #git
05:01 star_pro_ joined #git
05:02 howdoi joined #git
05:07 om_henners joined #git
05:10 om_henners joined #git
05:13 ResidentBiscuit joined #git
05:19 gfixler joined #git
05:25 valar joined #git
05:28 iamthad joined #git
05:33 rchavik joined #git
05:33 [0xAA] joined #git
05:33 raijin joined #git
05:37 Cabanossi joined #git
05:38 col joined #git
05:39 APic joined #git
05:44 col joined #git
05:45 star_pro_ joined #git
05:46 eizua joined #git
05:46 daurnimator ToxicFrog: long time no see :)
05:49 bket joined #git
05:50 mehola joined #git
05:51 Charliechin joined #git
05:54 tirej joined #git
05:56 freimatz joined #git
05:57 _geoff joined #git
05:57 mehola joined #git
06:04 gugah joined #git
06:04 xissburg joined #git
06:06 m4sk1n joined #git
06:06 [0xAA] joined #git
06:09 dec0n joined #git
06:09 rscata joined #git
06:18 robattila256 joined #git
06:19 jozwior joined #git
06:20 menip joined #git
06:22 ecuanaso joined #git
06:24 tirej joined #git
06:24 ckruczek joined #git
06:29 [0xAA] joined #git
06:32 Khisanth joined #git
06:32 solenodic joined #git
06:34 ngm joined #git
06:35 fahadash joined #git
06:41 dsdeiz joined #git
06:42 stickperson joined #git
06:46 Felishia joined #git
06:47 Felishia how do I pull from another repo that I forked to keep it in sync...
06:47 _28_ria joined #git
06:48 tristanp joined #git
06:48 dreiss joined #git
06:49 daurnimator Felishia: git remote add upstream git://my/upstream && git pull upstream
06:50 zeroed joined #git
06:51 d1z when working with submodules, can one simply step into the submodule's directory and issue git commands from there?
06:51 Felishia daurnimator, done
06:52 zefferno joined #git
06:54 d1z or is it advisable to do it using the git submmodule parent command
06:56 stickperson joined #git
06:57 Kulrak joined #git
06:57 Kulrak joined #git
06:57 Raging_Hog joined #git
06:58 dave0x6d joined #git
06:58 ThomasLocke joined #git
06:58 ThomasLocke joined #git
06:59 basiclaser joined #git
06:59 omniwolf joined #git
07:01 thiago d1z: both ways are fine
07:01 omniwolf hi all, hoping for help with cloning (i use that word but am not sure if it's the correct one) a branch in my github thingo
07:01 thiago using git submodule is actually harder
07:01 thiago git submodue foreach, I mean
07:01 thiago omniwolf: then describe what you want to do, not the word you think means what you want
07:01 omniwolf good idea!
07:02 omniwolf so, i have a branch called "Legacy-testing".  i would like to make an exact copy of that called "Legacy-testing2".  is clone the right term?  how would i do this?
07:03 thiago no, "creating a branch" is the right term
07:03 JeroenT joined #git
07:03 thiago create it on your local copy
07:03 dersand joined #git
07:03 thiago if you want it to also exist on your remote repository, push it there
07:03 omniwolf ok, so i can git pull legacy-testing
07:03 omniwolf then .. what
07:04 thiago git branch to create a branch
07:04 omniwolf (sorry, the whole local/remote thing confuses me)
07:04 omniwolf ok
07:04 thiago git branch <branchname> <startingpoint>
07:04 thiago how can it confuse you? It's either on your computer or it's not.
07:05 omniwolf so "git branch LegacyTesting2 c:\blah\legacytesting2"  ?
07:05 thiago starting point is a commit or another branch name
07:06 omniwolf oh, so, "git branch
07:06 omniwolf sorry mistake
07:06 omniwolf "git branch legacy-testing2 legacy-testing" ?
07:07 rivarun joined #git
07:07 thiago yes
07:07 omniwolf ok, running it now!
07:07 sbulage joined #git
07:07 freimatz joined #git
07:07 Cabanossi joined #git
07:08 omniwolf git branch legacy-testing legacy-testing2
07:08 omniwolf fatal: A branch named 'legacy-testing' already exists.
07:08 freimatz3 joined #git
07:09 thiago look at what you told me you'd run and what you actually ran
07:09 omniwolf wow what a fail
07:09 thiago :-)
07:09 omniwolf i'll get checked for dyslexia, cheers
07:10 overlord_tm joined #git
07:10 omniwolf ok that command appears to have been accepted
07:11 thiago now push your new branch
07:11 omniwolf do i now need to push legacy-testing2 ?
07:11 omniwolf ok
07:12 dminuoso Would you prefer to formulate a commit message as "Add safety checks to component" or rather "Check for safety" ?
07:13 omniwolf git push
07:13 thiago they're not the same thing at all
07:13 msonntag joined #git
07:13 grawity "componentname: add safety checks for X, Y, and Z"
07:13 omniwolf fatal: The current branch legacy-testing2 has no upstream branch.
07:13 omniwolf it's suggesting i use "git push --set-upstream origin legacy-testing2", is this good?
07:13 dminuoso grawity: If components are split into one component per file, would you still include the "componentname" ?
07:13 thiago omniwolf: yes
07:14 grawity unless it gets so long that the actual change description no longer fits
07:14 omniwolf thiago: thank you this appears to have worked
07:14 dminuoso Right
07:14 grawity in which case try to summarize, but
07:15 grawity you know, make it *useful*
07:15 grawity linux.git has good commit messages
07:15 dminuoso Well, right now I do it like this: "Add safety checks\n\nThis prevents an a nuclear winter in case someone clicks the wrong button"
07:15 dminuoso Right.
07:15 dminuoso Ah I shall look at linux.git, it's a good point
07:15 dminuoso Trying to see whether I can assimilate other good behaviors. :)
07:16 dminuoso I've now started to commit so many things, though partial fixup commits are getting a bit stressful because I always have to find out the related commit hash
07:17 omniwolf next question.  i have another branch (called beta) I want to copy over the top of Legacy-testing such that beta and legacy-testing are the same.  after some googling, it seems this command should do it: "git push origin +beta:legacy-testing"  will this do it for me?
07:18 grawity depends on where you want it to be copied
07:18 grawity your command would copy the local branch 'beta' to origin's branch 'legacy-testing'
07:18 MineCoins joined #git
07:18 omniwolf ok, and overwrite legacy-testing completely?
07:19 grawity dminuoso: ...how are you even doing the "partial fixup commits"?
07:21 jagob joined #git
07:22 osse dminuoso: you can use stuff like HEAD~6 as argument to --fixup, and even :/word
07:25 AciD` hey guys, I have a `master` branch I use only for stable releases, and a `next` branch that I use for all the development. Now, when I need to push a hotfix, I usually push it to its own branch origin/hotfix_42. Then I create 2 pull requests, one for master, one for next. Is there a better way to push changes that needs to appear in both master and next branch?
07:26 omniwolf assuming yes, would this be the right set of commands:  "git checkout beta" -> "git pull" -> "git push origin +beta:legacy-testing"  ?
07:26 AciD` either I create those 2 pull requests, or I push to master, then cherry pick on next
07:26 chele joined #git
07:26 AciD` (but sometimes that's not possible since I force-add the `dist` files on `master`, and I don't have those on `next`)
07:27 osse AciD`: what does that mean?
07:28 AciD` osse -> it means on `master` I push the generated files to prevent users to have to compile the library, while on `next` I do not want that since it would complicate merging
07:28 thiago joined #git
07:29 AciD` `next` being the defactor branch for contributors, who already know how to build said `dist` files
07:29 osse then you're between a rock and a hard place
07:29 osse make two commits, one with the fix and one with the files. make only one commit go to next and both to master
07:29 AciD` perhaps I'm doing everything wrong, I'm open to suggestion
07:30 AciD` osse -> that's what I'm currently doing, so I guess pushing the hotfix in its own branch, then merging it two times on `master` and `next` is the way to go?
07:30 osse AciD`: the actual way to go is to not commit generated files
07:30 osse i guess this is the next best thing
07:31 osse or cherry-pick, leaving out the generated files
07:32 AciD` osse -> that's what I strive to do on the `next` branch, and only build and force-add the dist files when releasing stable versions
07:33 osse yes, but as you notice leaving out one branch from the striving makes it more complex
07:33 AciD` but apart from the "do not commit generated files if you can" problem, I was more asking about what's the best practice when you have to push a commit to multiple branches
07:33 Darcy joined #git
07:33 Darcy joined #git
07:34 berndj joined #git
07:34 star_pro_ joined #git
07:34 AciD` osse -> I checked how most other JS library maintainers do, and it seems it's quite usual to proceed this way, but that's another talk :)
07:34 djb-irc joined #git
07:34 osse depends on the workflow. push to one and cherry-picking to the other is fine. So is merging to both
07:34 AciD` ok
07:34 jast if the two versions are not too dissimilar, it's convenient to merge/commit to the branch with the older/more stable version, and then merge that into the newer/less stable branch
07:34 AciD` any advantages over the other?
07:35 PasiFist joined #git
07:35 jast but generally it doesn't matter much and basically do whatever you prefer
07:35 AciD` jast -> why is that?
07:35 sns joined #git
07:35 Xarodon joined #git
07:35 cyberz joined #git
07:35 jast well, merging always takes all the changes so you get a free guarantee that all hotfixes in the maintenance version end up in the newer branch
07:36 jast plus you don't have to copy commit IDs around or anything
07:36 AciD` ah ok
07:36 jast it's a matter of taste, though
07:36 nikow joined #git
07:36 AciD` on the other hand,the two versions used to get really far apart (usually 100+ commits) so I'm not sure this would be possible
07:36 lordjancso joined #git
07:37 jast that's why you should do what works ;)
07:37 AciD` I'm trying to change the release cycle to have more releases, and incidently less commit difference
07:37 star_pro_ joined #git
07:37 AciD` ok good, thank you guys for your advices
07:38 jaalto joined #git
07:39 ihradek joined #git
07:40 sharkz joined #git
07:40 qlkzy joined #git
07:42 jaalto I have private REPO. I'd like to HARD RESET it to a commit (to expunge certain blobs). If I then FORCE PUSH, will it overwrite exiting repo "as it" ... i.e. without the blobs I'd like to get rid of?
07:43 jaalto None others use that repo
07:45 bschindler joined #git
07:45 bschindler Hi - is there a way to remove stale submodule entries from .git/config in an automated fashion?
07:46 bschindler We have the issue that we changed submodule configuration and jenkins uses .git config to list submodules (which one can argue is wrong). If there is an old submodule entry in there, it will fail
07:49 djb-irc joined #git
07:50 nyo joined #git
07:52 Alienpruts joined #git
07:53 zeroed joined #git
07:53 zeroed joined #git
07:54 solenodic joined #git
07:55 moritz bschindler: you could always delete and reclone the repo
07:55 govg joined #git
07:56 _ikke_ meh
07:56 _ikke_ Thath's kind of overkill
07:57 lmat joined #git
07:58 JeroenT joined #git
08:02 JeroenT_ joined #git
08:02 jnavila joined #git
08:03 Charliechin joined #git
08:05 s2013 joined #git
08:07 Oatmeal joined #git
08:07 djb-irc joined #git
08:13 ResidentBiscuit joined #git
08:16 bschindler moritz: that is quite overkill to facilitate the removal of 2 lines in the git config...
08:16 bschindler but yeah, it is a solution
08:17 Hudu joined #git
08:21 moritz jaalto: yes, that works
08:22 solenodic joined #git
08:25 steven joined #git
08:26 Tobbi joined #git
08:27 hrkpbo joined #git
08:34 jknetl joined #git
08:35 s17 when I do `git branch -r` it is showing origin/test and I no longer want that.  How to remove?
08:36 osse s17: git fetch --prune origin; is it still there?
08:36 sarri joined #git
08:36 sarri joined #git
08:36 s17 x [deleted]         (none)     -> origin/test
08:36 s17 cheers
08:36 osse \o/
08:40 Snugglebash joined #git
08:41 elect joined #git
08:42 Darcidride joined #git
08:42 Balliad joined #git
08:43 rchavik joined #git
08:45 govg joined #git
08:45 sharkz joined #git
08:46 Singmyr joined #git
08:49 jsolano joined #git
08:50 troulouliou_div2 joined #git
08:55 aard_ joined #git
08:56 biertie joined #git
08:56 biertie joined #git
08:56 msonntag joined #git
08:57 maret joined #git
08:57 JeroenT joined #git
08:59 seni joined #git
09:00 acetakwas joined #git
09:00 masuberu joined #git
09:02 zefferno joined #git
09:03 ocbtec joined #git
09:05 theoceaniscool joined #git
09:07 ayogi joined #git
09:07 mehola joined #git
09:08 Cabanossi joined #git
09:08 yaewa joined #git
09:10 Atm0spher1c joined #git
09:11 nyo joined #git
09:12 Takumo joined #git
09:12 Takumo joined #git
09:12 xall joined #git
09:15 marcogmonteiro joined #git
09:15 nostrora joined #git
09:16 e joined #git
09:17 solenodic joined #git
09:18 flaviodesousa joined #git
09:19 nahra joined #git
09:20 King_Hual joined #git
09:22 JeroenT joined #git
09:22 a_thakur joined #git
09:23 courrier joined #git
09:24 TomyWork joined #git
09:24 Murii joined #git
09:26 qt-x joined #git
09:29 Tobbi joined #git
09:29 clmsy joined #git
09:33 thebinary joined #git
09:35 mikecmpbll joined #git
09:36 PHPanos joined #git
09:37 theoceaniscool joined #git
09:38 Cabanossi joined #git
09:39 darkbit joined #git
09:39 seni joined #git
09:39 Felishia joined #git
09:41 nahra joined #git
09:42 jsolano_ joined #git
09:45 pur3eval joined #git
09:47 MineCoins joined #git
09:48 oaao joined #git
09:48 sharkz joined #git
09:48 oaao joined #git
09:48 jsolano joined #git
09:50 donught joined #git
09:55 msonntag joined #git
09:56 manuelschneid3r joined #git
09:59 jsolano_ joined #git
10:02 arand_ joined #git
10:02 ferr1 joined #git
10:04 rnsanchez joined #git
10:04 jsolano joined #git
10:04 arand_ Is there any way to also show all merges when limiting git-log by path?
10:06 theoceaniscool joined #git
10:06 redeemed joined #git
10:07 tirej joined #git
10:08 tirej joined #git
10:14 mSSM joined #git
10:15 Serpent7776 joined #git
10:15 nahra joined #git
10:15 chll_ joined #git
10:22 ayogi joined #git
10:23 achadwick joined #git
10:23 Cabanossi joined #git
10:24 King_Hual` joined #git
10:24 JeroenT joined #git
10:24 tsdev joined #git
10:29 jbitdrop joined #git
10:31 marcogmonteiro joined #git
10:34 govg joined #git
10:37 nettoweb joined #git
10:38 tvw joined #git
10:40 cyphase_eviltwin joined #git
10:43 nettoweb1 joined #git
10:44 solenodic joined #git
10:45 acetakwas joined #git
10:46 netj joined #git
10:49 afuentes joined #git
10:51 navidr joined #git
10:51 algun joined #git
10:52 sobczyk joined #git
10:52 YuGiOhJCJ joined #git
10:52 sobczyk how does the git submodule update --reference work with multiple submodules?
10:53 algun Hi, with this as my .gitignore file: https://raw.githubusercontent.com/conceptdev/xamarin-forms-samples/master/.gitignore I'm doing "git rm --cached -r .
10:53 algun ", but it excludes the .gitignore file itself. I don't see why. Adding !.gitignore does not help. Can you?
10:54 Snugglebash joined #git
10:54 Snugglebash joined #git
10:57 algun nvm, i think i just forgot to subsequently git add .
10:58 Naan joined #git
10:59 jast sobczyk: from what I can tell, it's passed to any 'clone' commands being run by 'submodule update'
11:00 sobczyk so it's pretty pointless considering most submodules will be different repositories
11:01 mischat joined #git
11:01 sdx23 left #git
11:03 jast sobczyk: I believe you can pass multiple --reference options. they'll be passed to all of the clone processes, but that shouldn't typically make a practical difference
11:04 jast after looking a little more, the internal helper supports multiple --reference options but it seems like the 'git submodule' frontend does not
11:05 ShalokShalom_ joined #git
11:06 freimatz3 joined #git
11:07 FreakySneaky joined #git
11:08 durham joined #git
11:09 seni joined #git
11:10 cdown_ joined #git
11:13 ayogi joined #git
11:20 alewrb joined #git
11:23 Cabanossi joined #git
11:30 dsdeiz joined #git
11:30 dsdeiz joined #git
11:32 synthmeat joined #git
11:33 synthmeat joined #git
11:35 Snugglebash joined #git
11:37 Hudu joined #git
11:38 JeroenT joined #git
11:39 algun Is there any way to remove currently .gitignored files from the entire repo history (or at least branch history)?
11:40 Oatmeal joined #git
11:40 tobiasvl algun: the entire history? !sensitive
11:40 gitinfo algun: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
11:41 tobiasvl algun: this will obviously !rewrite_history
11:41 Darcidride joined #git
11:41 tobiasvl algun: I'll try again. it will !rewrite history
11:41 gitinfo algun: 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
11:44 algun tobiasvl, the prob is that entire history is downloaded with clone
11:45 algun only two devs so far, so i think we can manage
11:45 durre joined #git
11:47 algun tobiasvl, but my question was how to (automatically) rewrite history according to the current .gitignore
11:50 dumacdev joined #git
11:51 tobiasvl algun: I don't know, maybe something like this: git filter-branch --index-filter 'git rm --cached `git ls-files -i --exclude-from=.gitignore`' HEAD
11:51 tobiasvl although that'll probably use the .gitignore at each commit, not the current one
11:52 osse git ls-files -i --exclude-from=.gitignore > /tmp/list; git filter-branch --index-filter 'xargs git rm --cached < /tmp/list'
11:52 osse boom
11:52 osse shakalaka
11:52 ertesx joined #git
11:52 algun right, thanks for the hint though
11:52 algun @ tobiasvl
11:53 algun osse, cool cool
11:53 tobiasvl yeah that solves that problem
11:53 Oatmeal joined #git
11:54 osse also --ignore-unmatch
11:54 omniwolf hi.  i have a branch (called beta) I want to copy over the top of another branch "Legacy-testing" such that beta and legacy-testing are the same.  after some googling, it seems this command should do it: "git push origin +beta:legacy-testing"  will this do it for me?
11:55 omniwolf assuming yes, would this be the right set of commands:  "git checkout beta" -> "git pull" -> "git push origin +beta:legacy-testing"  ?
11:55 Darcidride joined #git
11:55 Kaisyu joined #git
11:57 de-vri-es joined #git
11:57 osse omniwolf: the push will update origin/legacy-testing, not the branch in your local repo
11:57 nfk joined #git
11:58 omniwolf that's fine, i don't care about my local repo.  so the end result will be that the remote github.com legacy-testing branch will be the same (identical) as the beta branch?
11:58 tirej joined #git
11:59 tirej joined #git
11:59 osse it will be idential to your local beta branch, which might be different from origin/beta
11:59 omniwolf and i assume that i can just do a "git checkout legacy-testing" -> "git pull" and it will update my local repo to be the same as the new remote repo?
11:59 osse no
11:59 omniwolf but if i do the git pull on the beta branch, then my local beta repo will be the same as the remote repo beta?
11:59 ThomasLocke_ joined #git
11:59 ThomasLocke_ joined #git
12:00 osse maybe.depends if you have local commits
12:00 omniwolf i thought a git pull would overwrite any local commits?
12:00 osse it will not. it will merge
12:01 omniwolf oh right.
12:01 algun osse, thanks
12:01 omniwolf ok, let's assume i have no local commits on beta - i have pushed them all
12:01 omniwolf so my local beta is the same as the remote beta branch
12:01 PHPanos joined #git
12:01 osse then you might as well do 'git checkout legacy-testing; git reset --hard beta; git push --force'
12:02 JeroenT joined #git
12:02 omniwolf ok, is that better than the command above "git push origin +beta:legacy-testing" ?
12:04 osse omniwolf: the push will not update the local branch legacy-testing.
12:04 msonntag joined #git
12:04 omniwolf is that a problem?  can't i just do a 'git checkout legacy-testing; git pull' afterwards?
12:04 osse no
12:05 osse +omniwolf | i thought a git pull would overwrite any local commits?
12:05 osse osse | it will not. it will merge
12:05 osse +omniwolf | oh right.
12:05 freimatz3 joined #git
12:05 omniwolf ah.  ok ok
12:06 omniwolf but doing the reset and force push (heh) will force local and remote of legacy-testing to be the same as the remote (and local) beta ?
12:06 osse you can do your push, then git checkout legacy-testing; git reset --hard origin/legacy-testing
12:06 osse yes'
12:06 seni joined #git
12:07 omniwolf ok, tricky stuff.  glad i checked.  will try now, thanks!
12:08 omniwolf it appears to have worked.  thanks again for your help!
12:09 mehola joined #git
12:09 osse omniwolf: btw:  git push origin  +foo:bar   is the same as  git push --force foo:bar
12:11 omniwolf ok, which does what?  pushes the local foo and completely overwrites the remote bar?
12:11 osse well, both of those
12:12 omniwolf sorry both of what?
12:14 omniwolf also, "git reset --hard beta" - does this pull the remote beta?  or does it reset the currently checked out branch with the local copy of beta?
12:15 rorro joined #git
12:15 Oatmeal joined #git
12:18 yanik joined #git
12:20 nettoweb joined #git
12:22 Mikerhinos joined #git
12:22 kettlewell joined #git
12:23 kettlewell joined #git
12:23 Tobbi joined #git
12:24 osse omniwolf: both of those push local foo and completely overwrite the remote bar
12:25 osse I was just pointing out that using --force and + is the same
12:25 osse omniwolf: it does the latter
12:28 yanik joined #git
12:33 omniwolf ok local copy thanks
12:33 Stique joined #git
12:35 Stique Hello! With a colleague, we're starting a new project for an internal use of our company.  This project will be composed by a client side written with AngularJS and a REST written in JAVA.
12:36 Stique We would like to split each part in 2 differents git repo
12:36 PHPanos joined #git
12:37 Stique I'm now trying to think how to deploy these systems in production with docker.  Each repository will have it's own dockerfile.
12:37 Cabanossi joined #git
12:38 cdown_ joined #git
12:39 Stique My question is: To simplify the deployment, is the following practice a good one: I would like to create one more repository, composed of 2 submodules only and some scripts to make the deployment easier
12:40 MarioBranco joined #git
12:41 Celelibi Can I choose to not track some remote branches?
12:42 jknetl joined #git
12:43 Celelibi Like the remote HEAD or other branches that are supposed to be local-only.
12:43 naquad joined #git
12:43 naquad hi
12:43 osse Celelibi: I think you have to explicitly track the ones you want. There's no blacklisting, only whitelsiting
12:44 Celelibi It's ok, I only want to track master currently.
12:44 naquad i've got my branch X and branch Y where branch X was merged, but later was overriden by further commits. i want to apply branch X changes to branch Y again. how do i do that?
12:44 Celelibi How do I do this?
12:44 osse Celelibi: git config remote.origin.fetch '+refs/heads/master:refs/heads/master
12:44 osse oops
12:45 osse Celelibi: git config remote.origin.fetch '+refs/heads/master:refs/remotes/origin/master'
12:45 Celelibi And what if I want several of them?
12:45 osse git config --add remote.origin.fetch ''+refs/heads/foo:refs/remotes/origin/foo'
12:46 osse oops, double ' there.
12:47 glados1 joined #git
12:47 Celelibi Nice, thanks.
12:48 Celelibi However, it looks like old refs are not pruned.
12:49 Snugglebash joined #git
12:50 Snugglebash joined #git
12:50 glados1 left #git
12:50 Celelibi haha, removing a remote only remove the refs for the tracked branches.
12:51 msonntag joined #git
12:51 osse you could delete all of them and re-fetch
12:51 Celelibi So changing which branches are tracked should be done before fetching for the first time.
12:53 xall joined #git
12:53 Celelibi I guess there is no non-fetchable or non-pushable branch, right?
12:54 PinkPonyOfDeath joined #git
12:54 PinkPonyOfDeath hello. i am trying to find an acceptable workflow for a webproject with just a dev-server and the live-system. i cannot use a local machine here. i would still like to use git, is it even feasible?
12:55 _ikke_ Sure, just don't use git for deployment, and there should be no problem
12:55 robattila256 joined #git
12:56 skunkz joined #git
12:56 PinkPonyOfDeath _ikke_: do you mean i should just use git locally?
12:56 _ikke_ git is for versioning your project history
12:56 sdothum joined #git
12:56 _ikke_ So, yeah, that's basically what I mean
12:57 PinkPonyOfDeath _ikke_: well i would have liked to use it for collaboration as well, since others will work on that project as well
12:57 _ikke_ right, that too
12:57 canuk joined #git
12:59 osse PinkPonyOfDeath: not sure what you're asking. why would it be different than any other project?
12:59 ojdo joined #git
13:01 MrCircuitMatt left #git
13:01 PinkPonyOfDeath osse: because i cannot find a workflow that actually makes sense to me. because everyone would use the same development server...
13:01 nettoweb1 joined #git
13:02 PinkPonyOfDeath so if one is checking ot a branch, everyone else will be on that branch as well
13:02 osse PinkPonyOfDeath: Do people have their own user and home directory and stuff?
13:02 PinkPonyOfDeath s/ot/out
13:02 synthroid joined #git
13:02 PinkPonyOfDeath osse: no, unfortunately
13:02 digidog joined #git
13:02 durre joined #git
13:04 PinkPonyOfDeath at the momenten everyone is using the same ftp and it is pure chaos...i would love to change that but am limited by the server, over which i do not have much control
13:06 mischat_ joined #git
13:06 osse PinkPonyOfDeath: sounds like an bad development environment no matter what version control you're using. Git can't do much to fix that
13:07 osse People can develop on their own computers and then copy files manually. At least it won't be worse.
13:07 DaveTaboola joined #git
13:08 PinkPonyOfDeath osse: i know. but i was hoping someone could point me to an awesome workflow just made for that scenario...one never knows
13:08 PinkPonyOfDeath thank you anyways
13:09 lss8 joined #git
13:09 hvxgr joined #git
13:09 osse I think the demand for a godo workflow in that scenario is pretty low, thus little supply :p
13:11 PinkPonyOfDeath yeah, that's what i figured. maybe i can convince them to upgrade their machines so they can run vagrant or docker, then we could try feature branches or centalized workflow
13:11 osse you can have as many feature branches or workflows as you like. it sounds to me like the problem there is only one place to test your code?
13:12 osse or, what's the difference between the dev-server and the live-system?
13:12 PinkPonyOfDeath osse: but with vagrant or docker they could test the code locally
13:12 osse sure
13:12 dave0x6d joined #git
13:13 PinkPonyOfDeath that is the whole delemma
13:14 Snugglebash joined #git
13:14 PinkPonyOfDeath at the moment everyone is developing on the dev server.
13:14 osse ok, just speaking past eachother
13:15 osse are they literally running their text editors and writing code on the server?
13:15 PinkPonyOfDeath no
13:15 PinkPonyOfDeath my mistake...should have been more clear, sry
13:15 PinkPonyOfDeath the write on their pcs
13:15 PinkPonyOfDeath upload with ftp
13:16 PinkPonyOfDeath to testserver
13:16 Snugglebash joined #git
13:16 PinkPonyOfDeath but they all use the same testserver
13:16 Celelibi So each one overwrite what others uploaded?
13:17 PinkPonyOfDeath Celelibi: not all the time...but it is know to have happened in the past
13:17 PinkPonyOfDeath s/know/known
13:17 osse PinkPonyOfDeath: they can still use git, and have feature branches, and all that.
13:17 _ikke_ Not having separate development environments sounds insane
13:17 osse at least you can do *something* to improve the situation
13:17 feodaron joined #git
13:18 tirej joined #git
13:18 Celelibi How many dev are we talking abour?
13:19 PinkPonyOfDeath osse: i do not see how...having them on the server makes no sense, since git checkout will check that branch out for everyone...having them locally means they cannot test them
13:19 PinkPonyOfDeath Celelibi: 2-3
13:19 _ikke_ PinkPonyOfDeath: git should not be involved there at all
13:19 osse PinkPonyOfDeath: No, I mean sue git locally, but transfer files to FTP as before
13:19 _ikke_ PinkPonyOfDeath: My workflow is that I have git locally, and sync files to a dev server
13:20 PinkPonyOfDeath so the only feasible solution would indeed be to use local or at least otherwise separated dev environments, right?
13:20 robattila256 joined #git
13:20 _ikke_ correct
13:21 Snugglebash joined #git
13:21 PinkPonyOfDeath _ikke_: that is what i suspected
13:21 PinkPonyOfDeath thank u all for the help
13:21 osse don't let perfect be the enemy of good here
13:21 osse nothing is stopping you from using git in a somewhat proper way
13:22 Snugglebash joined #git
13:22 Cabanossi joined #git
13:23 PinkPonyOfDeath i will see if i can manage to convince the right people to either get some new hardware (wich would be overdue anyways) or at least get separeted test-environments
13:23 Snugglebash joined #git
13:23 tvw joined #git
13:23 PinkPonyOfDeath if nothing works i will use the variant osse recommended
13:24 Celelibi Or let devs test locally in a VM or something.
13:24 Ryanar joined #git
13:24 Celelibi You might also have a continuous integration platform.
13:25 PinkPonyOfDeath Celelibi: hence the new hardware. so they can run a VM
13:25 Celelibi Something that would fetch and test every new commit.
13:25 Celelibi is their dev computers that weak?
13:25 jbitdrop joined #git
13:25 PinkPonyOfDeath yes.
13:25 Celelibi Ok.
13:26 PinkPonyOfDeath i tried running vagrant there once
13:27 jknetl joined #git
13:27 blackwind_123 joined #git
13:28 Celelibi Docker might also be an alternative depending on your application.
13:28 Celelibi It can help isolate people's tests from each other.
13:29 seni joined #git
13:29 noecc joined #git
13:29 PinkPonyOfDeath Celelibi: but docker need a vm on winows as well (at least for our usecases, since the servers run linux)
13:30 Celelibi wut?
13:30 unbalanced joined #git
13:31 Celelibi docker runs on Linux.
13:31 PinkPonyOfDeath Celelibi: well docker just containerizes application, but still needs the kernel of the underlying os.
13:31 PinkPonyOfDeath yes
13:31 PinkPonyOfDeath i know
13:31 PinkPonyOfDeath but they run windows on their machines
13:31 PinkPonyOfDeath i phrased that wrong i guess
13:32 Celelibi Ah, yes. But I was thinking about running docker on the test server.
13:32 PinkPonyOfDeath the server does not support that
13:32 PinkPonyOfDeath at least the hoster wont allow it
13:32 leeN joined #git
13:32 Celelibi erf, ok.
13:32 jeffreylevesque joined #git
13:32 PinkPonyOfDeath i've checked that already
13:33 PinkPonyOfDeath i was thinking of renting a docker hoster for that purpose
13:33 Celelibi ok
13:33 JeroenT joined #git
13:33 al-damiri joined #git
13:33 JeroenT joined #git
13:34 ShalokShalom joined #git
13:36 manuelschneid3r joined #git
13:37 tirej joined #git
13:40 Cavallari joined #git
13:41 tvw joined #git
13:48 joelsmith joined #git
13:48 shampine joined #git
13:53 diogenese joined #git
13:55 andrew710 joined #git
13:56 todd_dsm joined #git
13:57 nostrora joined #git
14:00 robertsmall joined #git
14:03 ShalokShalom joined #git
14:04 sylario joined #git
14:04 mischat joined #git
14:07 nettoweb joined #git
14:10 _geoff joined #git
14:11 PioneerAxon joined #git
14:12 jimi_ joined #git
14:13 tvw joined #git
14:14 lindenle joined #git
14:16 coinmac joined #git
14:16 mischat joined #git
14:16 Hudu joined #git
14:16 GodGinrai joined #git
14:17 gajus joined #git
14:17 GodGinrai joined #git
14:17 waaf joined #git
14:17 Gsham joined #git
14:17 Endarked joined #git
14:19 mp4 joined #git
14:22 Cabanossi joined #git
14:23 codelike joined #git
14:24 tirej joined #git
14:25 ikelso joined #git
14:26 e14 joined #git
14:27 tlaxkit joined #git
14:27 troulouliou_div2 hi with git  log --grep '' ; is it possible to get the id of the next commit ?
14:28 osse troulouliou_div2: as in the parent commit of whatever git log matched?
14:28 grawity you can go backwards but not forwards
14:29 troulouliou_div2 i m doing git log -all --grep 'BLAH' and i m getting one commit
14:29 troulouliou_div2 i would like to know the previous one to diff with
14:29 osse troulouliou_div2: you can simply do  commit~1
14:29 osse troulouliou_div2: you can also add -p to git log
14:29 ecuanaso joined #git
14:30 troulouliou_div2 osse, ok didn't know the first shortcut thanks
14:30 tirej joined #git
14:30 troulouliou_div2 osse, any syntax for the opposit ; the next one ?
14:30 osse no
14:30 troulouliou_div2 ok
14:33 durre joined #git
14:34 codelike joined #git
14:36 bill99 joined #git
14:37 griffindy joined #git
14:38 seni joined #git
14:41 durham joined #git
14:42 ShekharReddy joined #git
14:42 ispn joined #git
14:42 Hink joined #git
14:42 l2dy joined #git
14:43 avar joined #git
14:43 avar joined #git
14:45 bill99 joined #git
14:45 coinmac left #git
14:46 Bizkit joined #git
14:48 djb-irc joined #git
14:49 Bucciarati joined #git
14:49 m4sk1n joined #git
14:50 JJMcPhearson joined #git
14:52 bill99 joined #git
14:53 AaronMT joined #git
14:54 e14 joined #git
14:56 nettoweb joined #git
14:59 kpease_ joined #git
15:00 Ascathon| joined #git
15:01 _geoff_ joined #git
15:02 solenodic joined #git
15:04 Hudu joined #git
15:06 bill99 joined #git
15:07 djb-irc joined #git
15:12 gargola joined #git
15:13 tirej_ joined #git
15:14 cdg_ joined #git
15:15 nickabbey joined #git
15:16 msonntag joined #git
15:17 reynierpm joined #git
15:17 troulouliou_div2 joined #git
15:18 Lunatrius` joined #git
15:19 reynierpm I am dealing with a problem with line endings since my team has developers working on *nix, Mac and "Guindows" so I did found .gitattributes file but I have a doubt: for php, css, html, js files would be enough something like: `text eol=lf`??
15:19 selckin you don't want any options
15:20 reynierpm selckin, why?
15:20 selckin they are not needed and cause more harm then they help
15:20 hussam joined #git
15:20 reynierpm selckin, and what's the right way?
15:20 reynierpm when files comes to the repo from Windows they come as CLRF :-\
15:21 selckin not using editors made in 1960 that change the line ending or don't udnerstand both?
15:21 selckin so why does that matter?
15:21 reynierpm selckin, I can't establish what other developers wants to use, there ate a lot from India using Notepad++ and of course not setting up properly
15:22 coderdecoder01 joined #git
15:22 selckin notepad++ works fine, it understands both and keep the line ending it is in when opened
15:23 reynierpm selckin, well I am not sure that's true at all since I have created files with LF in Linux and then later when they work on those files change the line endings to CLRF
15:25 peeps[lappy] joined #git
15:27 snowkidind joined #git
15:27 UTAN_dev_ joined #git
15:28 finalbeta joined #git
15:29 eduardas_m joined #git
15:31 eduardas_m joined #git
15:32 freimatz3 joined #git
15:33 Sleepy63 joined #git
15:33 netj joined #git
15:33 noecc left #git
15:34 stickperson joined #git
15:35 Lunatrius joined #git
15:35 theoceaniscool joined #git
15:35 Oatmeal joined #git
15:38 Cabanossi joined #git
15:39 gugah joined #git
15:39 Gsham joined #git
15:41 durham joined #git
15:43 Hudu joined #git
15:43 gaaag joined #git
15:46 finalbeta joined #git
15:47 s2013 joined #git
15:47 Ejlx joined #git
15:50 jast reynierpm: normally you just set 'text'. the developer's Git client then uses the native line endings when checking out files, and normalizes them when checking in.
15:50 jast the 'eol' attribute does *not* affect what the files look like in the Git metadata/history
15:51 jast all your example means is that, for instance, Git on Windows will generate UNIX-style line endings in the working tree which usually isn't what you want on Windows
15:52 rivarun joined #git
15:52 reynierpm jast, ummmm what I want is to change the line endings to be LF always on the repository not matter if the developer change it because it's in Guindows
15:53 jast exactly, and you don't need eol=lf for that
15:53 jast text alone already does that
15:53 jast unless you've got a strange client, and then 'eol=lf' won't help you, either
15:53 reynierpm jast, ok so you said keep the .gitattributes file but remove the eol-lf, that's correct?
15:53 jast yes
15:54 reynierpm jast, gotcha
15:54 raijin joined #git
15:54 jast whenever normalization is active, files will be checked in with LF as line endings, no matter what else you set
15:54 Hudu joined #git
15:55 reynierpm jast, ya that's what I want
15:55 jast so if you don't have a very good reason (e.g. Windows batch files which should always be checked *out* with CRLF, i.e. eol=crlf), simply don't set anything else :)
15:55 skunkz joined #git
15:56 HardlySeen joined #git
15:56 invisbl joined #git
15:56 YuGiOhJCJ joined #git
15:57 Darcidride joined #git
15:59 coderdecoder01 left #git
16:00 valar joined #git
16:05 mischat joined #git
16:05 cdg joined #git
16:06 Murii joined #git
16:07 eindoofus joined #git
16:08 cdg_ joined #git
16:08 mischat joined #git
16:08 eindoofus does anyone know if bitbucket allows for collaborating on a private repo? or does that require a private subscription?
16:10 _ikke_ It does with a maximum of 5 users per repo
16:10 mehola joined #git
16:11 eindoofus thanks ikke
16:11 JenkinsNoob__ joined #git
16:12 cdg joined #git
16:12 Atemu joined #git
16:12 JenkinsNoob__ Hello. I just set up Jenkins for a HelloWorld using Java and JSP and Tomcat and Github. I've got it so that source files are being updated after they're committed to Git, but the JSP files aren't being updated. What gives?
16:12 tcorneli joined #git
16:13 Samual joined #git
16:13 jagob joined #git
16:13 moritz JenkinsNoob__: sounds like a Jenkins question more than a git question
16:14 d10n-work joined #git
16:14 moritz JenkinsNoob__: if you do have a question about git, !repro applies
16:14 gitinfo JenkinsNoob__: [!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
16:15 cdg__ joined #git
16:16 Gsham joined #git
16:16 col joined #git
16:17 ash_workz joined #git
16:17 mischat joined #git
16:18 d1z joined #git
16:18 blackwind_123 joined #git
16:19 sobersabre joined #git
16:19 Derperperd joined #git
16:21 tvw joined #git
16:22 inflames joined #git
16:23 Cabanossi joined #git
16:23 brent__ joined #git
16:23 gugah joined #git
16:23 col joined #git
16:24 CheckDavid joined #git
16:24 digidog joined #git
16:25 mischat joined #git
16:26 finalbeta joined #git
16:26 LeBlaaanc joined #git
16:27 sobersabre joined #git
16:27 freimatz3 joined #git
16:28 djb-irc joined #git
16:29 sobersabre joined #git
16:30 a_thakur joined #git
16:31 nickabbey joined #git
16:31 MarioBranco_2 joined #git
16:32 shinnya joined #git
16:32 digidog joined #git
16:32 johnny56 joined #git
16:34 HardlySeen joined #git
16:35 sobersabre_ joined #git
16:36 ocbtec joined #git
16:37 col joined #git
16:37 finalbeta joined #git
16:38 nowhereman joined #git
16:39 Hudu joined #git
16:40 jfran joined #git
16:41 e14 joined #git
16:42 Gsham joined #git
16:45 svm_invictvs joined #git
16:46 Singmyr joined #git
16:46 d^sh_ joined #git
16:47 jwest joined #git
16:47 djb-irc joined #git
16:47 synthroid joined #git
16:48 thebinary joined #git
16:50 mischat joined #git
16:50 col joined #git
16:51 seni joined #git
16:52 EisNerd joined #git
16:53 madewokherd joined #git
16:53 Snugglebash joined #git
16:54 theoceaniscool joined #git
16:55 ddavidd I updated my .gitignore but when I try to run 'git rm -r --cached' it give me the git rm usage info. What am I doing wrong?
16:55 freimatz3 joined #git
16:56 valar joined #git
16:57 cymen joined #git
16:57 cymen why can I pull with unstaged changes but not pull --rebase?
16:57 ihradek joined #git
16:58 ToxicFrog cymen: rebase may require it to touch more files
17:00 shgysk8zer0_ joined #git
17:01 chardan joined #git
17:01 shgysk8zer0_ joined #git
17:02 ddavidd I'm trying to remove git cache files, here's my terminal: https://www.pastery.net/uegvce/
17:02 cymen oh hi toxicfrog!
17:02 cymen why would rebasing require touching more files?
17:02 ToxicFrog ddavidd: that doesn't do what you think it does
17:03 ToxicFrog "git rm --cached <paths>" means "remove those paths from the index but not the working copy"
17:03 ToxicFrog But you need to tell it what files to remove!
17:03 ozmage joined #git
17:03 EisNerd_ joined #git
17:04 ToxicFrog cymen: conceptually, it works by rolling back to the divergence point, fast-forwarding the fetched changes, and then cherry-picking your changes back onto the top
17:04 ToxicFrog This means it needs to touch every file you modified since you diverged
17:04 ToxicFrog Even if those modifications were committed.
17:04 ToxicFrog A merge, meanwhile, only needs to touch files modified in the changes being merged.
17:04 cymen hm...
17:04 nickabbey joined #git
17:05 cymen so essentially a stash and stash pop will always work I just have to do it manually?
17:05 ddavidd ToxicFrog: So I added .idea/* to my .gitignore, but git is still tracking that directory.
17:05 ToxicFrog cymen: not necessarily always; you might be fetching new changes that conflict with the stash. But that's the way to do it.
17:05 ToxicFrog (and if there are conflicts, 'git stash pop' will leave the conflicted changes there for you to resolve)
17:05 ToxicFrog ddavidd: so 'git rm --cached -r .idea'
17:05 cymen yeah, makes perfect sense
17:05 emg joined #git
17:06 ToxicFrog Like I said, you need to tell it what files you want it to remove from the index.
17:06 ToxicFrog And .gitignore doesn't apply to files that are already tracked (== in the index)
17:06 ddavidd Thanks ToxicFrog.
17:06 durre joined #git
17:06 emg joined #git
17:07 cymen Yeah, thanks ToxicFrog. :)
17:08 Es0teric joined #git
17:08 Hudu joined #git
17:08 Xe joined #git
17:08 jstimm joined #git
17:08 imachuchu joined #git
17:09 EisNerd joined #git
17:09 jfran joined #git
17:11 kadoban joined #git
17:13 SwiftMatt joined #git
17:14 EisNerd joined #git
17:14 nickabbey joined #git
17:15 Murii joined #git
17:15 mischat joined #git
17:19 LBV_User joined #git
17:20 Snugglebash joined #git
17:21 durham joined #git
17:21 ResidentBiscuit joined #git
17:23 dreiss joined #git
17:26 jimi_ joined #git
17:27 Darren_ joined #git
17:27 raspado joined #git
17:28 crayon joined #git
17:28 crayon joined #git
17:29 Starky joined #git
17:29 hotsteamingrules joined #git
17:30 MuffinMedic joined #git
17:32 pihpah joined #git
17:32 Darcidride joined #git
17:34 emg joined #git
17:34 pihpah I accidently added a super large file to git, and made few commits. Now I can't push even though that file is deleted. How can I fix that?
17:35 canton7 pihpah, follow !fixup, or use the !bfg
17:35 gitinfo pihpah: 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!
17:35 gitinfo pihpah: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
17:39 freimatz3 joined #git
17:40 jknetl joined #git
17:43 Gsham joined #git
17:44 atomi joined #git
17:44 stickperson joined #git
17:45 shinnya joined #git
17:47 Kulrak joined #git
17:47 Kulrak joined #git
17:47 publio joined #git
17:47 lindenle joined #git
17:48 peepsalot joined #git
17:50 jccn joined #git
17:51 svm_invictvs joined #git
17:54 Es0teric joined #git
17:54 mischat joined #git
17:54 Gsham joined #git
17:55 Doginal joined #git
17:56 Es0teric joined #git
17:58 rivarun joined #git
17:59 finalbeta joined #git
18:02 rwb joined #git
18:02 nickabbey joined #git
18:03 durre joined #git
18:07 thiago joined #git
18:08 Cabanossi joined #git
18:11 tang^ joined #git
18:12 mehola joined #git
18:13 valar joined #git
18:15 xall joined #git
18:16 noecc joined #git
18:16 boombatower joined #git
18:19 robotroll joined #git
18:19 shubhnik joined #git
18:20 solenodic joined #git
18:21 spacelord_ joined #git
18:21 adino joined #git
18:24 Duder9999 joined #git
18:25 tyreld joined #git
18:25 SwiftMatt joined #git
18:25 cdown joined #git
18:28 mSSM joined #git
18:29 cdown_ joined #git
18:30 ResidentBiscuit joined #git
18:32 jstimm joined #git
18:32 Gsham joined #git
18:33 matoro joined #git
18:34 spacelord_ joined #git
18:37 durre joined #git
18:38 ecuanaso joined #git
18:40 cdown_ joined #git
18:41 robotroll joined #git
18:41 Bizkit joined #git
18:43 cdown joined #git
18:43 Es0teric joined #git
18:43 jimi_ joined #git
18:44 btree joined #git
18:44 Gsham joined #git
18:45 robotroll joined #git
18:45 hahuang65 joined #git
18:45 xall joined #git
18:45 duderonomy joined #git
18:45 flavius joined #git
18:46 nowhereman joined #git
18:46 TomyLobo joined #git
18:46 gguuyy joined #git
18:47 d5sx43 joined #git
18:48 gguuyy hello
18:48 gitinfo gguuyy: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
18:48 gguuyy Hi, I would really appreciate if anyone can help me with using git on windows and folder compare + beyond compare
18:50 gguuyy I configured difftool to work with beyond compare and basically it works fine but i cannot add new files or delete file from within the beyond folder compare (i.e) on side has files the other does not) of course when compare to workspace
18:51 solenodic joined #git
18:51 adino joined #git
18:53 KV joined #git
18:53 Noldorin joined #git
18:54 mda1_ joined #git
18:56 gguuyy anyone???
18:56 col joined #git
18:57 TobyP joined #git
18:57 Limes joined #git
18:57 perlpilot gguuyy: sorry, I don't do windows
18:58 gguuyy Thanks (at least i know someone seems my message :)) do you know if what i am asking does work on linux?
18:59 azerus joined #git
18:59 nowhereman joined #git
18:59 perlpilot nope.  never used "beyond compare" either.
18:59 btree left #git
19:00 Es0teric joined #git
19:01 Ankhers joined #git
19:02 nickabbey joined #git
19:02 matoro joined #git
19:03 gguuyy ok thanks
19:03 gguuyy anyone here is familiar with git for windows?
19:05 robertsmall joined #git
19:05 Gsham joined #git
19:06 xall_ joined #git
19:06 jstimm joined #git
19:07 ToBeCloud joined #git
19:08 Abbott left #git
19:10 sborza joined #git
19:11 valize joined #git
19:11 ShalokShalom_ joined #git
19:12 canuk_ joined #git
19:13 netj joined #git
19:15 frostythesnowman joined #git
19:16 JJMcPhearson joined #git
19:17 hwrdprkns joined #git
19:19 crose joined #git
19:20 cjohnson linux does comparison using diff
19:21 madewokherd` joined #git
19:21 cjohnson diff -r to compare two dirs
19:21 canuk joined #git
19:21 nowhereman joined #git
19:22 nickabbey joined #git
19:22 nyo joined #git
19:22 yohnnyjoe joined #git
19:23 cliluw joined #git
19:25 urgkc joined #git
19:25 Balliad joined #git
19:28 Mikerhinos joined #git
19:30 kyan joined #git
19:30 canuk_ joined #git
19:30 Gsham joined #git
19:30 Bizkit joined #git
19:31 valar joined #git
19:31 fahadash joined #git
19:32 s2013 joined #git
19:32 nowhereman joined #git
19:33 King_Hual_ joined #git
19:33 canuk joined #git
19:34 stickperson joined #git
19:35 jfr joined #git
19:38 snowkidind joined #git
19:39 emg joined #git
19:40 ecuanaso joined #git
19:40 jstimm joined #git
19:41 _rht joined #git
19:41 Rodya_ joined #git
19:42 Sasazuka joined #git
19:42 spacelord_ joined #git
19:43 nowhereman joined #git
19:45 freimatz3 joined #git
19:47 UTAN_dev joined #git
19:48 temhaa joined #git
19:48 temhaa hell
19:48 temhaa *hello
19:48 temhaa Can I ask some question about git flow in here?
19:48 overlord_tm joined #git
19:49 doener joined #git
19:50 trevor1 joined #git
19:50 johnny56 joined #git
19:51 kadoban We're not picky
19:52 rorro joined #git
19:52 zeroed joined #git
19:52 zeroed joined #git
19:53 cdg joined #git
19:53 trevor1 hello. in the output of `git diff` there's a sha1 hash prefix of the original and changed file that looks like `index a3513a6..5932ab9`. is there a way to configure the length of this prefix, say from 7 characters to 10?
19:53 _ikke_ workflow questions are on-topic
19:54 ShalokShalom joined #git
19:54 _ikke_ (though, little of us are actually using the plugin)
19:54 cdg_ joined #git
19:54 _ikke_ trevor1: git config (--global) core.abbrev 10
19:54 _ikke_ (that does affect more commands though
19:55 trevor1 aha, thanks _ikke_
19:56 jccn joined #git
19:56 Es0teric joined #git
19:57 Impaloo joined #git
19:57 Balliad joined #git
19:58 duderonomy joined #git
19:58 nedbat trevor1: do you need more characters?
19:59 hyrr joined #git
20:03 CheckDavid joined #git
20:03 finalbeta joined #git
20:04 dwmw2_gone joined #git
20:06 Jqiz joined #git
20:08 trevor1 nedbat: not exactly, i am just trying to keep the output consistent with some previously generated diffs (used as patches for a debian package)
20:08 e14 joined #git
20:08 stickperson joined #git
20:09 trevor1 so i don't overwrite 20 files with slightly different ones for no particular reason
20:09 durre joined #git
20:09 xall_ joined #git
20:09 jsolano joined #git
20:10 _ikke_ You can do git -c core.abbrev=10 diff ..
20:12 aidalgol joined #git
20:13 WayToDoor joined #git
20:13 jstimm joined #git
20:13 ozmage joined #git
20:13 red82 joined #git
20:14 red82 hi git experts.  I’ve read a bunch of answers on the web, but I’m not sure how current the advice I’m reading is.  Is there a downside to storing mysqldumps in git?
20:14 nickabbey joined #git
20:16 mischat joined #git
20:17 osse red82: how big are they? do they compress well?
20:17 red82 400k uncompressed, no blobs, so should compress fine
20:18 osse red82: go for it.
20:18 osse red82: if you start noticing problems, then stop.
20:18 red82 the answers I’ve seen on SO talk about disk space, but I’m not sure if those are valid concerns given that S3 is like $0.03 GB / mo thse days
20:18 osse I suppose diff won't be so useful though. but git lets you define a custom diff logic
20:18 finalbeta joined #git
20:19 osse red82: it can also make git a bit slow. and consider that each clone is a full copy of the history, not just the latest version
20:19 osse but disk usage in and of itself I agree is no big deal
20:20 red82 osse: agreed re: clone, but I’m not using git as daiily backups, we’re a web shop so I’m just backing up milestone deliveries.  client will have own backup process in place
20:20 temhaa I have develop, release and master branchs. I merging from feature branchs to develop, from develop to release and from release to master. I pushed come commits to develop. But I need to create  hotfix from one of the these commits.
20:20 temhaa I mean I need to merge one of commits which in develop to release and master. I know there is solution with cherry-pick but I wonder. is it good or not. will something be crash or not? Or should I develop again for master, and should I merge with release and develop again, which one is clear?
20:20 rmbeer joined #git
20:20 nowhereman joined #git
20:21 rmbeer not have the web http://git-scm.com/ ?
20:21 rmbeer !git
20:21 Gsham joined #git
20:22 osse red82: best advice I can give is to just try it and see. sounds like it won't be an issue for quite a while in any case
20:22 osse red82: it's like the reverse of "if it hurts, don't do it"
20:22 red82 :D
20:22 red82 thanks for the input.  going to give it a whirl and see what happens
20:22 rmbeer i need view the documentations of git
20:22 rmbeer but not have the web
20:23 kpease joined #git
20:23 osse rmbeer: you can run this in the terminal: man git-log, man git-diff etc.
20:23 gitinfo rmbeer: the git-log manpage is available at http://jk.gs/git-log.html
20:23 gitinfo rmbeer: the git-diff manpage is available at http://jk.gs/git-diff.html
20:23 cdg joined #git
20:24 rmbeer gitinfo, sure. thank.
20:24 rmbeer left #git
20:25 evie_hammond joined #git
20:26 osse red82: but ehh, a "backup shop"? I don't know exactly what that is, but git isn't really a backup tool
20:27 cdg_ joined #git
20:27 red82 osse: yeah, thats’s what Im saying, its not beign used as backups, but rather for deliverable milestones.  im just trying to decide if I should include the mysqldump with the code in the repo or stick it elsewhere.
20:28 osse I see, I think
20:29 m0viefreak joined #git
20:29 tvw joined #git
20:31 GavinMagnus joined #git
20:32 jnavila joined #git
20:32 trevor1 exit
20:34 wget joined #git
20:34 wget joined #git
20:38 vuoto joined #git
20:38 temhaa I need your help, actually I need your advice
20:39 cdg joined #git
20:40 osse temhaa: i'm not good with enterprisey workflows, but cherry-picking is nice
20:40 osse things shouldn't crash
20:41 BSaboia joined #git
20:41 Kqwhn9 joined #git
20:41 MattMaker joined #git
20:41 temhaa osse: Can I say like that: as long as I dont face conflict problem I can use cherrypick in this situation.
20:42 cdg__ joined #git
20:42 adino joined #git
20:44 jstimm joined #git
20:44 osse temhaa: i'd say even if you face conflicts...
20:44 osse since it's *one* commit I'll claim it's definitely the best tool for the job
20:45 Es0teric joined #git
20:48 temhaa osse: you can image that I'm afraid. Because develop is very ahead of master. And I want to put just one commit to develop because I dont want to  lose the commit history
20:49 temhaa osse: but I will try nice tools of git : )
20:50 temhaa **s/put just one commit to develop/put just one commit to master from develop
20:50 umbSublime joined #git
20:51 cjohnson git is smart about cherry picking commits
20:51 cjohnson when you go to merge the branch that you picked from, it will skip over the cherry picked change
20:52 cjohnson it won't cause a conflict unless the deviated history somehow impacted the cherry picked commit in some special way
20:52 cjohnson I never have conflicts from cherry picks
20:52 Vlada joined #git
20:52 Vlada left #git
20:54 temhaa cjohnson: osse I got it. thank you so much
20:54 Gsham joined #git
20:55 Renter hmm
20:55 Renter I have a bunch of unpushed commits and I kinda want to group them together
20:55 stickperson joined #git
20:56 Renter I'm wondering if I should git branch <name> and push --set-origin=origin/<name> or something
20:58 Renter or is there another way?
20:59 crayon joined #git
20:59 jstimm joined #git
21:02 freimatz3 joined #git
21:05 osse Renter: are you saying you want to move the commits to a new branch
21:05 osse ?
21:05 rmbeer joined #git
21:05 rmbeer hello
21:06 rmbeer i make a error of create a branch from other branch, if i want move this new branch to master, i need use 'git rebase master'?
21:06 aw1 joined #git
21:07 Renter osse: yes
21:07 rmbeer amh, nothing say...
21:08 osse Renter: git branch <name> is fine. but after that you should reset the current branch back to where you started, then do git checkout <name>
21:08 osse Renter: https://raw.githubusercontent.com/Osse/git-stuff/master/git-reset-explanation.txt
21:08 osse Renter: the upstream stuff you can take care of at first push with -u
21:08 Renter then cherry-pick the commits from my local master?
21:08 rmbeer can use the 'git merge new-branch' from master, but hope not have problem with branch in the middles
21:08 osse Renter: no, not needed.
21:08 mns joined #git
21:09 solenodic joined #git
21:09 Renter ah, I want reset --hard as well ?
21:10 Renter or just reset ?
21:10 umbSublime joined #git
21:10 umbSublime joined #git
21:11 osse Renter: doesn't really matter as long as everything is committed
21:11 str joined #git
21:11 nickabbey joined #git
21:11 valar joined #git
21:11 _28_ria joined #git
21:12 hwrdprkns joined #git
21:13 moei joined #git
21:13 dsdeiz joined #git
21:13 dsdeiz joined #git
21:14 GavinMagnus joined #git
21:15 Renter osse: ah, you meant 'current branch' the one the original commits were in
21:15 jstimm joined #git
21:15 Renter I branched and reset in the branch, that wiped out all of my commits :P
21:15 Renter thankfully I backed up first
21:15 rmbeer left #git
21:16 osse Renter: as long as you branched first, nothing is wiped
21:16 TomyLobo there's always the reflog
21:16 osse Renter: what exactly did you do?
21:16 Noldorin joined #git
21:17 Renter git branch <newbranch>; git reset <commit>; git reset --hard <commit> --> commit branch and new branch lost all new commits
21:17 jccn joined #git
21:17 TomyLobo that's not possible
21:18 Es0teric joined #git
21:18 TomyLobo git reset only affects the current branch
21:18 osse Renter: well it's not what I said. but <newbranch> should still have all your commits
21:18 osse just like intended
21:18 cdg joined #git
21:19 Renter oh nvm, checked history and turns out I typoed git branch master instead of git checkout
21:19 Renter after reset
21:19 Renter tl;dr don't do that
21:19 TomyLobo well, dont do that with -f
21:19 TomyLobo should be harmless without that
21:19 Renter wasn't here?
21:22 freimatz joined #git
21:23 Renter git branch <name>; git reset <start commit>; git checkout <name>; git reset --hard <commit>; git branch master; git checkout master
21:23 Renter that's the full list (excluding status/ls/git log)
21:23 Renter that indeed wiped out the commits in both master and <name>
21:24 Gsham joined #git
21:24 osse you reset both branch
21:24 osse Booo
21:26 Renter doesn't git branch <newbranch> switch me over to that branch?
21:26 osse no
21:26 om_henners joined #git
21:26 Renter ah ok
21:26 Renter that explains it
21:26 ecuanaso joined #git
21:26 todd_dsm joined #git
21:26 osse but if you thought it did, why did you run git checkout <name> after ? :p
21:27 FrostCandy joined #git
21:27 Renter no idea
21:27 GavinMagnus left #git
21:27 osse i know that feeling
21:27 farnerup joined #git
21:27 Renter the guy with git in the xkcd comic? that's me
21:27 toydestroyer_ joined #git
21:28 Renter just starting to figure out things
21:28 Es0teric joined #git
21:29 GodGinrai joined #git
21:31 cdg_ joined #git
21:32 dzho heh
21:32 dzho https://xkcd.com/1597/ <-- for shared reference
21:32 dzho (there have been others, but I'm guessing that's the one)
21:32 GodGinrai joined #git
21:33 courrier joined #git
21:33 bill99 joined #git
21:34 alzagros joined #git
21:34 alzagros is git pull, or git merge FETCH_HEAD known to be expensive when merging like 70,000 files?
21:34 alzagros total 47.41 mega bytes
21:35 thebishop joined #git
21:35 cdg joined #git
21:36 farnerup close
21:36 farnerup left #git
21:36 kpease joined #git
21:38 grayjoc joined #git
21:40 spacelord_ joined #git
21:41 kpease_ joined #git
21:41 Es0teric joined #git
21:44 cdg_ joined #git
21:44 Gsham joined #git
21:44 Electrometro joined #git
21:45 masuberu joined #git
21:46 NaStYdoG joined #git
21:47 jstimm joined #git
21:47 grayjoc joined #git
21:47 Sasazuka joined #git
21:50 jbitdrop joined #git
21:51 kpease joined #git
21:52 Rodya_ joined #git
21:52 WifiBrain joined #git
21:57 hwrdprkns joined #git
21:58 ibrahemgebri joined #git
21:58 ibrahemgebri joined #git
22:00 Rodya_ joined #git
22:00 nd_ joined #git
22:02 tvw joined #git
22:03 Es0teric joined #git
22:03 hwrdprkns joined #git
22:04 bill99 joined #git
22:06 blackwind_123 joined #git
22:06 NwS joined #git
22:06 adino joined #git
22:07 theoceaniscool joined #git
22:11 oskarkv joined #git
22:13 Es0teric joined #git
22:13 mehola joined #git
22:13 temhaa left #git
22:14 canuk joined #git
22:15 peterpp joined #git
22:16 nickabbey joined #git
22:16 MattMaker joined #git
22:17 Flaghacker joined #git
22:18 the_cybersphinx left #git
22:20 trip joined #git
22:21 Flaghacker I'm getting the error "fatal: The upstream branch of your current branch does not match
22:21 Flaghacker the name of your current branch.", even though I'm fairly certain the names are in fact the same. I feel like the local "travis" branch in wrongly connected to the remove "master" branch or something, this is the full error message: (https://gist.github.com/flaghacker/d7a5b54c0d4457869f8f10517c8eba1e) Is there something I'm doing wrong?
22:22 rangergord joined #git
22:22 rangergord Hi
22:24 cdg joined #git
22:24 davidfetter_ge joined #git
22:24 davidfetter_ge hi
22:24 jeffreylevesque joined #git
22:25 davidfetter_ge i'm trying to squash a flock of commits together, but git rebase -i is reversing the order 'git log' shows
22:25 davidfetter_ge what might i have done to cause this, and how do i fix it?
22:26 ozmage joined #git
22:26 rangergord Let's say a repo grew to 1GB, then someone deleted everything in it except a 1KB file. If someone then checks it out with --depth=1, do they only download about 1KB (plus negligeable git overhead)? Or will they get 1GB anyway?
22:27 ecuanaso joined #git
22:27 rangergord deleted via "git rm", not fancy space-saving and history-destroying stuff
22:27 digidog joined #git
22:28 jccn joined #git
22:28 Random832 davidfetter_ge, that's normal, git log shows [more or less] most recent at the top, git rebase -i shows them in the order they will be applied
22:29 davidfetter_ge ah
22:29 davidfetter_ge so why isn't "git rebase -i" allowing me to squash the first one it shows?
22:30 Gsham joined #git
22:30 jstimm joined #git
22:31 Random832 ...because you have to be squashing it onto something
22:31 Random832 what's the full git rebase -i command you are using
22:31 grayjoc joined #git
22:31 umpc joined #git
22:33 cdg_ joined #git
22:33 ozmage joined #git
22:35 davidfetter_ge git rebase -i HEAD~8
22:35 davidfetter_ge 5 of those commits' entire messages are wip
22:36 cr34ton joined #git
22:38 causasui joined #git
22:38 Random832 ok
22:38 Random832 and what you want to do is squash all of those onto HEAD~9?
22:38 causasui joined #git
22:38 davidfetter_ge right
22:38 * Random832 waits for him to get it
22:39 * davidfetter_ge may be a little slow
22:39 Random832 I said, and what you want to do is squash all of those onto **HEAD~9**
22:39 Random832 like it's just the nature of how rebase -i works, it won't let you mess with something you can't see
22:40 davidfetter_ge so basically i want to turn HEAD~9 into HEAD~2
22:40 davidfetter_ge ah
22:40 Random832 what i'm saying is git rebase -i HEAD~9
22:40 Random832 git doesn't let you make your first one a squash onto something else because your rebase script has got to end up describing a whole commit and not half a commit that gets squashed onto something else that's not on the list
22:40 BSAlb joined #git
22:41 davidfetter_ge got it. thanks for your patience
22:43 Bass10 joined #git
22:45 BSaboia joined #git
22:47 rwb joined #git
22:48 dave0x6d joined #git
22:53 peterpp what actually happens when I have a remote repository foo with a branch bar and I do `git checkout foo/bar`?
22:54 peterpp someone told me I'm not supposed to do this, but it seems to work fine
22:54 ikelso joined #git
22:54 Flaghacker I'm getting the error "fatal: The upstream branch of your current branch does not match the name of your current branch.", even though I'm fairly certain the names are in fact the same. I feel like the local "travis" branch in wrongly connected to the remove "master" branch or something, this is the full error message: (https://gist.github.com/flaghacker/d7a5b54c0d4457869f8f10517c8eba1e) Is there something I'm
22:54 Flaghacker doing wrong?
22:54 Random832 peterpp, you're in detached head mode. if you make commits on top of that, they'll get "lost" if you check out something else.
22:55 kadoban peterpp: You check it out, not much interesting otherwise. There's nothing wrong with doing that. You usually shouldn't *commit* after doing that though, without starting a local branch anyway.
22:57 peterpp kadoban, Random832, thanks for your answers! in the past always did `git push foo HEAD:bar`, is there anything wrong with this?
22:57 peterpp *I
22:57 Random832 peterpp, you're probably fine but it's an unusual way of doing things. Why not make a remote tracking branch?
22:58 noecc left #git
22:58 kadoban peterpp: It's pretty easy to screw up I guess, using local branches should be less typing in general and less error-prone.
22:58 peterpp ok, I guess I just have no idea how to use git properly
22:59 jraccoon joined #git
22:59 peterpp it worked and so I kept doing it like this until I talked to someone else today
22:59 kadoban peterpp: Usually for every remote branch that you actually wont to ... contribute to I suppose, you make a local branch. Almost always with the same name.
22:59 peterpp who became totally alarmed and thought I had messed up the repository
23:00 peterpp in my case I have several remote repositories, though, and they have branches with the same names
23:01 fmeerkoetter joined #git
23:01 kadoban Doesn't really sound like a problem, when you have several remotes there's usually some system to them, which one(s) you actually ever modify, which you get changes from, etc.
23:02 raijin joined #git
23:04 johnny56 joined #git
23:06 freeqaz joined #git
23:06 setuid left #git
23:06 blunaxela joined #git
23:06 druonysus_ joined #git
23:07 Imaginat_ joined #git
23:07 ShalokShalom joined #git
23:07 freeqaz Hey everybody. I'm looking for a way to prevent people from pushing a private repo to git. I see that this was once a Summer Of Code idea here http://git.661346.n2.nabble.com/Opinion-gathering-Git-remote-whitelist-blacklist-td7656924.html and https://git.github.io/SoC-2016-Ideas/
23:08 freeqaz I'm curious if there is a way to achieve a similar result to that. Prevent somebody from accidentally pushing a repo to Github, for example.
23:08 jccn joined #git
23:08 Imaginat_ joined #git
23:09 WayToDoor joined #git
23:11 peterpp kadoban, thanks, your response was really helpful!
23:11 peterpp responses
23:11 kadoban Anytime
23:12 jraccoon joined #git
23:13 Duder9999 joined #git
23:15 mSSM joined #git
23:19 freeqaz Alternatively, does anybody know of any ways to annotate a repo as private?
23:19 freeqaz Perhaps leveraging the init.templatedir, is my gut feeling.
23:19 MattMaker joined #git
23:19 rangergord Answering my own question from earlier: by checking out with --depth=1, you only download (network usage) the latest state of the repo, even if the repo had lots of baggage.
23:23 kyan joined #git
23:23 anuxivm joined #git
23:24 kyan Hi! How can I escape a path for adding it to .gitattributes, using Bash? Thanks!
23:24 atomi joined #git
23:24 Hink joined #git
23:25 krsr joined #git
23:27 streetwitch joined #git
23:27 streetwitch Could someone help me do a git checkout for the first time
23:27 streetwitch It tells me HEAD has changed, but the code is still the same
23:28 freeqaz @streetwitch Did you read the docs or look at examples via Google search? That's your best bet for a quick answer.
23:29 streetwitch Thanks, but I'm still trying to find something that works
23:29 matoro joined #git
23:31 freeqaz Could you paste some more context on the issue? I'm not quite sure what you're asking.
23:31 freeqaz Atlassian has some solid docs that might help, depending. https://www.atlassian.com/git/tutorials/resetting-checking-out-and-reverting
23:32 streetwitch_ joined #git
23:35 Eugene streetwitch - Have you used `git clone` to create a local repository?
23:35 streetwitch Yes
23:35 streetwitch I used git clone. :)
23:36 streetwitch But I can't figure out how to go back to a previous revision on github
23:36 streetwitch I need to undo several days of work
23:36 Eugene `git fetch` will download new code from the remote("origin") to your repo. `git merge` will incorporate it into your currently checkout-ed branch. `git rebase` is the same idea, but instead of creating a merge it puts all your local work "on the end". Use `git push` to send the result back up
23:36 Eugene !stash can be used to save your local changes temporarily
23:37 Eugene No? Thought we had a factoid for that. man git-stash then.
23:37 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
23:37 streetwitch what is remote("origin")?>
23:38 Eugene "origin" is the default name for a remote repository, and is set up as part of `git clone`
23:38 Cabanossi joined #git
23:38 streetwitch Ok, but I need an older version
23:38 krsr joined #git
23:38 msonntag joined #git
23:39 dsdeiz joined #git
23:39 dsdeiz joined #git
23:39 Eugene `git checkout $something` will check it out for you. `git checkout -b newbranch $something` will make you a new(local) branch you can use to make changes & commit back to the origin repo.
23:39 bernardio joined #git
23:40 streetwitch Hmm I will try
23:40 spacelord_ joined #git
23:41 streetwitch It says: Switched to a new branch 'mycode'
23:42 streetwitch How do I download that now into my directory?
23:42 freeqaz I'll repost my original Q. I'm looking for a way to prevent people from pushing a private repo to git. I see that this was once a Summer Of Code idea here http://git.661346.n2.nabble.com/Opinion-gathering-Git-remote-whitelist-blacklist-td7656924.html and https://git.github.io/SoC-2016-Ideas/
23:42 freeqaz I'm curious if there is a way to achieve a similar result to that. Prevent somebody from accidentally pushing a repo to Github, for example.
23:42 freeqaz @streetwitch: your code should be swapped to that branch now.
23:42 Eugene You already have it, right in front of you
23:42 Eugene If you just want to copy the files(eg, to somewhere else on your system?) then use `cp`
23:43 streetwitch cool!
23:43 Eugene If what you originally really wanted was something for a !deploy scenario, then maybe man git-archive is a good shortcut for next time
23:43 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
23:43 gitinfo the git-archive manpage is available at http://jk.gs/git-archive.html
23:44 kyan yesterday i was learning about alternate worktrees; I bet they could be used as a kludgy and pointless way to copy files XD
23:45 kyan (also, alternate worktrees is a really cool tool :D)
23:47 streetwitch Hey I'm trying to checkout to a different revision than the last one I did
23:47 streetwitch And I get a fatal error
23:47 streetwitch Cannot update paths and switch to branch 'newbranch' at the same time.
23:49 peterpp joined #git
23:49 Eugene !repro
23:49 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
23:49 Gsham joined #git
23:49 Eugene Are you trying to do something like only checking out one folder from a specific branch? Git doesn't do that
23:50 streetwitch No
23:50 streetwitch I'm deleting the directory and cloning it again
23:50 streetwitch that should be a long way to do it
23:52 nettoweb joined #git
23:54 bcc joined #git
23:54 bcc joined #git
23:55 tmg joined #git
23:55 jstimm joined #git
23:57 reznord joined #git
23:57 reznord I have 2 commits in my local repo and I want to push only one commit, how can I do it?
23:57 jccn joined #git
23:58 Eugene reznord - is it the first or second commit?
23:58 Eugene And do you want to keep the other one(locally)?
23:59 reznord Eugene: I want to push the 2nd commit and I want keep the 1st commit locally
23:59 streetwitch Eugene: I'm not getting any errors but it isn't updating my code
23:59 Eugene reznord - you'll need to make a separate branch, cherry-pick, and pus hthat.
23:59 govg joined #git

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