Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-22

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

All times shown according to UTC.

Time Nick Message
00:00 naught101 joined #git
00:02 jyjon joined #git
00:06 pur3eval joined #git
00:08 arescorpio joined #git
00:10 jyjon joined #git
00:14 madewokherd joined #git
00:16 l4v2 joined #git
00:17 zacts joined #git
00:22 GavinMagnus joined #git
00:22 tesuji_ joined #git
00:23 fission6 joined #git
00:25 jlebar cbreak, THank you!
00:27 GavinMagnus left #git
00:28 mingrammer joined #git
00:29 clemf joined #git
00:37 danslo_ joined #git
00:39 fahadash joined #git
00:41 citizen-stig joined #git
00:41 jimi_ joined #git
00:44 dreiss joined #git
00:44 cdg joined #git
00:45 drbean joined #git
00:46 watabou_ joined #git
00:47 devxom joined #git
00:52 sdothum joined #git
00:58 thiago joined #git
00:59 cqi joined #git
01:01 IWishIKnew joined #git
01:01 Hello71 joined #git
01:13 MattMaker joined #git
01:18 spudowiar joined #git
01:18 raijin joined #git
01:18 Goplat joined #git
01:21 mingrammer joined #git
01:22 fuchstronaut joined #git
01:26 lamba joined #git
01:27 lamba i think the answer is no, but when you do a git reset --hard using --git-dir, can you make the output also go to a dir that isn't the current one ?
01:27 lamba by output i mean files created.
01:27 Hello71 !deploy
01:27 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
01:28 MattMaker joined #git
01:29 ochorocho__ joined #git
01:30 constant joined #git
01:30 dhollinger joined #git
01:30 constant is there a way to refer to the root of the git repo when using git add?
01:31 constant i.e., "git add ^directory/from/root"
01:31 constant like subversion
01:32 zivester joined #git
01:33 jimi_ joined #git
01:35 djx joined #git
01:36 Sucks joined #git
01:38 Sucks joined #git
01:38 danslo_ joined #git
01:38 djx I'm working on 2 branches, B-A1 and B-A2. B-A2 has a commit after B-A1. I've amend the commit in B-A1. How can I replace previous commit in B-A2 with the new B-A1?
01:40 watabou_ joined #git
01:42 YottaByte joined #git
01:46 YottaByte hi y'all, new to git, when I'm in another branch, does git pull default to git pull origin <current_branch>?
01:46 YottaByte and what happens when I switch to a branch, does my code get changed to that branch's code and my things get stashed until I switch back to the other branch I was working in?
01:46 thiago YottaByte: !float
01:46 gitinfo YottaByte: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
01:46 l4v2 joined #git
01:47 HoierM joined #git
01:47 ome joined #git
01:50 ojacobson constant: :/
01:50 ojacobson eg. 'git add --all :/', which appears in my aliases as 'git this'
01:51 dsantiago joined #git
01:51 dhollinger joined #git
01:51 mehola joined #git
01:52 constant ojacobson: don't want all
01:52 constant I want to be able to copy from 'git status' and not have to be in the source root
01:52 constant something like (cd $(git rev-parse --show-toplevel) && git add file)
01:55 dhollinger joined #git
01:57 zacts joined #git
01:59 ojacobson :path/from/git/status iirc
02:01 dreiss joined #git
02:02 pks joined #git
02:06 zacts joined #git
02:07 hexagoxel joined #git
02:10 MattMaker joined #git
02:11 lindenle joined #git
02:12 Dougie187 joined #git
02:13 Orion3k joined #git
02:16 mingrammer joined #git
02:17 naf hi, i have a question about version control best practices
02:18 naf let's say i have a development team of a few people. and two people are simultaneously creating a new feature in their own respective branches based off master
02:18 naf both people finish their respective features, and one of them are merged with master
02:19 naf now the second feature branch has conflicts with master when trying to merge, of course
02:19 naf how can this be avoided? what are the general best practices for this kind of thing?
02:21 pizzaops You can't really avoid it with technology. You have to communicate about who's working on what.
02:22 pizzaops No magic solution unfortunately.
02:23 MTecknology organize the project so all features are loaded via a module system and no more overlapping new features!!
02:24 MTecknology pizzaops: you actually could sorta solve it with cvs...
02:24 pizzaops There's no magic automatic way to prevent two people from working on the same class, if you aren't communicating.
02:25 MTecknology no, but cvs would mean you never have merge issues
02:25 pizzaops How so?
02:25 MTecknology ... every dev would quit
02:25 durham joined #git
02:25 pizzaops Huh?
02:25 pizzaops oh crap
02:25 pizzaops I thought I was in a different channel ahahah
02:26 pizzaops I thought I was in #puppet
02:26 pizzaops and that you were asking about collaborating on puppet modules
02:26 * pizzaops sneaks away, red-faced.
02:27 MTecknology your answer is exactly the same, though
02:27 wethu joined #git
02:27 clemf joined #git
02:27 cqi joined #git
02:27 pizzaops Yes, you have to communicate with folks about what people are working on. . .
02:28 MTecknology My current contract has everyone doing a daily stand-up meeting
02:29 MTecknology in a typical stand-up, you just all stand around a table. Nobody is allowed to sit or talk when others are talking. No questions... you just say what you're doing and that's it.
02:29 MTecknology We do that... but via emal.
02:29 chachasmooth joined #git
02:29 naf alright, thanks for the advice...
02:29 livingstn joined #git
02:30 naf so if that's the case, and there is work on an overlapping file, should the two coders coordinate so that the second coder pulls the new master and then modifies the overlapping files to not have conflict?
02:30 MTecknology master?
02:30 MTecknology oh.. not saltstack
02:30 MTecknology pizzaops: now you have me doing it
02:30 pizzaops :P
02:31 MTecknology naf: frequent push/pull helps a lot
02:31 pizzaops I actually have no idea what you were disagreeing with me about or why you were telling me all devs would quit, for the record.
02:31 Gsham joined #git
02:31 MTecknology learing how to properly rebase is  *AMAZING*
02:32 pizzaops +1
02:32 naf alright, thanks for the advice guys.
02:33 MTecknology pizzaops: no magic solution.. using cvs, you stop having those problems, because you no longer have decent devs sticking around
02:33 MTecknology no people -> no editing -> no merge issues
02:33 ajf- joined #git
02:33 pizzaops ahahaha
02:33 Alenah joined #git
02:33 pizzaops I get it now. Hah.
02:33 pizzaops I didn't realize you were joking, I thought you were legit advocating for use of CVS
02:33 MTecknology HAHAHA!!!!!!!!
02:33 MTecknology LOLOLOL!!
02:34 MTecknology fucking drupal..
02:34 pizzaops and yeah if you use CVS with Puppet you'd get e verybody to quit because there's no tooling in the ecosystem to deploy puppet code from CVS :P
02:34 pizzaops no more employees, no more merge conflicts!
02:35 twb joined #git
02:36 twb I don't think this is a thing but...
02:36 MTecknology naf: Even when I'm just sitting around and working on a big project that has zero commits, at a minimum of 4x/day, I stash, pull, rebase. If there's a merge issue in there, you have a small set of changes.
02:36 twb When I rewrite a file, is there a way to tell git diff to just show the whole thing as a single before/after, instead of trying to break it up at the blank lines?
02:36 MattMaker joined #git
02:37 HedgeMage twb: I tell git to use an external diff utility (in my case, Meld) when it gets complicated enough that I want that.
02:37 MTecknology I seem to recall vimdiff being able to do something like that..
02:37 twb I've used meld before
02:37 twb That's overkill for my immediate use case
02:38 Gsham joined #git
02:38 jlebar Is there a way to ask filter-branch to filter everything in branch A that's not in branch B?
02:39 twb http://sprunge.us/MKjS?diff is the immediate user story.
02:39 danslo_ joined #git
02:39 twb It was actually worse a moment ago, but I commit --amended and lost it
02:39 * twb pokes at reflog
02:39 MTecknology Sweet cherry pie!
02:39 texinwien_ joined #git
02:40 twb Better example: http://sprunge.us/JaWN?diff
02:41 MTecknology that diff actually seems pretty easy to follow :P
02:41 MTecknology I'm not trying to debug anything, though
02:42 PioneerAxon joined #git
02:42 twb >shrug< it's not a big deal either way
02:42 snowkidind joined #git
02:43 citizen-stig joined #git
02:44 stantonk joined #git
02:46 sangy joined #git
02:46 Motoko joined #git
02:47 Orion3k joined #git
02:47 dreiss joined #git
02:48 Spicy_Lasagna joined #git
02:50 MTecknology twb: nice, simple, easy, not overkill - http://stackoverflow.com/questions/3713765/viewing-all-git-diffs-with-vimdiff
02:50 * MTecknology got distracted..
02:50 b_rare joined #git
02:51 twb Yeah but 1. you haven't said how to do it in vimdiff; and 2. I'm an emacs weenie so it doesn't matter :-)
02:51 constant ojacobson: oooh perfect - thanks!
02:51 twb That link seems to just describe how to tell git diff to use vimdiff at all
02:52 MTecknology except that I just gave you the link saying how to do it...
02:52 MTecknology oooh
02:52 MTecknology You've never used vimdiff?!?!
02:52 stantonk_ joined #git
02:52 twb I've used it a tiny tiny bit
02:53 MTecknology To just look at two whole files and see the differences between compared on a line-by-line basis... not sure anything better exists
02:54 MTecknology back in eventually!
02:55 twb Ah sorry I did not express myself very clearly
02:55 twb I can already look at a file side-by-side if I want manually choose to
02:55 stantonk joined #git
02:56 twb What I mean is that when looking at git log -p or git diff, if a particular file is detected as a rewrite with a high probability (e.g. "rewrite (92%)"), it should separate the -'s and +'s out for that one file, rather than interspersing them.
02:56 rpd MTecknology: try meld
02:56 twb BUT, it should still show the rest of the patch as normal
02:56 thiago twb: that's not how it works
02:57 twb thiago: fair enough
02:57 thiago oh, wait, rewrite
02:57 thiago I don't remember seeing the diff for that
02:57 thiago but the problem is that it needs to still be a valid diff
02:57 twb I'm pretty sure this is not a thing, but I figured I'd ask just in case
02:58 twb thiago: yeah I think I basically want to say that if it's a rewrite, not to consider blank lines as unchanged
02:58 twb thiago: if you look at http://sprunge.us/JaWN?diff  you can see it is "interspersing" them because the blank lines are breaking up the diff into smaller blocks
02:58 jfelchner joined #git
02:59 Rodya_ joined #git
03:00 thiago there's nothing about a rewrite in that diff
03:00 twb Lemme rerun with --stat -p
03:00 twb Hrm, no that doesn't show it either
03:00 twb git commit was saying it, I think...
03:01 thiago it's the rename detection
03:01 thiago but I'm not sure how useful the rewrite information is
03:01 twb OMG
03:01 twb -B[<n>][/<m>], --break-rewrites[=[<n>][/<m>]]
03:01 twb It's in the manpage and all
03:01 MattMaker joined #git
03:02 Alenah joined #git
03:03 twb That's PERFECT
03:03 star_pro_ joined #git
03:04 twb http://sprunge.us/UeeK?diff --- see, it affects the rewritten file but the regular minor-changed file looks normal
03:04 twb Now the only question is if/how to put this into my ~/.gitconfig
03:05 thiago interesting
03:06 mostlybadfly joined #git
03:08 twb Heh with -B it also adds a hint "dissimilarity index 91%"
03:13 rideh joined #git
03:20 k3rn31 joined #git
03:23 fuchstronaut joined #git
03:24 likewhoa joined #git
03:24 Alenah joined #git
03:24 HanClinto joined #git
03:25 stantonk joined #git
03:27 zacts joined #git
03:29 gfixler1 joined #git
03:30 noteness joined #git
03:30 ochorocho__ joined #git
03:31 elementalest joined #git
03:31 elementalest joined #git
03:31 sulky_ joined #git
03:34 Shentino joined #git
03:34 skasturi joined #git
03:39 danslo_ joined #git
03:41 msafi joined #git
03:43 msafi left #git
03:43 msafi joined #git
03:46 msafi Folks, in my open source project I have `master` as the default branch, and GitHub makes PR open against the default branch by default.
03:46 sulky_ joined #git
03:46 noteness joined #git
03:47 msafi I don't wanna merge contributions to the default branch, and I don't wanna hassle contributors about small changes in their branch or by asking them to submit against a different branch
03:48 jaguarmagenta joined #git
03:48 msafi If the PR is good (aside from minor modifications) I wanna be able to merge it and make those modifications myself in the develop branch and then merge develop to master
03:49 msafi Can you guys think of a strategy to workaround this GitHub limitation?
03:51 cyphase joined #git
03:52 rewt sounds more like a !github question
03:52 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
03:52 rewt is there no way to change the target branch on your end?
03:52 mehola joined #git
03:53 msafi rewt: not after the PR has been submitted
03:53 a_thakur joined #git
03:53 rewt can you make a patch out of it, and just apply that patch to your dev branch?
03:55 aseidl joined #git
03:55 msafi rewt: I don't GitHub would credit the contributor for the changes if I do something like that
03:56 fstd joined #git
03:57 Hello71 git remote add <> <>; git checkout <>; git merge --no-ff <>/<>
03:57 Hello71 or curl <>.patch | git am
03:58 noteness joined #git
03:59 stantonk joined #git
04:02 skasturi joined #git
04:02 sulky joined #git
04:02 b1tchcakes joined #git
04:03 msafi Okay, thanks for the suggestions!
04:04 k3rn31 joined #git
04:04 stonerfish1 joined #git
04:06 karstensrage_ joined #git
04:06 rchavik joined #git
04:07 aseidl joined #git
04:07 miklcct joined #git
04:07 elementalest joined #git
04:11 ahr3n joined #git
04:12 stantonk_ joined #git
04:13 tesuji joined #git
04:14 dreiss joined #git
04:15 StuartMI joined #git
04:16 Dougie187 left #git
04:18 phanimahesh joined #git
04:19 stantonk joined #git
04:22 lindenle joined #git
04:25 intellix joined #git
04:27 Rodya_ joined #git
04:27 Flava009 joined #git
04:27 mehola joined #git
04:29 shgysk8zer0 joined #git
04:31 crazyhorse18 joined #git
04:31 jungsubk joined #git
04:31 naught101 joined #git
04:32 citizen-stig joined #git
04:33 a_thakur joined #git
04:34 shgysk8zer0 joined #git
04:34 red^ joined #git
04:34 shgysk8zer0 joined #git
04:35 blackwind_123 joined #git
04:38 AndreSomers joined #git
04:40 Flava009 joined #git
04:40 danslo_ joined #git
04:46 foist joined #git
04:46 MutantMahesh joined #git
04:47 linuxmint joined #git
04:49 dreiss joined #git
04:50 subhojit777 joined #git
04:50 lindenle joined #git
04:54 Cabanossi joined #git
04:58 cyan__ joined #git
04:59 lordjancso joined #git
05:03 rscata joined #git
05:03 a_thakur joined #git
05:05 freimatz joined #git
05:06 MutantMahesh joined #git
05:08 MattMaker joined #git
05:09 redman joined #git
05:09 MattMaker joined #git
05:10 Literphor joined #git
05:13 xall_ joined #git
05:15 pwnz0r joined #git
05:16 dreiss joined #git
05:19 zacts joined #git
05:22 lindenle joined #git
05:23 emPi joined #git
05:23 MutantMahesh joined #git
05:24 fuchstronaut joined #git
05:24 MutantMahesh joined #git
05:25 dsdeiz joined #git
05:26 settermjd joined #git
05:28 pwnz0r joined #git
05:29 stantonk joined #git
05:30 tinanoo joined #git
05:30 lindenle joined #git
05:31 jokajak joined #git
05:32 MutantMa_ joined #git
05:33 ochorocho__ joined #git
05:36 ThomasLocke joined #git
05:36 ThomasLocke joined #git
05:36 zeroed joined #git
05:38 mehola joined #git
05:38 Mowgli joined #git
05:41 danslo_ joined #git
05:44 david007 joined #git
05:45 jceb joined #git
05:46 david007 joined #git
05:47 LeMike joined #git
05:47 aseidl joined #git
05:47 Alienpruts joined #git
05:52 Sucks joined #git
05:53 izabera i was on branch master, then switched to branch mybranch, made edits, committed multiple times, then merged all of it in master, then i kept working on it in master
05:53 izabera now i realize i made a royal mess and i need to move all those commits back to mybranch
05:54 izabera how do i do this?
05:54 qt-x joined #git
05:59 FuzzySockets joined #git
06:00 BrianBlaze420 joined #git
06:01 MutantMahesh joined #git
06:04 aseidl joined #git
06:06 watabou_ joined #git
06:07 Repox joined #git
06:07 thiago izabera: they are still in that branch
06:07 thiago izabera: do you want to remove them from master?
06:07 Thorn__ joined #git
06:07 t-mart_ joined #git
06:07 izabera yes
06:07 Limes__ joined #git
06:07 thiago let's check: have you pushed it to other repositories where other people may have got it?
06:07 thiago and be depending on it?
06:08 clemf joined #git
06:08 izabera no
06:08 izabera i pushed to a remote repo but nobody else can access it
06:08 thiago ok
06:08 thiago you'll need to force the push next time
06:09 izabera ok
06:09 thiago you can use git rebase -i, with a commit prior to all those commits
06:09 izabera force push is the best kind of push
06:12 zeroed joined #git
06:12 star_pr__ joined #git
06:13 cbreak that's what he said.
06:13 mwhooker joined #git
06:13 clemf joined #git
06:14 star_pr__ joined #git
06:16 testild joined #git
06:18 Drzacek joined #git
06:18 Drzacek Hello
06:18 Drzacek I'm trying to figure out some logical workflow with git
06:18 Drzacek I believe I learned all the basics, about staging, commiting etc
06:19 cqi joined #git
06:19 Drzacek I set up a repository (bare) on network share, cloned to my local disk. Then created local branch, because I don't want to work on master
06:20 freimatz joined #git
06:20 citizen-stig joined #git
06:20 Drzacek Checkouted to that new branch, did some changes, staged, commited. Then did rebase origin/master - if I understand correctly, that should update my local branch to current origin/master and apply my changes to it
06:21 Drzacek Now what should I do to put my changes to origin/master? Should I do merge with local master each time and then push origin master?
06:21 josh_ joined #git
06:22 Drzacek I thought that I do git push origin master   from within my local branch, but it says everything is up to date, yet my changes are not there
06:24 cbreak Drzacek: local master is not changed by you rebasing
06:25 cbreak only the current branch is
06:25 cbreak you have to go to master and merge, as you said above
06:25 cbreak consider merging with --no-ff, so that you force a merge commit
06:25 Drzacek won't that generate a lot of extra commits?
06:25 cbreak that's the point
06:25 cbreak if you don't want them, don't use --no-ff, but some do want them
06:25 D[4]ni joined #git
06:25 cbreak that way they can have ONLY merge commits on master
06:26 Drzacek what does the --no-ff?
06:27 Drzacek local master is not changed by rebasing, but my current local branch is, right?
06:27 shgysk8zer0 joined #git
06:33 dopesong joined #git
06:33 nilg joined #git
06:34 cyan__ joined #git
06:34 xall_ joined #git
06:35 watabou_ joined #git
06:35 justanotheruser joined #git
06:35 Drzacek Summarizing - Create remote repository, clone local, create local branch, work on project, stage-commit, rebase, local master merge, checkout to master, push origin/master?
06:38 dopesong joined #git
06:39 Alienpruts joined #git
06:39 Drzacek Damn, that still doesn't work
06:40 Drzacek I thought git was suppose to be easy to work with?
06:41 thiago no, git is known for not being easy
06:41 thiago commands are confusing
06:42 danslo_ joined #git
06:42 Drzacek Okay, I can live with that, just trying to establish some way to do things, then I'll be good
06:42 cbreak Drzacek: you got the idea
06:43 dopesong joined #git
06:43 cbreak but after rebasing your branch (why did you do that?), you have to switch to master and then merge your branch into master, if you want your branch in master
06:43 crazyhorse18 joined #git
06:43 cbreak merging always pulls other branches into your current branch
06:43 Drzacek Well, someone told me I should rebase instead of pull
06:43 cbreak most git commands act on the current branch only
06:43 cbreak sure, rebase has advantages
06:43 cbreak but if you want to merge into master, you don't have to do it
06:44 Drzacek I thought I could work on my local branch X and then from time to time, send changes direclty to origin/master
06:44 aseidl joined #git
06:45 MattMaker joined #git
06:45 cbreak Drzacek: you could
06:46 cbreak but that'd be rather bad
06:46 Drzacek Okay
06:46 cbreak you should work on master if you want to work on master
06:46 Drzacek Someone said I shouldn't work on master
06:46 citizen-stig joined #git
06:46 cbreak you seem to want to
06:46 star_pro_ joined #git
06:47 cbreak there are reasons not to work on master
06:47 Drzacek Well how else my changes will be visible for others?
06:47 cbreak but those reasons would also apply to working on some other branch that's not called master but effectively is master
06:47 Drzacek They must be pushed to remote/master
06:47 cbreak the name is not what matters
06:47 cbreak Drzacek: no
06:47 dopesong joined #git
06:47 cbreak you can push any branch you want
06:48 cbreak normally, people work on feature branches, and when the feature is done, those get merged into an other branch, maybe master
06:48 Drzacek Yes, I can, but eventually we would like all the branches to become one, right? We won't build 10 different versions of our software each time
06:48 cbreak but only when the feature is done
06:49 cbreak until then, feature branches are rebased on that branch, or that branch is merged into the feature branch
06:49 Drzacek Now that's the question of how often it will be merged to master
06:49 cbreak once
06:49 cbreak when the feature is done
06:49 Drzacek Our project is slighlty different, because we are not developing something new, only porting huge project to other platform
06:49 cbreak after that the branch often gets deleted, but usually it doesn't get any new commits
06:49 Drzacek So there are no "features", just pieces of code that has to be ported
06:51 cbreak each ticket in a scrum backlog is a feature. Each task in a kanban board is a feature
06:51 cbreak each bug can be a feature...
06:51 Drzacek Well, it may be logical to make disposable branches for each part, but we wanted to do it this way - create our local branches, where we would work on the code, then progressively push all our changes to the remote
06:51 cbreak normally it's something that can be developed, then tested, then integrated
06:51 cbreak Drzacek: then why bother with local branches?
06:52 JeremyOstine joined #git
06:52 cbreak each of you people has a local master
06:52 Drzacek So we don't corrupt the master?
06:52 Drzacek I guess I could work on local master, but I was told that this is some very bad thing to do
06:53 watabou_ joined #git
06:54 dopesong joined #git
06:54 cbreak Drzacek: you seem to want to do it
06:54 MattMaker joined #git
06:55 Drzacek I'm just looking for perfect solution for this project
06:55 DieguezZ joined #git
06:56 cbreak you should try something simple, and make it more complex if you need to
06:56 Drzacek So I will work on local master, but if at some point I will have some "feature" branch, I will 1) merge it to local master then push to origin/master or 2) push it to origin as new branch, and merge it with origin/master at some point someday?
06:57 apotry joined #git
06:57 cbreak Drzacek: both
06:58 cbreak you merge feature branches to master when they are ready for it
06:58 cbreak before that you do not.
06:58 dopesong joined #git
06:58 vuoto joined #git
06:58 cbreak after they are ready, and merged, they usually get abandoned
06:58 Drzacek ok
07:00 dopesong joined #git
07:01 danslo_ joined #git
07:01 djb-irc joined #git
07:03 AaronWild joined #git
07:03 Hounddog joined #git
07:03 dopesong joined #git
07:04 zeroed joined #git
07:04 texinwien_ joined #git
07:05 GavinMagnus joined #git
07:05 Kulrak joined #git
07:05 Kulrak joined #git
07:06 dopesong joined #git
07:09 StuartMI joined #git
07:09 e89c8c95a051 joined #git
07:10 skirk joined #git
07:13 TomyWork joined #git
07:13 dopesong joined #git
07:13 xall_ joined #git
07:13 GavinMagnus left #git
07:15 e89c8c95a050 joined #git
07:15 Macaveli joined #git
07:16 a_thakur joined #git
07:19 GavinMagnus joined #git
07:19 shgysk8zer0 joined #git
07:20 p4trix joined #git
07:20 zacts joined #git
07:20 dopesong joined #git
07:22 MattMaker joined #git
07:22 dopesong joined #git
07:23 styler2go joined #git
07:24 styler2go Hello. I have some problems. My master branch is far behind my beta branch. now i want to merge the beta into the master. The automerge fails at some files but it thinks it succeed. How can i disable that automerging?
07:24 fuchstronaut joined #git
07:25 ploop joined #git
07:25 moritz styler2go: why would you think it succeeds when it says it fails?
07:25 styler2go Well, it merges soem file but the file is wrong. But it does not tell me any merge conflict.
07:25 styler2go I have 9 files with merge conflicts but the file which is wrong does not contain any merge conflict where i could manually merge
07:26 moritz well, you can still do the manual merge
07:26 styler2go How can i do a fully manual merge?
07:27 moritz styler2go: just edit each file manually
07:27 moritz that's a fully manual merge
07:27 watabou_ joined #git
07:27 k3rn31 joined #git
07:27 styler2go Hmm... yeah you're right.. i can just do it without git at all
07:28 dopesong joined #git
07:30 Lomex joined #git
07:31 moritz styler2go: there are also other merge strategies, see "man git merge"
07:31 gitinfo styler2go: the git-merge manpage is available at http://jk.gs/git-merge.html
07:32 styler2go just to understand it better: "merge" in git is ALWAYS ment as an automated process, right?
07:32 moritz maybe the "octopus" or "resolve" strategy is more conversevative, and better suited for you
07:32 Drzacek I'm working now on local master branch. I have some changes, but origin/master has also some changes. If I call git pull now, will my local changes be lost?
07:32 moritz styler2go: it's meant to be semi-automatic
07:32 styler2go nice, thank you moritz :)
07:32 moritz Drzacek: no
07:32 moritz Drzacek: git tries very hard not to lose your data
07:33 Drzacek moritz, I know, but I managed once or twice to destroy some data :D
07:33 aseidl joined #git
07:33 dopesong joined #git
07:33 harish_ joined #git
07:33 moritz Drzacek: the safest thing to do is to commit before your pull
07:33 moritz (and then possibly git pull --rebase)
07:33 ochorocho__ joined #git
07:34 moritz once you have a commit, you'll be able to find it through the reflog for a few weeks
07:34 Drzacek Is that the same as git rebase?
07:34 moritz Drzacek: it's fetch + rebase
07:34 Drzacek so if I was doing git rebase, without pull/fetch first, I was doing nothing?
07:35 shgysk8zer0 joined #git
07:36 specious joined #git
07:36 shgysk8zer0 joined #git
07:37 dopesong joined #git
07:37 moritz depends on the state of your branches
07:38 ache1 joined #git
07:39 josuebrunel joined #git
07:39 dopesong joined #git
07:40 aseidl joined #git
07:40 josuebrunel joined #git
07:40 styler2go moritz, whats the default merge strategy?
07:40 styler2go ah, it seems to be recursive
07:41 lindenle joined #git
07:41 josuebrunel joined #git
07:42 josuebrunel joined #git
07:43 settermjd joined #git
07:44 netj joined #git
07:46 najjar joined #git
07:46 GavinMagnus joined #git
07:48 najjar joined #git
07:48 dopesong joined #git
07:48 King_Hual joined #git
07:49 cyan__ joined #git
07:49 jceb joined #git
07:50 star_pro_ joined #git
07:51 dopesong joined #git
07:52 multi_io joined #git
07:52 ramsub07 joined #git
07:53 crazyhorse18 joined #git
07:53 stantonk joined #git
07:53 specious_ joined #git
07:57 MattMaker joined #git
07:58 Drzacek does git gui has no conflict solver?
07:58 DieguezZ joined #git
07:58 bastelfreak1 joined #git
08:00 aseidl joined #git
08:01 StuartMI joined #git
08:04 mwhooker joined #git
08:05 aseidl joined #git
08:06 kurkale6ka joined #git
08:06 bongjovi joined #git
08:07 ws2k3 joined #git
08:10 watersoul_ joined #git
08:10 a_thakur joined #git
08:10 sobersabre_ joined #git
08:10 steadystatic_ joined #git
08:10 zeroed joined #git
08:11 synthmea1 joined #git
08:11 ahmedelgabri joined #git
08:11 joki joined #git
08:11 Drzacek I don't quite understand the merge thing. If I have two branches, master and local_branch, and I checkouted local_branch, made some changes - do I now git merge master, or checkout master and merge local_branch?
08:11 synthmea1 joined #git
08:12 ozzloy joined #git
08:12 ozzloy joined #git
08:12 leprechau joined #git
08:12 pasky joined #git
08:12 kenansulayman joined #git
08:12 yalu joined #git
08:12 loglaunch joined #git
08:12 Kuukunen joined #git
08:12 synthmeat joined #git
08:12 huhlig joined #git
08:12 noctux joined #git
08:12 snowinferno joined #git
08:12 thekingofbandit joined #git
08:13 HelloShitty joined #git
08:13 koro joined #git
08:13 ec\ joined #git
08:13 romerocesar joined #git
08:13 ozymandias_ joined #git
08:13 tapout joined #git
08:13 texinwien_ joined #git
08:13 justanotheruser joined #git
08:13 blackwell joined #git
08:13 Cabanossi joined #git
08:13 thoraxe joined #git
08:13 abh joined #git
08:13 fspy joined #git
08:13 pampeho joined #git
08:13 cxreg joined #git
08:13 jrahmy joined #git
08:13 Jordan_U joined #git
08:14 hfp_work joined #git
08:14 Manuel15 joined #git
08:14 Manuel15 joined #git
08:14 sysanthrope joined #git
08:14 justinmrkva joined #git
08:14 enleeten_ joined #git
08:14 CrazyBonz joined #git
08:14 grift joined #git
08:14 cloudcell__ joined #git
08:14 danslo_ left #git
08:14 Cathy joined #git
08:14 clmsy joined #git
08:14 dsantiago joined #git
08:14 danslo joined #git
08:14 danslo Drzacek: the latter
08:14 duotang joined #git
08:14 dopesong joined #git
08:14 Eryn_1983_FL joined #git
08:14 catbeard joined #git
08:15 Drzacek And what about conflict solving? I don't use any gui client, is it okay to just edit the file with nano and erase everything I don't want? Including all those git hash numbers
08:15 Drzacek ?
08:16 LeMike joined #git
08:16 antispaceman joined #git
08:16 skylite joined #git
08:17 M-meznak joined #git
08:18 acetakwas joined #git
08:18 dopesong_ joined #git
08:18 pigeon joined #git
08:18 danslo Drzacek: yeah, there are even ways to help you resolve conflicts. for example, you can do a   git checkout --ours/--theirs <filename> to completely use either one of the changesets.  there's also git mergetool
08:19 Drzacek git mergetool needs some 3rd party software
08:19 danslo (you may need something like vimdiff or some other difftool installed)
08:19 danslo yeah
08:19 Drzacek As long as it's not vim or vim* related
08:20 Drzacek It always takes me few minutes of crazy keyboard banging before I quit from vim
08:21 star_pro_ joined #git
08:22 Drzacek Is there some easier tool, more like nano?
08:23 wethu joined #git
08:23 netcarver joined #git
08:23 armyriad joined #git
08:23 troulouliou_div2 joined #git
08:24 danslo Drzacek: there are tons of diff tools, maybe kdiff3 is more up your alley
08:24 danslo or meld
08:24 Drzacek I'll look those up, thanks
08:24 troyt joined #git
08:24 moritz there's also meld
08:25 aseidl joined #git
08:25 irco joined #git
08:29 MattMaker joined #git
08:29 dopesong joined #git
08:30 gelei007 joined #git
08:30 AaronWild joined #git
08:31 mrkat joined #git
08:31 gelei007 hi,genius,i have got a problem,i was doing something wrong in my previous revison,
08:32 armyriad joined #git
08:32 sagerdearia joined #git
08:32 aseidl joined #git
08:33 dopesong joined #git
08:34 moritz gelei007: !sausage
08:34 gitinfo gelei007: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect
08:34 waveclaw joined #git
08:35 citizen-stig joined #git
08:36 gelei007 hi,genius,i have got a problem,i was doing something wrong in my previous revison,
08:36 gelei007 assume that i was in a A branch, current revison is 10,
08:36 gelei007 others in B,C,D....
08:36 gelei007 i delete some file in revison 5,
08:36 gelei007 how can i add the file back;
08:36 gelei007 <moritz>thanks
08:36 gelei007 <gitinfo>thanks
08:36 gitinfo gelei007: you're welcome, but please note that I'm a bot. I'm not programmed to care.
08:36 jeredepp joined #git
08:36 moritz maybe gitinfo *should* be programmed to care
08:37 MattMaker joined #git
08:37 jeredepp hi everyone, general question here: If i have a new codebase for a Project, do you prefer to open a new git repo or would you create a new branch?
08:39 Zarthus what do you mean with new codebase?
08:39 Zarthus is it an entirely new project? a new feature?
08:39 Zarthus an extra library that will be integrated?
08:39 aseidl joined #git
08:41 ruskie joined #git
08:44 encod3 joined #git
08:44 jeredepp Zarthus: It's a new Codebase, it was a Vanilla Project before, and now it uses a CMS Framework
08:45 jeredepp So there's not much common denominators
08:45 Zarthus i'd use a new repository, allows you to start from a clean beginning and it means you can more easily convert the older repository to "legacy"
08:46 dopesong joined #git
08:47 Drzacek moritz, what if he then cared too much?
08:47 armyriad joined #git
08:48 dopesong joined #git
08:49 aseidl joined #git
08:50 dopesong joined #git
08:50 notebox joined #git
08:52 notebox joined #git
08:52 yuhlw_ joined #git
08:52 dopesong joined #git
08:54 dopesong joined #git
08:55 naught101 joined #git
08:57 dopesong joined #git
08:58 Ediz joined #git
09:00 jceb joined #git
09:01 cyphase joined #git
09:01 rahtgaz joined #git
09:01 armyriad joined #git
09:02 leftriver16 joined #git
09:02 z8z joined #git
09:02 MattMaker joined #git
09:04 Drzacek git status tells me, that my current branch is up to date with origin/master. How does he know that, if he doesn't sync all the time?
09:04 zacts joined #git
09:04 Drzacek I guess he doesn't know, because I just did git pull and get few commits
09:05 Drzacek So git status is not to be trusted when it comes to remote repos?
09:05 Drzacek Is there a way to update status? Without pushing/pulling/fetching?
09:05 Drzacek Just to check if I'm up-to-date or not?
09:07 vuoto joined #git
09:09 AndreasLutro gir remote update
09:09 AndreasLutro git, not gir
09:11 ikmaak joined #git
09:11 Drzacek AndreasLutro, thanks
09:12 martinkl_ joined #git
09:12 armyriad joined #git
09:12 mischat joined #git
09:13 vuoto joined #git
09:13 dan2k3k4 joined #git
09:15 aseidl joined #git
09:16 e89c8c95a051 joined #git
09:17 najjar joined #git
09:20 wethu joined #git
09:20 vuoto joined #git
09:21 abhinav joined #git
09:21 abhinav hello
09:21 vuoto joined #git
09:21 abhinav whats a good open source git gui for linux?
09:21 abhinav easy to learn.
09:21 armyriad joined #git
09:22 ecraven emacs' magit :)
09:22 abhinav not emacs gui. the gui gui.
09:24 moritz Drzacek: if gitinfo cared too much, it'd be depressed. Just like Marvin in Hitchiker's Guid :-)
09:25 nivag abhinav, I find command line git easier - I have an OpenDocument file with notes on useful commands.  However, on most days I only use about 3 or 4, easy to remember.  Making notes on how to drive a GUI is painfull!
09:26 nivag moritz,  how are your diodes???
09:26 moritz nivag: pretty much one-way :-)
09:27 nivag Marvin's gave him pain on one side...
09:27 nivag DON'T PANIC!
09:27 Anticom joined #git
09:28 abhinav ok
09:28 jceb joined #git
09:28 Drzacek abhinav, I tried few of them clients, their only + is that they present you with nice graphical history, but the real work is actually very hard. Most of them have their own terminology, each words means something else - go with the console, use gui conflict tool and some graphical thing for displaying project history
09:28 * abhinav goes to learn magit
09:28 mariuscc joined #git
09:29 abhinav ok
09:29 MutantMahesh joined #git
09:30 abhinav Drzacek: nivag i just want it mainly to visiually keep track of files an line and commit. yesterday i commited wrong file due to wrong syntax for mv command.
09:30 dopesong joined #git
09:31 noidea joined #git
09:31 chachasmooth joined #git
09:31 * nivag is glad he doesn't have to modify source code by submitting punch cards!  GUI's have their place, I use them a lot - but for Real Work (TM), nothing beats the command line & bash scripts!
09:32 najjar joined #git
09:32 najjar_ joined #git
09:32 nivag abhinav, that is why I have my notes!
09:33 abhinav nivag: care to gist it?
09:34 drbean_ joined #git
09:34 ochorocho__ joined #git
09:35 LeMike joined #git
09:36 osse abhinav: what does mv have to do with git ? :O
09:36 osse you can use a file manager you know
09:37 nivag abhinav, gist?
09:37 abhinav osse: wrong file added to project dir.
09:37 abhinav due to wrong syntax.
09:37 aseidl joined #git
09:37 abhinav nivag: can you please share that notes file?
09:37 nivag abhinav, sure!  how?
09:37 abhinav gist!
09:37 abhinav :-)
09:38 osse abhinav: but that's not a git problem
09:38 abhinav its github pastebin
09:38 abhinav osse: when did I said it is?
09:38 corebits joined #git
09:38 osse you didn't, but you asked for a git gui because of this :O
09:38 abhinav :-(
09:39 osse anyway, i have heard sourcetree is very good
09:39 abhinav if i had gui yesterday, i would have easily noticed non-project file in there. and all that horror would have been prevented. due to command line, and wrong mv i did not see there is accidental new file in my project directory.
09:39 MattMaker joined #git
09:39 abhinav ok. will check that.
09:39 osse run git status more often
09:40 abhinav yeah.
09:40 najjar abhinav: I recommend using one of those smart prompts as well
09:40 nivag abhinav, I simply run git status, it tells me if there are stray files
09:40 osse and stop doing 'git add .' :P
09:41 nivag also popluate .gitignore appropriately
09:41 abhinav yeah.
09:42 najjar abhinav: check https://github.com/nojhan/liquidprompt out.
09:43 guardian is git status --porcelain -- <file> | grep '^ M' a robust way to find out whether a file has modified status?
09:43 abhinav najjar: looks good. thanks.
09:43 abhinav najjar: is that your project?
09:43 najjar abhinav: welcome!
09:43 dan2k3k4 joined #git
09:43 MutantMahesh joined #git
09:43 najjar abhinav: nope, not mine, but I use it (a fork of it)
09:43 denimsoft joined #git
09:43 abhinav phanimahesh: and mutantmahesh are different or same?
09:43 abhinav najjar: ok
09:44 nivag abhinav, will have to go in a couple of minute, I can 'gist' my notes tomorrow (21:45 here in NZ)
09:45 abhinav nivag: np. i will ping you tomorrow.
09:46 nivag abhinav, though there are better notes already publicly available!
09:46 harish_ joined #git
09:47 abhinav ok
09:47 nilg joined #git
09:47 a_thakur_ joined #git
09:48 mrkat joined #git
09:50 star_pro_ joined #git
09:50 star_pro_ joined #git
09:53 a_thakur joined #git
09:54 martinkl_ joined #git
09:54 Xatenev joined #git
09:54 Xatenev Heya
09:55 Xatenev What is a good and easy graphical tool to solve merge conflicts?
09:56 Xatenev Oh okay I got one.
09:57 najjar Xatenev: I hear good things about meld: http://meldmerge.org/
10:00 LucaTM joined #git
10:00 nnyk joined #git
10:00 Stummi yes, meld is pretty nice
10:02 aax joined #git
10:03 guardian I'm using p4merge for what's worth. I like having the same experience on Linux, Windows, Mac
10:03 cqi joined #git
10:03 gma_ joined #git
10:08 a_thakur_ joined #git
10:11 MattMaker joined #git
10:15 raijin joined #git
10:16 Xatenev najjar: thanks for the tip, i use meld now
10:16 Xatenev good stuff
10:17 bronson joined #git
10:19 kedare joined #git
10:20 FilipNortic joined #git
10:22 MutantMahesh joined #git
10:26 baako hi guys quick question is they away to clone froma repo but without the creating an addition folder?
10:26 Xatenev baako: git clone path@to@repo folderName
10:27 mingrammer joined #git
10:27 Xatenev so when you are in the specific folder, do: cd ../; git clone path@to@repo folderName
10:27 _ikke_ "git clone <url> ."
10:27 _ikke_ but it requires the folder to be empty
10:27 baako Xatenev, thanks
10:30 p4trick joined #git
10:31 a_thakur joined #git
10:33 freimatz joined #git
10:35 a_thakur joined #git
10:36 david007 joined #git
10:36 david007 joined #git
10:37 al-damiri joined #git
10:38 a_thakur joined #git
10:39 Darcidride joined #git
10:39 texinwien_ joined #git
10:40 star_pro_ joined #git
10:43 armyriad joined #git
10:43 abhinav joined #git
10:44 MattMaker joined #git
10:44 zeemz joined #git
10:46 jikz joined #git
10:46 texinwien_ joined #git
10:48 saidi joined #git
10:52 dr_lepper joined #git
10:52 hwoarang joined #git
10:53 star_pro_ joined #git
10:53 mrkat joined #git
10:54 asd5a joined #git
10:56 nnyk joined #git
10:56 texinwien_ joined #git
10:57 matrixa1 joined #git
11:01 ash_workz joined #git
11:01 Mowgli joined #git
11:02 texinwien_ joined #git
11:07 texinwien_ joined #git
11:07 jikz joined #git
11:09 espindola joined #git
11:09 cyan__ joined #git
11:11 vuoto joined #git
11:11 mdw joined #git
11:11 jikz joined #git
11:12 rnsanchez joined #git
11:14 armyriad joined #git
11:15 dsdeiz joined #git
11:15 dsdeiz joined #git
11:16 ojdo joined #git
11:16 Lomex joined #git
11:19 drbean joined #git
11:20 ahmedelgabri joined #git
11:21 HoierM joined #git
11:21 MattMaker joined #git
11:22 jikz joined #git
11:25 MutantMahesh joined #git
11:26 fuchstronaut joined #git
11:28 muthu joined #git
11:32 cerion joined #git
11:33 doebi joined #git
11:34 phanimahesh abhinav: We are different.
11:35 abhinav ok!
11:35 ochorocho__ joined #git
11:37 Lomex joined #git
11:38 mdw joined #git
11:39 dopesong joined #git
11:39 mdw joined #git
11:40 sdothum joined #git
11:41 mdw joined #git
11:41 dopesong joined #git
11:41 mdw joined #git
11:43 MutantMahesh joined #git
11:43 lindenle joined #git
11:47 ams__ joined #git
11:49 star_pro_ joined #git
11:49 danemacmillan joined #git
11:54 MattMaker joined #git
11:54 synthroid joined #git
11:54 stantonk joined #git
11:56 achadwick joined #git
11:57 CussBot joined #git
11:59 WayToDoor joined #git
12:00 PCatinean joined #git
12:00 Ediz joined #git
12:02 tomog999 joined #git
12:05 rwb joined #git
12:07 ramsub07 joined #git
12:08 rapheee joined #git
12:10 rgrinberg joined #git
12:11 rapheee hello!
12:11 gitinfo rapheee: 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.
12:11 maucar joined #git
12:12 rapheee i'd like to describe a simple scenario (sorry, i'm a beginner to git)
12:12 rapheee so, i am working on a repo that is on a commit from say, yesterday
12:13 rapheee my friend is working on the same copy on their computer
12:13 flaguy48 left #git
12:13 rapheee so, i make changes and they do, too. they commit and push their changes to remote while i fetch this commit locally
12:13 cd-rum joined #git
12:13 rapheee how can i combine my local uncommited changes to the latest commit i got from origin?
12:14 osse rapheee: so it becomes one big commit?
12:14 vktec You should use pull instead of fetch, it does it automatically
12:14 ahmedelgabri joined #git
12:14 rapheee osse: no, so i can "port"  my changes to the new commit
12:14 rapheee vktec: one sec, pull gives me an error
12:15 romerocesar joined #git
12:15 jokajak rapheee: git stash will save your uncommitted changes and reset the files on disk to the unmodified format. git pull will fetch and merge the changes thereby incorporating the other changes. git stash pop will re-apply your uncommitted changes
12:16 rapheee jokajak: right, i did that, however i need to interactively then "migrate" the stashed changes to the new commit that my friend did
12:16 rapheee vktec: here you go... error: Your local changes to the following files would be overwritten by merge
12:16 najjar git pull = git fetch && git merge FETCH_HEAD
12:16 jokajak if you want to change history then you will git commit --amend
12:16 cd-rum_ joined #git
12:16 rapheee right, let me try one sec
12:17 jokajak rapheee: changing history is a bad thing
12:17 jokajak rapheee: why can't you just have 2 commits?
12:17 vktec rapheee: You'll need to `git stash && git merge FETCH_HEAD && git stash pop` AFAICT
12:17 a_thakur joined #git
12:18 rapheee see, now i am @ one commit behind from remote
12:18 vktec biab
12:18 rapheee i pull and it works perfectly
12:18 wodim joined #git
12:18 rapheee now, how do i merge the stashed changes, *with the new files* interactivelyu
12:18 rapheee i hope this makes sense, i am not a native speaker
12:19 osse git stash pop
12:19 rapheee right one sec
12:20 rapheee right, i get " Merge conflict in ...."
12:20 rapheee that's what i have been trying to do, fix the conflicts interactively
12:21 rapheee btw i am using sourcetree
12:21 osse !eek
12:21 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
12:22 rapheee right, thanks, i will read that and will come back if i have more questions
12:22 rapheee thanks a lot everyone
12:23 nick6 joined #git
12:25 flaguy48 joined #git
12:25 SimonNa joined #git
12:26 Kulrak joined #git
12:26 Kulrak joined #git
12:26 najjar joined #git
12:26 kab joined #git
12:26 Rodya_ joined #git
12:28 TooLmaN joined #git
12:29 fahadash joined #git
12:30 MattMaker joined #git
12:30 rwb joined #git
12:31 Xatenev left #git
12:31 Jellyg00se joined #git
12:31 ahmedelgabri joined #git
12:31 Meteorhead hello!
12:31 Meteorhead I'd like to get a colleague's branch: git fetch url
12:32 najjar joined #git
12:32 Meteorhead git checkout -b newbranch
12:32 Meteorhead git merge FETCH_HEAD
12:32 Meteorhead should do it right?
12:32 osse yes
12:32 Meteorhead osse: thanks!
12:32 osse but i think it's more common to add the url as a new remote, then fetch that
12:32 osse then do git checkout -b newbranch remotename/brancname
12:32 heftig Meteorhead: actually git checkout -b newbranch FETCH_HEAD
12:33 heftig Meteorhead: unless you do want a merge into your current state
12:33 osse oh right
12:34 Meteorhead heftig: exactly this is the critical point I dont want to merge on my current state
12:34 Meteorhead thanks
12:35 heftig although if you expect to fetch regularly, adding a remote is the better option
12:35 Meteorhead osse: here it is git fetch url remotebranch
12:35 Meteorhead git checkout -b remotebranchlocal FETCH_HEAD
12:35 Meteorhead this should be it?
12:35 jast that should work
12:35 heftig yes
12:36 Meteorhead it's a one time thing I guess :D but Ill add it as a remote
12:36 Meteorhead thanks guys
12:37 andlabs joined #git
12:38 Drzacek So if I have my git remote repository, and added some changes that are bad - how can I revert SINGLE file to earlier version?
12:38 jast for getting changes from a previous commit back, see the output of 'git status'
12:39 rolha joined #git
12:39 GavinMagnus left #git
12:39 FuzzySockets joined #git
12:40 Drzacek jast, http://paste.debian.net/784040/ git status doesn't say much
12:41 Drzacek + the file version I want if from few commits back
12:41 GavinMagnus joined #git
12:42 tunage joined #git
12:42 AndreasLutro git reset commithash -- path/to/file
12:42 AndreasLutro or checkout
12:43 AndreasLutro one of those
12:43 najjar Drzacek: git checkout <commit> path/to/file
12:44 tvw joined #git
12:44 Drzacek How can I get commit hash? I know I can do that easy in graphical program, but no idea how in console
12:45 jeffreylevesque joined #git
12:45 AndreasLutro git log -p path/to/file
12:45 MattMaker joined #git
12:45 AndreasLutro -p will include changes
12:45 hanwei_ joined #git
12:45 dan2k3k4 joined #git
12:45 mdw_ joined #git
12:46 denimsoft joined #git
12:46 star_pro_ joined #git
12:46 Drzacek Thanks
12:46 mdw_ joined #git
12:53 jost joined #git
12:56 hanwei_ joined #git
12:58 stantonk joined #git
12:58 jast Drzacek: that looks like you didn't change any files tracked by git
12:58 jast though I realize I was assuming you were talking about uncommitted changes. sorry. :)
13:00 ahmedelgabri joined #git
13:00 Drzacek jast, yeah, I was wondering what status has to do with it :) but I found a solution
13:00 xZord joined #git
13:01 Drzacek "found" :D
13:01 hanwei_ joined #git
13:02 Drzacek If I use .gitignore, the ignored files won't show up as modified unstaged?
13:04 MattMaker joined #git
13:04 griffindy joined #git
13:05 rapheee left #git
13:06 cbreak Drzacek: ignore rules only prevent stuff from showing up as untracked
13:06 najjar Drzacek: yes, if they are not staged before.
13:06 Drzacek najjar, if they were, I have to remove them?
13:06 mehola joined #git
13:07 Drzacek cbreak, thats what I meant, forgot the word :)
13:07 najjar Drzacek: remove them from cache: git rm --cached <filename>
13:08 Drzacek ok, thanks
13:08 ExoUNX joined #git
13:08 ExoUNX joined #git
13:08 Rodya_ joined #git
13:09 zivester joined #git
13:11 clemf joined #git
13:13 stantonk_ joined #git
13:14 daniel_rose joined #git
13:18 livingstn joined #git
13:19 f3r70rr35f joined #git
13:22 xPucTu4 joined #git
13:23 dopesong joined #git
13:24 cuebix-wk joined #git
13:25 stantonk joined #git
13:26 deadnull joined #git
13:27 l4v2 joined #git
13:27 fuchstronaut joined #git
13:27 jimi_ joined #git
13:29 Karunamon|2 left #git
13:30 zeroed joined #git
13:31 hanwei_ joined #git
13:31 eka joined #git
13:32 hanwei_ joined #git
13:32 hanwei_ joined #git
13:33 hanwei_ joined #git
13:34 hanwei_ joined #git
13:34 MattMaker joined #git
13:35 ncd|leeN joined #git
13:36 hanwei_ joined #git
13:36 skirk joined #git
13:36 stantonk_ joined #git
13:36 livingstn joined #git
13:36 Rodya_ joined #git
13:36 ochorocho__ joined #git
13:39 GavinMagnus left #git
13:41 fmcgeough joined #git
13:41 SourTrout joined #git
13:41 f3r70rr35f joined #git
13:44 DieguezZ joined #git
13:45 ahmedelgabri joined #git
13:48 Rodya_ joined #git
13:48 stantonk joined #git
13:51 Rodya_ joined #git
13:53 Guest17899 joined #git
13:53 SourTrout joined #git
13:54 stonerfish joined #git
13:56 vuoto joined #git
13:56 livingstn joined #git
13:56 shaggycat_ joined #git
13:57 SourTrou_ joined #git
13:58 SourTrou_ joined #git
13:58 unbalancedparen joined #git
13:59 naught101 joined #git
14:00 stantonk_ joined #git
14:03 zeroed joined #git
14:04 tomtom52 joined #git
14:05 vuoto joined #git
14:06 vuoto joined #git
14:06 dopesong_ joined #git
14:07 tcurdt joined #git
14:07 choki joined #git
14:07 dopeson__ joined #git
14:08 MattMaker joined #git
14:09 Noldorin joined #git
14:09 xall_ joined #git
14:09 stantonk joined #git
14:10 sagerdearia joined #git
14:14 stantonk joined #git
14:15 kaldoran joined #git
14:15 Noldorin joined #git
14:17 mdw joined #git
14:17 denimsoft joined #git
14:18 vuoto joined #git
14:20 TheMoonMaster joined #git
14:20 sangy joined #git
14:21 tomtom52 joined #git
14:21 Rodya_ joined #git
14:21 stantonk_ joined #git
14:22 steadystatic joined #git
14:22 dan2k3k4 joined #git
14:24 armyriad joined #git
14:25 steadystatic joined #git
14:25 tabrez joined #git
14:26 ShekharReddy joined #git
14:26 hwcomcn joined #git
14:27 hwcomcn joined #git
14:27 hwcomcn joined #git
14:28 Mikerhinos joined #git
14:30 Mikerhinos hi all, pretty new to git, I have some script files where git added commits or something (I have many "<<<<<<<< HEAD" with the commit number added in code so it won't run anymore. How can I apply the diffs and delete these things ?
14:30 Rodya__ joined #git
14:30 phaleth joined #git
14:31 Dougie187 joined #git
14:33 ResidentBiscuit joined #git
14:33 mablae joined #git
14:34 theskillwithin joined #git
14:34 stantonk joined #git
14:36 clemf joined #git
14:36 mrkat joined #git
14:36 johnmilton joined #git
14:37 MattMaker joined #git
14:37 steadystatic joined #git
14:39 Hedgework Mikerhinos: Hey there.  So, my first concern is that what you describe is NOT a normal git behavior, so let's figure out what caused it before we clean up.  Otherwise, it will probably just happen again.
14:39 Corneliu joined #git
14:40 Hedgework Mikerhinos: What OS are you on, and are you using git from the command line or through some sort of interface like an IDE or GUI repo manager?
14:40 Mikerhinos Hedgework, Yes I tried GitKraken and other stuff but ended that it's easier to do the git stuff in terminal lol...and I think that I messed up a few things
14:40 kutsuya joined #git
14:41 Mikerhinos Hedgework, I'm on Ubuntu, 16.04 until today, I formatted my "/" partition to do a clean install of 16.10 (leaving my /home partition untouched)
14:41 The_Phoenix joined #git
14:42 johnmilton joined #git
14:42 Hedgework Mikerhinos: Thanks!  That's exactly what I needed to know.
14:43 SourTrout joined #git
14:43 Hedgework Mikerhinos: So, chances are that the problem you encountered was introduced by one of the GUIs you tried.  The good news is, that we can edit it out and check that none of them left anything weird in your git config (either your user's git config, or the repo's config) that would cause future problems.
14:43 Hedgework Then, if you stick to command line, it's unlikely to happen again. :)
14:45 SourTrou_ joined #git
14:45 Mikerhinos Yes GUIs problem is you never really know what it does when you click on something, and I clicked on many things when trying to do some "quite simple" things lol. BTW I'm using BitBucket on remote repo, don't know if it's important (maybe I pushed bad code with GitKraken then pulled it manually on my local repo)
14:45 Repox joined #git
14:46 zacts joined #git
14:46 SourTro__ joined #git
14:47 Macaveli joined #git
14:48 PioneerAxon joined #git
14:49 ResidentBiscuit How are people liking Git Kraken?
14:50 soupmagnet joined #git
14:50 sentriz joined #git
14:50 Mikerhinos ResidentBiscuit, I tried several GUIs thinking that it will be easier for me than all in terminal commands :)
14:50 freimatz joined #git
14:51 ResidentBiscuit I've never find any GUI frontend to be terribly helpful. But I have some coworkers who are so used to Tortoise SVN that they have a hard time anything command line
14:52 steadystatic joined #git
14:56 MattMaker joined #git
14:57 HanClinto joined #git
14:57 Mikerhinos by checking my commits on bitbucket, looks like the weird parts have been added when I merged a branch (surely created by mistake in gitkraken) onto master
14:58 Mikerhinos didn't do anything really important since, can I go back before this merge ?
14:59 darkbit joined #git
14:59 subhojit777 joined #git
15:00 ResidentBiscuit You can always go back
15:01 jaguarmagenta joined #git
15:02 star_pro_ joined #git
15:03 madewokherd joined #git
15:09 ochorocho__ joined #git
15:10 zacts_pi joined #git
15:11 Mikerhinos ResidentBiscuit, git revert <commit> where commit is the commit number where I want to go back in ?
15:12 Khisanth joined #git
15:13 ResidentBiscuit That will revert that specific commit, which probably isn't what you want. You can `git reset --hard <commit>` will bring you back to the commit, but you will lose (sort of) all the commits between HEAD and <commit>
15:15 robotroll joined #git
15:15 Mikerhinos ResidentBiscuit, Yes that's what I was thinking while reading the doc, maybe reset is more what I need as the last 2 commits where errors from me that I don't want to keep
15:16 MattMaker joined #git
15:16 ResidentBiscuit Then just reset to the commit before those two
15:19 nuc joined #git
15:20 zivester joined #git
15:21 Rodya_ joined #git
15:21 LionsMane joined #git
15:21 relipse joined #git
15:21 relipse i made a commit to master is there anyway i can pull that commit into another branch
15:21 relipse just that one commit
15:22 Mikerhinos Ok did it :) Do I have to "force" push to update bitbucket to that previous state ? Or I have to reset on bitbucket too
15:23 Boniche joined #git
15:23 ResidentBiscuit Mikerhinos: You'll need to force push
15:24 ResidentBiscuit relipse: You can merge or rebase
15:24 Mikerhinos ResidentBiscuit, with git push -f origin myBranch  ?
15:24 relipse i dont want to merge the whole branch, i just want to pick that one commit from master and put it into my other branch "resources"
15:24 thiago joined #git
15:24 ResidentBiscuit Mikerhinos: Yup
15:24 najjar_ joined #git
15:25 stonerfish joined #git
15:25 MattMaker joined #git
15:26 ResidentBiscuit relipse: I think you want to cherry pick, but not totally sure. Never been in that situation
15:26 NeverDie_ joined #git
15:26 MZAWeb_ joined #git
15:26 perlpilot_ joined #git
15:27 ash_workz joined #git
15:28 fuchstronaut joined #git
15:28 josue joined #git
15:28 jaafar joined #git
15:28 jab416171 joined #git
15:28 dreamseeker joined #git
15:28 stantonk joined #git
15:28 snowinferno_ joined #git
15:28 tinanoo1 joined #git
15:29 mar77i_ joined #git
15:29 nilg joined #git
15:30 Mikerhinos Ok code looks good locally and on bitbucket :) Thanks ResidentBiscuit  and Hedgework for your help :) Have to leave good night all :)
15:30 lamba joined #git
15:30 Mikerhinos and I'll never use a GUI anymore lol.
15:30 gear4 joined #git
15:30 joshc_ joined #git
15:30 soupmagnet joined #git
15:30 catbeard joined #git
15:30 steve joined #git
15:30 ResidentBiscuit Git is a little too complicated for a good GUI it seems
15:30 HyP3r_ joined #git
15:30 felixjet_ joined #git
15:31 Ragnor joined #git
15:31 ecraven joined #git
15:31 Hedgework Awesome.
15:31 ronny_ joined #git
15:31 Hedgework ResidentBiscuit: thanks for picking that one up, as work called me afk
15:31 Cabanoss- joined #git
15:31 monty joined #git
15:31 Faylite joined #git
15:31 BooK_ joined #git
15:31 imMute^ joined #git
15:31 ResidentBiscuit No problem, I didn't read the backlog at lol
15:31 fus joined #git
15:32 rudi_s_ joined #git
15:32 tomboy65 joined #git
15:32 jaguarmagenta joined #git
15:32 indieross joined #git
15:32 Macaveli joined #git
15:33 kadoban joined #git
15:33 suigeneris joined #git
15:33 stantonk joined #git
15:33 filcab joined #git
15:33 filcab joined #git
15:34 MZAWeb joined #git
15:35 najjar relipse: +1: git cheery-pick <commit> ; https://git-scm.com/docs/git-cherry-pick
15:35 MattMaker joined #git
15:35 nitesh joined #git
15:35 HelloShitty joined #git
15:36 RiPer joined #git
15:36 a_thakur joined #git
15:36 M-mistake joined #git
15:37 clemf joined #git
15:37 Guest77344 left #git
15:37 Roconda joined #git
15:39 RTG` joined #git
15:39 felixjet joined #git
15:40 zacts_raincity joined #git
15:40 ndim joined #git
15:41 BasementFox joined #git
15:41 Danzeel joined #git
15:41 SirCmpwn joined #git
15:42 braderhart joined #git
15:44 sunny256 joined #git
15:45 soupmagnet I have a Bitbucket repository for a Magento website that has now reached its storage limits.  Is it possible in git to get rid of old commits, say, from the initial commit to the Nth commit?
15:46 ketas joined #git
15:47 same_ol_1eez joined #git
15:47 pasky joined #git
15:47 robogoat joined #git
15:47 pR0Ps joined #git
15:47 Jupelius joined #git
15:47 ozzloy joined #git
15:47 ozzloy joined #git
15:47 tokkee joined #git
15:47 _W_ joined #git
15:47 snsapiens joined #git
15:47 tanuki joined #git
15:47 DelphicOkami joined #git
15:47 naitsirhc joined #git
15:47 hwoarang joined #git
15:47 Hounddog joined #git
15:47 javaJake joined #git
15:47 `mx joined #git
15:47 Aaeriele joined #git
15:47 Mikaela joined #git
15:47 lindenle joined #git
15:47 Cork joined #git
15:47 ec\ joined #git
15:47 tier2villain_ joined #git
15:47 ilogger2 joined #git
15:47 malesca joined #git
15:47 djb-irc joined #git
15:47 jason237 joined #git
15:47 osse joined #git
15:47 kbs no git expert, but out of curiosity - I take it you've already removed all unnecessary branches/refs at the romet end? (May not get much, but this would be a straightforward thing at least)
15:47 ResidentBiscuit You can squash commits together, effectively removing old commits. Though commits really don't take much space
15:47 rpd joined #git
15:47 ItSANgo joined #git
15:47 wodim joined #git
15:47 DolphinDream joined #git
15:47 malide joined #git
15:47 nick6 joined #git
15:47 _ikke_ yes, but it would require rewriting history
15:47 achadwick joined #git
15:47 JanC joined #git
15:47 cydrobolt joined #git
15:47 cydrobolt joined #git
15:47 Exagone313 joined #git
15:47 mablae joined #git
15:47 Lomex joined #git
15:47 epic joined #git
15:48 creppe joined #git
15:48 sLite joined #git
15:48 bastelfreak joined #git
15:48 ResidentBiscuit Removing branches won't net you anything really. Though removing stale branches is a good idea in general IMO
15:48 LeeFly joined #git
15:48 monokrome joined #git
15:48 kbs no? Any unreachable commit/tree/objects from the stale branch would be gc'ed no?
15:48 MatthewAllan93 joined #git
15:49 Alenah joined #git
15:49 kbs agree it won't get a whole lot, depending
15:49 mmlb joined #git
15:49 mutex joined #git
15:49 _ikke_ Depends on how bitbucket does GC
15:49 nick6 joined #git
15:49 soupmagnet Most of the commits are database changes and images.  I have already removed all unused refs/branches etc.
15:49 _ikke_ and if they keep ar edlof
15:49 _ikke_ soupmagnet: What is taking up so much space?
15:49 zacts joined #git
15:49 ResidentBiscuit A branch is is like a 5 kilobyte file
15:49 skasturi joined #git
15:50 osse 41 bytes
15:50 _ikke_ :-)
15:50 ResidentBiscuit Even smaller, I knew it was something insignificant
15:50 kbs ResidentBiscuit: yes, but it's not removing the branch but the GC (should bitbucket GC) that removes unreachable refs
15:50 osse well, plus the sizes of all the commits unique to it, I suppose
15:50 GavinMagnus joined #git
15:51 nick6 joined #git
15:51 kbs ^^ and objects..
15:51 Arguggi joined #git
15:51 stantonk joined #git
15:51 selckin and those pesky fs page sizes
15:51 MatthewAllan93 joined #git
15:52 osse ResidentBiscuit: 40 bytes for the hex representation of the SHA1, and a newline. Boom. 41.
15:52 iveqy joined #git
15:53 mingrammer joined #git
15:53 kevwil joined #git
15:54 EvilPeng1 joined #git
15:55 msonntag joined #git
15:55 ResidentBiscuit kbs: I don't think they'll become unreachable just because you delete the branch. Unless it's commits that never got merged
15:57 kbs ResidentBiscuit: yep, agreed.
15:57 PCatinean joined #git
15:58 ResidentBiscuit Either way, we're getting off topic. I think all soupmagnet can do is squash down a bunch of commits?
15:58 felher joined #git
15:58 ResidentBiscuit Or buy more storage
15:58 ResidentBiscuit Or git-lfs?
15:59 clemf_ joined #git
15:59 soupmagnet Apart from images (which in hindsight I should have used a CDN), it is the database changes that are taking up most of the space.  I don't really need the old db changes anymore, but I guess with the images I can't just delete old commits without losing images huh?  I'll look into squash an see if it helps
15:59 osse git fetch --prune; git reflog expire --expire=all; git gc --prune=all
15:59 MattMaker joined #git
16:00 osse BAM. More space
16:00 soupmagnet and as far as I can tell, you cant buy more storage on BB
16:00 osse oh...
16:00 ResidentBiscuit Versioning a database seems strange also
16:01 soupmagnet Magento's database is a beast, so I want to track what changed in case the sync breaks something and I have to repair it manually
16:03 Goplat joined #git
16:04 Ahmed90 joined #git
16:05 MattMaker joined #git
16:05 kbs Might it be an option to rebase (pick'ing all the commits) off an initial commit that removes the directory for the db files? This would retain the history.
16:07 pur3eval joined #git
16:07 osse !bfg
16:07 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
16:07 osse !sensitive
16:07 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
16:07 kbs oh, nice - thanks
16:10 Arban joined #git
16:10 lindenle joined #git
16:10 dreiss joined #git
16:11 jimi_ joined #git
16:11 Darren_ joined #git
16:11 le_melomane joined #git
16:13 foist joined #git
16:13 irco joined #git
16:14 GavinMagnus left #git
16:20 MattMaker joined #git
16:20 kab joined #git
16:22 Rodya_ joined #git
16:23 kab hi, let's imagine we have branch A and branch B. we are on the branch A. how can i push branch B to origin wihtout making checkout on it?
16:23 canton7 git push origin branchB
16:23 Bombe git push origin B:B
16:23 Bombe Unless you want to rename it on the remote.
16:25 canton7 from man git push: "The <src> is often the name of the branch you would want to push ... :<dst> part can be omitted—such a push will update a ref that <src> normally updates without any <refspec> on the command line. Otherwise, missing :<dst> means to update the same ref as the <src>."
16:25 gitinfo the git-push manpage is available at http://jk.gs/git-push.html
16:25 canton7 so if you 'git push origin branchB', it will push the local 'branchB' to the same place that it would push to if you ran 'git checkout branchB && git push'
16:25 le_melomane joined #git
16:26 canton7 (no need to explicitly specify the <dst>, as you've done, Bombe)
16:26 shaggycat_ joined #git
16:26 MattMaker joined #git
16:26 Bombe True.
16:26 kab ok, thank you
16:26 HoierM joined #git
16:27 xPucTu4 joined #git
16:27 lvns joined #git
16:28 feignix joined #git
16:28 l4v2 joined #git
16:28 lvns_ joined #git
16:31 stantonk joined #git
16:31 ajf- how do I reset the branch to how the origin is quick
16:32 canton7 do you want to throw away all local commits which aren't on origin, as well as all uncommitted changes?
16:32 canton7 if so, 'git fetch origin; git reset --hard origin/branchname'
16:33 jeremyhall joined #git
16:34 xkr47 joined #git
16:40 chandlerbing joined #git
16:41 durham joined #git
16:41 romerocesar joined #git
16:42 durham joined #git
16:45 tristanp joined #git
16:47 madewokherd joined #git
16:48 mingrammer joined #git
16:49 crose joined #git
16:51 inflames joined #git
16:53 blackwind_123 joined #git
16:53 danslo joined #git
16:54 MattMaker joined #git
16:55 faheem joined #git
16:56 cdown_ joined #git
16:58 sangy joined #git
16:59 clemf joined #git
17:00 rgrinberg joined #git
17:00 Emersont1 joined #git
17:01 SegFaultAX joined #git
17:02 Emersont1 hii, are all previous commits, commit messages and stuff like that contained within the .git directory?
17:02 _ikke_ yes
17:03 Emersont1 okay, so as another means of backup could i duplicate my git directory?
17:04 zivester joined #git
17:04 ochorocho__ joined #git
17:05 _ikke_ yes
17:08 CheckDavid joined #git
17:09 mehola joined #git
17:09 doebi joined #git
17:09 pwnz0r joined #git
17:12 nb_bez___ joined #git
17:12 MattMaker joined #git
17:13 diogenese joined #git
17:14 SwiftMatt joined #git
17:15 Lomex joined #git
17:16 thiago_ joined #git
17:17 _ikke_ joined #git
17:23 jokajak joined #git
17:23 Rodya_ joined #git
17:24 liuzhen joined #git
17:25 stantonk joined #git
17:27 shinnya joined #git
17:27 crayon joined #git
17:27 vjacob joined #git
17:27 dking_desktop joined #git
17:27 MattMaker joined #git
17:28 cdg joined #git
17:28 fuchstronaut joined #git
17:29 ahmedelgabri joined #git
17:29 digidog joined #git
17:30 jbitdrop joined #git
17:31 LeBlaaanc joined #git
17:32 pasadinhas joined #git
17:33 cdg joined #git
17:33 jaguarmagenta joined #git
17:34 sdothum joined #git
17:34 Finnoloid joined #git
17:36 anu0 joined #git
17:38 cuebix-wk joined #git
17:39 johnmilton joined #git
17:41 xlegoman joined #git
17:42 mingrammer joined #git
17:42 danemacmillan joined #git
17:43 xpk joined #git
17:44 ochorocho__1 joined #git
17:44 crayon joined #git
17:44 EvilPenguin joined #git
17:45 Narwhaal joined #git
17:45 RedShift joined #git
17:47 MattMaker joined #git
17:49 nettoweb joined #git
17:49 GavinMagnus joined #git
17:51 Kashni joined #git
17:51 lindenle joined #git
17:51 Kashni What is git? I want to learn abkut it. How long it will take
17:52 mcfrisk left #git
17:52 izabera one minute to learn, a lifetime to master
17:52 izabera no wait that's the game of go
17:52 izabera git is a lifetime to learn, two lifetimes to master
17:52 SourTrout joined #git
17:53 _ikke_ Kashni: What do you know about it?
17:53 Kashni I know that it is version control that is it
17:53 Kashni Sorry for being noob abt it
17:54 _ikke_ No problem
17:54 D-Boy joined #git
17:54 jungsubk joined #git
17:54 Kashni So what is it?
17:54 _ikke_ So git is a popuplar distributed version control system created by Linus Torvalds
17:54 danslo joined #git
17:55 _ikke_ distributed means that everyone has a complete local clone of the repository
17:55 _ikke_ (instead of everyone depending on a central server)
17:55 Kashni Ok
17:55 _ikke_ Git is very flexible, but that also means it has a learning curve
17:56 _ikke_ !books has some good resources
17:56 gitinfo [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
17:56 Kashni Ty
17:56 mwhooker joined #git
17:56 Kashni Is git like language?
17:56 _ikke_ No, it's a tool
17:57 Kashni Ok I see
17:58 stantonk joined #git
18:00 Kashni _ikke_: Is git pre-installed on all linux? I use suse on vbox
18:00 _ikke_ Kashni: No, I don't think so
18:00 daniel_rose joined #git
18:01 Kashni Ok
18:01 _ikke_ Kashni: just type git
18:01 Diabolik joined #git
18:01 _ikke_ then you'll see it soon enough
18:01 vishal it should be in every distro's repos
18:01 SourTrou_ joined #git
18:01 Kashni Ok
18:01 King_Hual joined #git
18:01 Diabolik joined #git
18:03 kfoonamalik joined #git
18:03 Repox joined #git
18:03 romerocesar joined #git
18:05 SourTrout joined #git
18:06 MattMaker joined #git
18:07 causasui joined #git
18:07 Nuewy joined #git
18:07 causasui joined #git
18:08 dking_desktop I'm stuck, and I need some help. I apologize in advance for the large description to follow.
18:08 dking_desktop There's a repo on a separate private gitlabs server. I only have read access to that repo, but I have it forked to an instance there where I do have write access. So, I made a cone of my personal fork onto the computer where I work. To make it easier, I setup two remotes. I have one named "origin" for the master repos with read access, and "destination" for my personal fork. I was pulling from origin, making changes, and pushing to destinatio
18:09 dking_desktop I tried to push to destination, and git complained and mention the section on fast-forwards. So, I did a git pull --rebase destination', and after that, I get: Your branch is ahead of 'destination/master' by 1 commit.
18:10 dking_desktop I can't seem to change that or get unstuck here.
18:10 m0viefreak joined #git
18:11 _ikke_ dking_desktop: and git push master destination/master is rejected?
18:11 dking_desktop ...
18:11 dking_desktop That was just my thought, too, and it worked.
18:11 dking_desktop But perhaps now that I'm here, can somebody tell me what the proper workflow should be for this sort of thing?
18:11 ResidentBiscuit joined #git
18:12 MZAWeb joined #git
18:12 ResidentBiscuit joined #git
18:12 _ikke_ What is your intention?
18:12 cyan__ joined #git
18:12 SourTrout joined #git
18:12 stantonk joined #git
18:13 jimi_ joined #git
18:13 zivester joined #git
18:15 dking_desktop I have a repo that exists on a remote server where others will be making changes, and it's read only. On that same server, I have a fork where I can write. I want to be able to pull from the original server, make my changes to it, and push it up to copy where I can write.
18:16 mwhooker joined #git
18:16 MattMaker joined #git
18:16 _ikke_ right
18:16 dking_desktop I want to make sure that I know the regular steps I should be applying to do that.
18:16 snowkidind joined #git
18:17 vishal what you described/did above sounds mostly right :)
18:17 _ikke_ Are you intending to make pull requests back?
18:17 mwhooker joined #git
18:17 dking_desktop vishal: Great. I'm hoping that I'm on the right track.
18:17 SourTrou_ joined #git
18:18 dking_desktop I'm hoping to pull from origin, as other people are making changes there, and I need their changes in my copy before I push.
18:18 meekrat joined #git
18:18 vishal sometimes when you pull, based on what you've done locally, you may get conflicts, but you should just resolve them normally.
18:18 _ikke_ dking_desktop: So you are trying to maintain your local fork with your own changes?
18:18 vishal the other thing is if you're going to be making pull requests back to 'origin' I wouldn't pull --rebase
18:19 SourTrou_ joined #git
18:19 vishal just pull + merge to maintain common ancestry
18:19 dking_desktop So, would this be the standard method: git fetch origin master, git pull destination --rebase, make my changes, then git push destination ?
18:20 Codfection joined #git
18:20 lvns joined #git
18:20 emPi joined #git
18:20 mwhooker joined #git
18:21 tyreld joined #git
18:21 _ikke_ dking_desktop: There is no reason to pull from destination if others don't push to it
18:21 dking_desktop vishal: Okay. What would be the common way to pull + merge? At some point, I did "git reset --hard origin/master" to clear out some changes I had that weren't in the origin. What would the exact command be, and would it be in the same place as the --rebase command in the above step?
18:22 vishal dking_desktop: that depends on, like _ikke_ asked, what your intention is :)
18:22 pur3eval joined #git
18:23 vishal do you want to maintain a local set of your changes on top of origin, and will they be historical, or will you want to discard your previous changes every time you pull from origin?
18:23 stantonk_ joined #git
18:23 _ikke_ Do you intend to get your changes back upstream, or are you going to maintain a long-term fork that diverges
18:23 mingrammer joined #git
18:23 jungsubk joined #git
18:24 vishal the best/worst thing about git is there is no one workflow answer :)
18:24 SourTrout joined #git
18:25 _ikke_ There are some principles though
18:25 SourTrout joined #git
18:25 dking_desktop Nobody is pushing to my personal fork (destination). However, when I tried to push to it today, after a fetch from origin, it complained with "To prevent you from losing history, non-fast-forward updates were rejected
18:25 dking_desktop Merge the remote changes before pushing again."
18:26 dking_desktop The only thing that I can think of that changed from what I was doing before was that other people had written to origin this time.
18:26 jason237 joined #git
18:26 dreiss joined #git
18:27 _ikke_ The only reason why it would be rejected if your destination remote had changes that you don't have locally for that branch
18:27 _ikke_ including rewritten history
18:28 dking_desktop Ahh. So, I maybe did something that I don't remember, and changed that.
18:28 dking_desktop So, then, I should use the workflow I last mentioned, except leave out the --rebase command?
18:29 _ikke_ fetch from origin, merge the changes locally, push to destination
18:31 gargola joined #git
18:32 clemf joined #git
18:32 cagedwisdom joined #git
18:32 aax joined #git
18:33 gargola joined #git
18:35 vuoto joined #git
18:35 clemf joined #git
18:38 romerocesar joined #git
18:39 clemf joined #git
18:41 MattMaker joined #git
18:44 beantaxi joined #git
18:45 Rodya_ joined #git
18:47 cdg joined #git
18:48 clemf joined #git
18:49 lucasem joined #git
18:49 diegoviola joined #git
18:50 pur3eval_ joined #git
18:51 Sucks joined #git
18:51 narendraj9 joined #git
18:51 jason237 joined #git
18:54 SourTrou_ joined #git
18:54 jimi_ joined #git
18:55 danslo joined #git
18:57 brandougherty1 joined #git
18:58 lindenle joined #git
19:00 pur3eval joined #git
19:00 stantonk joined #git
19:01 SimonNa joined #git
19:01 sangy joined #git
19:02 davisonio joined #git
19:02 brandougherty1 left #git
19:04 beantaxi left #git
19:04 Cooler216 joined #git
19:05 beantaxi joined #git
19:05 Cooler216 joined #git
19:06 vuoto joined #git
19:06 beantaxi I created a branch named 'dev' locally, then pushed it to github ... then did some work on it, merged to master, and then deleted the branch locally but not on github. If I want to resume developing on a dev branch locally, what's the best way to do this?
19:08 lindenle joined #git
19:08 grawity create it again
19:09 MrWoohoo joined #git
19:09 mehola joined #git
19:10 beantaxi grawity: git branch dev; get checkout dev? Or just checkout
19:10 MattMaker joined #git
19:10 xall_ joined #git
19:15 stantonk joined #git
19:15 EvilPenguin joined #git
19:16 GavinMagnus left #git
19:19 SteffanW joined #git
19:21 _ikke_ beantaxi: git checkout dev should automatically create it based on origin/dev
19:23 beantaxi _ikke_: Just realized, I probably don't want the remote dev branch ... when I create the new branch I want to base it on master.
19:24 _ikke_ git checkout dev master then
19:24 beantaxi _ikke_: Ok ... and git push origin --delete dev to kill the remote branch?
19:25 _ikke_ No need to delete it
19:25 _ikke_ iirc, you can just push it later
19:26 ochorocho__ joined #git
19:27 mwhooker joined #git
19:28 beantaxi _ikke_: git checkout dev master will create a local dev branch from my local master, without involving origin/github at all, right? So I need to make sure I've done a pull on master?
19:29 _ikke_ if you want the latest master, sure
19:29 MattMaker joined #git
19:29 fuchstronaut joined #git
19:29 cwillu_at_work joined #git
19:34 ash_workz joined #git
19:34 mwhooker joined #git
19:35 ochorocho__ joined #git
19:37 jokajak joined #git
19:37 sapiens_vector joined #git
19:37 stantonk joined #git
19:38 raijin joined #git
19:39 ochorocho__ joined #git
19:39 rgrinberg joined #git
19:40 Doginal joined #git
19:42 gma_ joined #git
19:45 hahuang61 joined #git
19:46 BSAlb joined #git
19:48 SourTrout joined #git
19:48 SourTrout joined #git
19:49 vuoto_ joined #git
19:51 vuoto joined #git
19:51 MattMaker joined #git
19:54 happy-dude joined #git
19:55 ochorocho__ joined #git
19:56 danslo joined #git
20:02 anu1 joined #git
20:04 cdown joined #git
20:06 Tuvo joined #git
20:11 lvns joined #git
20:11 mingrammer joined #git
20:16 tcsiwula joined #git
20:17 Doginal joined #git
20:19 SwiftMatt joined #git
20:20 paul424 joined #git
20:21 max12345 joined #git
20:22 max12345 hello, noob question, I checked out an old commit, changed something and now I want to push it, it says I need to do "git push origin HEAD:something" but I don't understand it?
20:22 grawity "changed something"?
20:23 jaguarmagenta joined #git
20:23 max12345 yes i changed the code
20:23 moritz max12345: what do you want to happen after the push?
20:23 moritz do you want to lose all the new commits?
20:23 max12345 yes
20:23 max12345 or better yet
20:24 max12345 I would like to keep them but have my repos HEAD be like the version I have now
20:24 max12345 I think
20:24 sanketdg joined #git
20:24 moritz max12345: are you working on that repository alone?
20:25 max12345 yes it's my private one, noone else is touching it :)
20:25 jaguarmagenta joined #git
20:25 moritz ok
20:25 moritz then here's what you should do
20:26 moritz 1. commit your changes
20:26 hahuang61 joined #git
20:26 crankharder left #git
20:26 moritz 2. !backup
20:26 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
20:26 MattMaker joined #git
20:26 HoierM joined #git
20:26 moritz 3. note the commit hash of the newest commit (the top one that "git log" shows)
20:26 Orion3k joined #git
20:27 moritz 4. go back to your original branch, for example 'git checkout master'
20:27 moritz 5. rename that branch: git branch -m old-master
20:28 moritz 6. push it: git push origin old-master
20:28 meLon joined #git
20:28 moritz 7. start a branch based off the commit from step 1.: git checkout -b master <thatcommit>
20:28 lvns joined #git
20:29 moritz 8. push it: git push --force origin mater
20:29 moritz 9. send moritz 20€ in consulting fees :-)
20:30 citizen-stig joined #git
20:31 max12345 thanks a lot!
20:31 max12345 writing this down...
20:32 PasiFist joined #git
20:32 mwhooker joined #git
20:32 max12345 next time i'll look up the manual before I start messing around... hopefully
20:33 hck89 joined #git
20:33 peepsalot joined #git
20:34 theskillwithin joined #git
20:34 hck89 joined #git
20:34 Brando753-o_O_o joined #git
20:35 cyan__ joined #git
20:35 filcab joined #git
20:36 IWishIKnew joined #git
20:37 MattMaker joined #git
20:39 martinkl_ joined #git
20:39 axl_ joined #git
20:44 apotry joined #git
20:44 martinkl_ joined #git
20:48 watersoul joined #git
20:53 sgen joined #git
20:53 watersoul joined #git
20:54 zacts joined #git
20:54 davisonio joined #git
20:57 denimsoft joined #git
20:58 watersoul joined #git
20:58 pur3eval joined #git
20:59 Orion3k joined #git
20:59 neanderslob joined #git
21:00 MattMaker joined #git
21:00 GavinMagnus joined #git
21:00 GavinMagnus left #git
21:01 texinwien_ joined #git
21:02 neanderslob_ joined #git
21:03 neanderslob joined #git
21:03 Marbug_ joined #git
21:05 xall joined #git
21:06 mingrammer joined #git
21:06 Orion3k joined #git
21:08 CheckDavid joined #git
21:09 aee joined #git
21:10 hahuang61 joined #git
21:10 mehola joined #git
21:10 jbitdrop_ joined #git
21:12 sangy joined #git
21:13 martinkl_ joined #git
21:14 uebera|| joined #git
21:14 uebera|| joined #git
21:15 DonRichie joined #git
21:15 toydestroyer joined #git
21:16 stantonk joined #git
21:17 perlpilot joined #git
21:17 l4v2 joined #git
21:18 gkatsev joined #git
21:18 boombatower joined #git
21:19 elastix joined #git
21:20 xall_ joined #git
21:20 matthiaskrgr joined #git
21:21 cuebix-wk left #git
21:21 mdw joined #git
21:22 nnyk_ joined #git
21:23 star_pro_ joined #git
21:24 Orion3k joined #git
21:26 leehambley joined #git
21:27 jimi_ joined #git
21:27 chachasmooth joined #git
21:27 jstimm joined #git
21:29 Guest50906 joined #git
21:29 Guest50906 joined #git
21:30 fuchstronaut joined #git
21:31 MattMaker joined #git
21:34 stantonk joined #git
21:36 flicflac joined #git
21:37 flicflac left #git
21:38 mwhooker joined #git
21:40 madewokherd joined #git
21:41 redman joined #git
21:43 denimsoft joined #git
21:43 clemf joined #git
21:43 spudowiar joined #git
21:44 sim590 joined #git
21:45 MattMaker joined #git
21:46 sim590 Let's I have two branches A and B and the commit c=$(git merge-base A B). I want to list all the commits in A for which B doesn't have an equivalent, i.e. that if I would cherry-pick such a commit from A onto B, the diff would be null. Is there a builtin way to do that?
21:48 clemf joined #git
21:48 neanderslob joined #git
21:55 thiago sim590: see the git cherry command
21:55 thiago there's also git log --cherry
22:00 cd-rum joined #git
22:00 kadoban joined #git
22:00 mingrammer joined #git
22:02 WayToDoor joined #git
22:03 sim590 magic!
22:04 xkr47 Introducing "git tweak-index" - tweak/edit files in index/stage without touching the checked out versions: https://gist.github.com/xkr47/d8712409f84bebc4f79e43370a3902b4
22:05 cd-rum joined #git
22:05 sim590 I was about to code the solution myself. Git is really well-made. You easily can do what you want. You was about to cherry-pick -n in a loop all commits and see the return code of the command for conflicts, check the length of git diff and git diff --cached and deduce if the commit introduces changes like so.
22:06 snowkidind joined #git
22:06 FilipNortic joined #git
22:06 WayToDoor joined #git
22:08 MattMaker joined #git
22:09 raijin joined #git
22:10 joki joined #git
22:12 ochorocho__ joined #git
22:13 [Brain] joined #git
22:19 ericsupreme joined #git
22:19 MattMaker joined #git
22:20 jokajak joined #git
22:21 citizen-stig joined #git
22:25 Ediz joined #git
22:26 shader joined #git
22:29 ochorocho__ joined #git
22:32 martinkl_ joined #git
22:34 stantonk joined #git
22:34 andlabs joined #git
22:34 govg joined #git
22:36 shader so, somehow a coworker merged into our repo a long and mostly unrelated tree of commits; how do I keep the relevant work but remove all of the unrelated history?
22:37 thiago shader: !rewrite
22:37 gitinfo shader: 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
22:37 shader yeah; there's only two of us though and the project went from 100 commits to over 3k
22:37 brandonw joined #git
22:38 thiago drop all of his changes. All of them.
22:38 thiago then have him do it properly.
22:38 FilipNortic joined #git
22:38 thiago you can do that by using git reset --hard <the commit before his merge>
22:38 GavinMagnus joined #git
22:42 clemf joined #git
22:44 edaught_ joined #git
22:44 shader is there a good way to apply the difference between two commits, rather than the changes made between those commits?
22:46 _ikke_ What's the difference? (no pun intended)
22:47 Poppabear joined #git
22:47 martinkl_ joined #git
22:49 Poppabear question about git for windows, not sure why but it doesn't install to C:\Program Files (x86)\Git\ ... instead its installed in C:\Users\USER\AppData\Local\Programs\Git\ ...
22:49 Poppabear is there something i am missing ?
22:53 edaught__ joined #git
22:55 ResidentBiscuit joined #git
22:59 mwhooker joined #git
23:00 Jon28 joined #git
23:01 rolha joined #git
23:02 wuppas joined #git
23:03 AustinMatherne joined #git
23:05 werwe joined #git
23:08 paws_ joined #git
23:09 Poppabear anyone ?
23:12 hahuang61 joined #git
23:15 WaReZ joined #git
23:15 HoierM joined #git
23:17 HanClinto joined #git
23:19 citizen-stig joined #git
23:24 GavinMagnus left #git
23:27 azwieg103 joined #git
23:28 spudowiar Poppabear: installs without administrator permission it seems
23:28 spudowiar idk, I'm not using Windows :)
23:29 spudowiar I use a superior OS
23:29 romerocesar joined #git
23:29 sythe joined #git
23:29 sythe Hey
23:30 Poppabear yea i get it, but i did install with admin privs .. but whatever its not that important, just references on internet assumes its installed in the programs directories
23:30 rolha joined #git
23:31 sythe How would I check out the latest version of a repo to an alternate directory, instead of overwriting/updating my working copy?
23:31 fuchstronaut joined #git
23:31 pwnz0r joined #git
23:32 Mannequin joined #git
23:32 lindenle joined #git
23:33 ffabi joined #git
23:33 FuzzySockets joined #git
23:34 Poppabear left #git
23:38 cdg joined #git
23:39 zumba_addict joined #git
23:39 lb sythe you can set the env var GIT_WORK_TREE to what ever dir you like, do the checkout and unset it
23:39 sythe oh
23:39 sythe well
23:39 sythe Guess I should have waited for an answer then
23:39 sythe ¯\_(ツ)_/¯
23:39 lb ^^
23:41 lb btw, you also manipulate the index the object dir and of course the GIT_DIR itself with env vars. see https://git-scm.com/book/uz/v2/Git-Internals-Environment-Variables as reference
23:41 zumba_addict hey folks, not sure if my steps are correct. I created a feature branch from master. I'd like to merge it back to master. However, I think our master got updated. So I need to update my feature branch. This is what I'll do. 1. git checkout feature 2. git merge master 3. Fix conflicts 4. git push origin feature 5. Create a pull request
23:42 MattMaker joined #git
23:42 lb zumba_addict correct assuming the workflow of feature branches that are merged by an integrator
23:42 lb (or pull request aka github style)
23:42 zumba_addict got it
23:42 zumba_addict i can rebase it too right?
23:42 lb if you didn't pushed it before
23:43 lb otherwise !rewrite would apply
23:43 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
23:43 zumba_addict which branch?
23:43 lb the branch you want to rebase
23:43 lb (feature in your case)
23:43 zumba_addict what if I squash it?
23:43 lb same answer ;)
23:43 zumba_addict i remember the term squash used often by my teammate
23:43 zumba_addict then he would use -force something
23:44 lb zumba_addict --forece implies bad stuff
23:44 lb --force*
23:44 zumba_addict ok
23:44 zumba_addict i'm looking up my notes on how I did it before
23:44 lb zumba_addict you can rebase and squash and all
23:44 lb with unpushed ( unpublished) history
23:44 zumba_addict k
23:45 lb if you pushed it before, merge is the better option
23:45 lb (merge is almost always the better option :D )
23:45 zumba_addict i found my notes, posting it and tell me what you think
23:45 lb !pastebin please
23:45 gitinfo [!paste] Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
23:46 reim joined #git
23:46 zumba_addict http://pastebin.com/TvA6B5M8
23:46 zumba_addict oh, i know pastebin :)
23:47 zumba_addict i wrote that when my teammmate was also on my cube
23:47 zumba_addict he was telling me what to execute
23:48 zumba_addict i think merge is better because the changes I made on my feature are the same files that were updated on master
23:48 HanClinto joined #git
23:48 lb zumba_addict why would you do that? force pushing is an emergency option and not recommended (nor useful) in a normal workflow
23:48 zumba_addict that's how they do it
23:48 zumba_addict i just wrote that in my notes
23:48 lb zumba_addict bad habit ;)
23:48 mingrammer joined #git
23:49 zumba_addict ok. we do that often if in case the master gets updated and we have an existing merge request
23:49 zumba_addict when we open our merge request, we see conflicts. Then we'll do the command i posted
23:49 lb zumba_addict just remerge master into feature and push feature again to origin
23:49 zumba_addict k
23:50 Neal_ joined #git
23:51 lb zumba_addict and keep an eye out for parameters like --force, --hard and such ;) usually you should know what they are doing before executing them. usually they can lead to data loss if used incorrectly
23:51 zumba_addict git merge master is correct right?
23:51 lb assuming you've done "git checkout feature" before yes
23:52 zumba_addict yup
23:52 zumba_addict btw, i saw this from my notes - git merge --squash
23:53 lb man git merge and see if that fits your needs
23:53 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
23:53 reim joined #git
23:53 zumba_addict k
23:54 pwnz0r joined #git
23:55 lb bedtime for me. gn8
23:55 ffabi joined #git
23:55 zumba_addict thanks
23:55 axl_ joined #git
23:58 ResidentBiscuit joined #git
23:59 mingrammer joined #git

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