Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-21

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

All times shown according to UTC.

Time Nick Message
00:03 vjacob joined #git
00:04 vjacob joined #git
00:05 mostlybadfly joined #git
00:09 aidalgol joined #git
00:10 sangy joined #git
00:12 citizen-stig joined #git
00:13 SirOliver joined #git
00:14 Gsham joined #git
00:16 apotry joined #git
00:16 mehola joined #git
00:21 andy_wfc joined #git
00:22 ToxicFrog left #git
00:23 tesuji_ joined #git
00:25 thekrynn_ joined #git
00:28 andy_wfc1 joined #git
00:30 fahadash joined #git
00:30 andy_wfc1 joined #git
00:33 fuchstronaut joined #git
00:35 wethu joined #git
00:37 zacts joined #git
00:37 lugzer joined #git
00:37 SirOliver joined #git
00:37 yorgi_ joined #git
00:38 acetakwas joined #git
00:39 dsantiago joined #git
00:42 dsantiago joined #git
00:45 snowkidind joined #git
00:47 danslo joined #git
00:49 mingrammer joined #git
00:51 inflames joined #git
00:51 xall i have a .gitignore rule: *.dSYM/
00:51 Gsham joined #git
00:51 xall it doesn't seem to work
00:52 snowkidind joined #git
00:54 arescorpio joined #git
00:55 snowkidind joined #git
00:56 tahder joined #git
00:58 foul_owl joined #git
00:58 foul_owl How do I list all branches that have ever existed on origin?
00:58 cyphase joined #git
00:59 thiago you do not
00:59 thiago you can only list branches that currently exist
01:00 foul_owl I thought git saves all changes?
01:00 foul_owl As in, everything done to a repo?
01:00 a_thakur joined #git
01:00 thiago no, it doesn't
01:01 foul_owl Ah ok
01:01 foul_owl Thanks!
01:01 thiago if you delete a branch, it's gone
01:01 foul_owl Gotcha
01:02 mwhooker joined #git
01:03 pks joined #git
01:05 durham_ joined #git
01:05 cagmz joined #git
01:09 pur3eval joined #git
01:12 cagmz joined #git
01:13 l4v2 joined #git
01:15 cagmz_ joined #git
01:15 dtrott joined #git
01:18 PioneerAxon joined #git
01:18 Limes_ joined #git
01:21 cqi joined #git
01:22 rbern joined #git
01:24 texinwien_ joined #git
01:28 Sucks joined #git
01:29 ochorocho__ joined #git
01:29 snowkidind joined #git
01:30 MZAWeb_ joined #git
01:30 lindenle joined #git
01:31 lugzer joined #git
01:33 Dougie187 joined #git
01:35 jost_ joined #git
01:35 Corosauce joined #git
01:37 xall joined #git
01:37 diegoviola I want to squash some commits into 1, but the older ones appear first
01:37 diegoviola after I do git rebase -i HEAD~13
01:37 diegoviola what can I do in this case?
01:38 eroussel joined #git
01:38 dunpeal joined #git
01:38 kadoban diegoviola: I don't understand?
01:39 diegoviola I'm trying to pick a few commits in the rebase but the older ones appear first
01:39 dsantiago joined #git
01:39 diegoviola in the rebase -i
01:39 diegoviola so git says I cannot squash
01:40 diegoviola Cannot 'squash' without a previous commit
01:41 diegoviola I set all to squash and the newest one (that appears at the bottom of the rebase -i) to pick
01:41 kadoban Well, that's not the order that commits are in in rebase -i. Newest is first. I think you just have the order wrong.
01:41 kadoban IOW pick should be first, and then all the ones you want to squash into it.
01:45 diegoviola yes but the older commits are shown first
01:45 diegoviola is that ok?
01:45 kadoban Are there merges involved or something?
01:45 diegoviola no
01:45 kadoban Then ...I don't believe you?
01:45 diegoviola well
01:45 kadoban Oh, maybe I'm just wrong.
01:45 diegoviola I'm on my own branch
01:45 diegoviola I did a rebase earlier
01:45 diegoviola with develop branch
01:45 thiago is the first line pick?
01:45 Rodya_ joined #git
01:45 kadoban Yeah, commits are in order of oldest first. If you want to squash a bunch together though, the one with pick should be near the top, and then the ones to squash into that after that.
01:46 diegoviola thiago: no
01:46 thiago diegoviola: ok, problem found
01:46 diegoviola ok let me try that
01:48 danslo joined #git
01:48 HoierM joined #git
01:48 fooobarrr joined #git
01:49 RustyShackleford joined #git
01:49 diegoviola problem solved indeed, thanks
01:49 RustyShackleford Right now I'm working on my own branch which diverges from master
01:49 tesuji joined #git
01:50 fooobarrr im trying to use git mergetool with vimdiff but when I run "git mergetool" it looks like vimdiff tries to launch, but then gets paused. I receive the following output at stdout: "[1]+  Stopped                 git mergetool --no-prompt"
01:50 RustyShackleford as work gets merged into master, I would like to keep my branch up to date
01:50 RustyShackleford at the same time, i'd like to merge my work into master periodically
01:50 RustyShackleford rebase works great the first time
01:51 RustyShackleford I found when I rebased my branch again, every commit I've ever had on that branch is fast forwarded... even the ones that were already merged into master
01:51 thiago fooobarrr: did you run git mergetool under a pipe, redirected somewhere?
01:52 thiago RustyShackleford: rebase is the correct solution. Rebase your branch on top of master
01:52 thiago and make sure you do that before you merge your branch to master
01:53 RustyShackleford okay suppose I did that. Then I continue working on my feature in that same branch, so it's diverging again
01:53 thiago yes
01:53 fooobarrr thiago: not that im aware of... I'm running "git mergetool" on the command line in the directory with the .git/ directory
01:53 durham joined #git
01:54 RustyShackleford a rebase is not the right solution anymore, is it?
01:54 thiago RustyShackleford: it is
01:54 fooobarrr I also then can try "fg" several times
01:54 fooobarrr eventually after typing "fg" a logout is somehow sent to the prompt - which is very strange
01:54 RustyShackleford tried to do it earlier today. A bunch of stuff that was already merged into master is included in part of the rebase
01:55 thiago fooobarrr: for some reason, your shell job control is sending SIGTTIN to vimdiff. Sorry, not a Git question.
01:55 RustyShackleford isn't that a problem? I would have to force push to master
01:55 thiago RustyShackleford: you did something wrong the previous time
01:55 thiago RustyShackleford: when you rebase on top of master, master must include those commits that were merged
01:55 thiago so they won't get rebased
01:56 RustyShackleford hmm I wonder what I could have done wrong
01:57 thiago you didn't merge correctly
01:57 thiago if rebase rebased those commits, then they weren't in master (as git understood master to be)
01:58 RustyShackleford so here's the outline. I'm working on mybranch, periodically backing up to my remote repo. Then I git rebase master, fix any merge conflicts, and git push --force origin mybranch
01:58 clemf joined #git
01:58 RustyShackleford it was then merged in via bitbucket's pull request
01:58 thiago I'm reading that as "it was merged by <unknown method with unknown consequences>"
01:59 RustyShackleford bingo
01:59 thiago I don't know what it does, since I've never used bitbucket
01:59 RustyShackleford do you really think it's bitbucket's pull request system?
02:00 kadoban RustyShackleford: It sounds to me like what you're doing should be working how you expect it. I'm not really sure what you're seeing though. Possibly one of your peers did something funky?
02:00 thiago you must be familiar with it, if you're using it. If you're not, either become familiar or stop using the feature.
02:00 thiago the most likely scenario is that you did merge, but didn't fetch since the merge, so your master branch was behind
02:00 kadoban RustyShackleford: Probably not, IMO. It should just be doing a merge really. Maybe it has settings that let you do something funky?
02:01 RustyShackleford so after you rebase the feature branch, how should you merge into master?
02:01 RustyShackleford just a git merge mybranch master?
02:01 belak RustyShackleford: When you force push, is it listed as "closed" or "merged"?
02:01 RustyShackleford force push to my own feature branch, not to master
02:01 belak Yes
02:02 belak Is the PR listed as "closed" or "merged"?
02:02 thiago RustyShackleford: you rebase if you want to
02:02 thiago you merge if you want to
02:02 RustyShackleford merged
02:02 RustyShackleford belak, ^
02:02 belak RustyShackleford: even when it isn't on master?
02:02 thiago but if you want to merge a feature branch to master, I recommend first rebasing the feature branch, then merging
02:03 RustyShackleford basically what I'm trying to do, yeah
02:03 thiago after that point, the master branch will be equal to or a superset of the feature branch
02:03 RustyShackleford belak, yep
02:03 belak Hm, that doesn't seem right. Do you have a repo with an example?
02:03 miketo joined #git
02:03 RustyShackleford not one that I can share with you lol
02:03 thiago if you did a merge with --no-ff, then merge or rebase the feature immediately after, before making more commits.
02:05 pks joined #git
02:07 mingrammer joined #git
02:10 stonerfish joined #git
02:12 watabou_ joined #git
02:12 hexagoxel joined #git
02:13 citizen-stig joined #git
02:17 mehola joined #git
02:19 chachasmooth joined #git
02:21 bulletmark joined #git
02:21 clemf_ joined #git
02:22 RustyShackleford how do I pull in newest changes from master branch before rebasing?
02:22 RustyShackleford git fetch?
02:22 RustyShackleford do I have to checkout master first?
02:25 lugzer joined #git
02:26 zivester joined #git
02:28 netj joined #git
02:31 rgrinberg joined #git
02:32 jokajak joined #git
02:36 rudi_s RustyShackleford: git fetch will get the latest version of that remote. - No, you can just rebase ontop the remote reference after you've fetched it.
02:39 Faylite joined #git
02:39 droids___ joined #git
02:41 cqi joined #git
02:41 droids___ left #git
02:41 harish_ joined #git
02:42 xxthink joined #git
02:44 raijin joined #git
02:44 xxthink when I use git format-patch to create some patchs, how to presever the origin commit id when I use git am to apply these patches.
02:44 rafalcpp joined #git
02:44 jimi_ joined #git
02:46 RustyShackleford rudi_s, so git fetch grabs all changes from all branches
02:46 RustyShackleford correct?
02:46 xxthink I want to track the remote changes from the opensource project.
02:46 RustyShackleford well, all of the ones you've checkout out in your local repository
02:46 rudi_s RustyShackleford: Yes (unless configure otherwise).
02:47 boombatower joined #git
02:47 rudi_s xxthink: You can't.
02:47 rudi_s RustyShackleford: Checking out is unrelated to this.
02:48 RustyShackleford i've always just used git pull
02:48 xxthink :(
02:48 RustyShackleford but I was always working by myself
02:48 RustyShackleford I recently learned what a pain in the ass it is
02:48 gma_ joined #git
02:48 thiago xxthink: you do not.
02:48 thiago xxthink: if you git am, the SHA-1 changes. Period.
02:48 danslo joined #git
02:49 thiago if you want to track some other way, you can. It's your own solution, though.
02:49 rudi_s RustyShackleford: You could also use git pull --rebase, but I prefer fetching first and then - after looking at the changes - do the merge/rebase/.. manually.
02:49 xxthink then how to preserve the SHA-1 ? any other solution?
02:49 thiago xxthink: don't use format-patch / am
02:49 rudi_s xxthink: fetch + merge
02:49 thiago xxthink: use fetch and merge
02:50 rafalcpp joined #git
02:50 xxthink ok, I will google these commands.
02:50 bayman joined #git
02:52 bayman how do i force git pull? i deleted a file and it says Already up-to-date.
02:52 thiago bayman: git is correct. You're up to date.
02:52 thiago bayman: there's nothing to be pulled.
02:53 thiago there may be other things to be pulled, but if you want those pulled, you have to tell git what.
02:53 safe joined #git
02:54 watabou_ joined #git
02:55 bayman how do i tell git to pull the file i deleted?
02:56 thiago bayman: git pull doesn't work on files. It works on commits.
02:59 rafalcpp joined #git
03:00 elsevero joined #git
03:03 cyphase joined #git
03:03 johnny56_ joined #git
03:04 rafalcpp joined #git
03:06 Zoxc joined #git
03:10 govg joined #git
03:10 rafalcpp joined #git
03:12 jyjon joined #git
03:15 stantonk joined #git
03:17 lindenle joined #git
03:18 MattMaker joined #git
03:18 sangy joined #git
03:18 Dougie187 left #git
03:18 catag87 joined #git
03:19 rafalcpp joined #git
03:20 khizar joined #git
03:20 k3rn31 joined #git
03:28 lindenle joined #git
03:28 durham joined #git
03:29 ochorocho__ joined #git
03:32 durham joined #git
03:33 Andrew_K joined #git
03:34 HanClinto joined #git
03:35 Goplat joined #git
03:35 dtrott joined #git
03:36 fuchstronaut joined #git
03:37 stantonk joined #git
03:38 raijin joined #git
03:38 rafalcpp joined #git
03:45 moop joined #git
03:45 raijin joined #git
03:46 dtrott joined #git
03:46 a_thakur joined #git
03:47 a_thakur_ joined #git
03:47 alexsystemf__ joined #git
03:47 f3r70rr35f joined #git
03:48 robotroll joined #git
03:48 dtrott joined #git
03:49 danslo joined #git
03:51 naught101 joined #git
03:52 naught101 I have two branches, with different versions of a script that have slightly different functionality. I want to merge them so that both functionalities can be used, with a switch. A simple merge will basically just over-write one with the other. I need to add the switch logic kind of during the merge, ot make the history make sense.
03:52 naught101 Is there a sensible way to do this?
03:53 raijin joined #git
03:53 naught101 I guess it's a kind of dirty merge...
03:55 thiago git merge, then edit the file so that it does what you want, then commit
03:55 stantonk joined #git
03:56 xall_ joined #git
03:56 snowkidind joined #git
03:57 JustAnotherIdiot joined #git
03:57 JustAnotherIdiot hello
03:57 gitinfo JustAnotherIdiot: 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.
03:57 bayman left #git
03:58 nilg joined #git
03:58 justanotheruser JustAnotherIdiot: please
03:58 rafalcpp joined #git
03:58 fstd joined #git
04:00 naught101 thiago: yeah, fair enough
04:06 howdoi joined #git
04:09 mingrammer joined #git
04:13 turnstileJumper joined #git
04:14 rafalcpp joined #git
04:14 phanimahesh joined #git
04:15 citizen-stig joined #git
04:16 xall_ joined #git
04:18 mehola joined #git
04:21 catag87 joined #git
04:21 Rodya_ joined #git
04:21 cyan__ joined #git
04:26 dsdeiz joined #git
04:27 Vaelatern joined #git
04:28 JanC joined #git
04:31 k3rn31 joined #git
04:34 subhojit777 joined #git
04:35 ahr3n joined #git
04:36 dhruv2204 joined #git
04:36 watabou_ joined #git
04:38 zincrokx joined #git
04:40 MattMaker joined #git
04:42 _Raiz joined #git
04:42 _Raiz is there any way to setup a git repo locally?
04:43 kadoban Yes
04:44 kadoban That's one of git's strengths, you need not be connected to a central server. A repo is just a specially set up directory.
04:44 grawity that's more or less how git always works
04:44 _Raiz git init && git remote add origin ?
04:45 hahuang61 joined #git
04:46 kadoban Well, git init is really all you need, but the second is a decent bet too in most cases.
04:47 grawity you'll usually want `git init --bare` for the "central" repo that you'll be pushing to/pulling from
04:49 SimonNa joined #git
04:50 danslo joined #git
04:50 bayman joined #git
04:51 bayman how to add a file to .gitignore when it's already being tracked?
04:52 grawity untrack it
04:52 grawity i.e. `git rm --cached`
04:52 kadoban bayman: You can add it to .gitignore, but .gitignore has no effect on already tracked files, so yeah you'd have to untrack it.
04:54 rafalcpp joined #git
04:55 mingrammer joined #git
04:56 freimatz joined #git
04:56 Cabanossi joined #git
05:01 MattMaker joined #git
05:02 mehola joined #git
05:06 emPi joined #git
05:06 watabou_ joined #git
05:07 Rodya_ joined #git
05:09 muthu joined #git
05:09 l4v2 joined #git
05:09 oldcrow joined #git
05:09 MattMaker joined #git
05:15 david007 joined #git
05:16 zacts joined #git
05:16 watabou_ joined #git
05:16 david007 joined #git
05:18 lindenle joined #git
05:24 nidr0x joined #git
05:25 sdaugherty joined #git
05:26 sdaugherty Oh, wow, CVS survivor's meetings?
05:26 Repox joined #git
05:27 david007 joined #git
05:29 cdown_ joined #git
05:29 david007 joined #git
05:30 ochorocho__ joined #git
05:35 MattMaker joined #git
05:39 _Raiz left #git
05:41 bayman left #git
05:42 zeroed joined #git
05:43 MattMaker joined #git
05:43 romerocesar joined #git
05:45 jaguarmagenta joined #git
05:46 Captain_Ramius joined #git
05:46 stantonk joined #git
05:47 vdv joined #git
05:49 xall_ joined #git
05:51 danslo joined #git
05:54 monde joined #git
05:54 Rish joined #git
05:56 a_thakur joined #git
05:57 PioneerAxon joined #git
05:59 settermjd joined #git
06:00 leeN joined #git
06:02 Rish joined #git
06:05 rscata joined #git
06:05 cuebix-wk joined #git
06:15 gma_ joined #git
06:15 sctskw joined #git
06:15 jceb joined #git
06:16 phanimahesh osse: You had a repo with nice ascii diagrams, rigjt? fetch me the rebase doc, please?
06:16 cdown joined #git
06:16 phanimahesh Nvm, found it in history.
06:18 dunpeal joined #git
06:19 paatalaBhairavi joined #git
06:24 a_thakur joined #git
06:28 Gonzo89 joined #git
06:33 sanscheese joined #git
06:35 ome joined #git
06:35 zacts joined #git
06:36 Electrometro joined #git
06:37 durham joined #git
06:37 blackwind_123 joined #git
06:38 cyan__ joined #git
06:41 MattMaker joined #git
06:41 Orbitrix joined #git
06:41 lordjancso joined #git
06:42 circ-user-03wEf joined #git
06:44 elsevero joined #git
06:45 dopesong joined #git
06:46 dsdeiz joined #git
06:46 dsdeiz joined #git
06:48 PioneerAxon joined #git
06:48 MattMaker joined #git
06:49 stantonk joined #git
06:49 leeN joined #git
06:49 lindenle joined #git
06:49 qt-x joined #git
06:50 C4ta|Work joined #git
06:50 danslo joined #git
06:53 zacts joined #git
06:55 Darcidride joined #git
06:56 k3rn31 joined #git
06:58 dreiss joined #git
07:01 docnvk joined #git
07:01 talin_ left #git
07:01 cdown_ joined #git
07:03 [Brain] joined #git
07:05 Lvjasha joined #git
07:07 encod3 joined #git
07:08 MattMaker joined #git
07:08 watabou_ joined #git
07:09 encod3 joined #git
07:09 sanscheese joined #git
07:10 baako joined #git
07:11 TomyWork joined #git
07:12 ElChicoNube joined #git
07:12 Bladdezz joined #git
07:12 xall_ joined #git
07:13 yuhlw_ joined #git
07:14 dtrott joined #git
07:14 Macaveli joined #git
07:15 encod3 joined #git
07:16 dopesong joined #git
07:17 nuc joined #git
07:17 mariuscc joined #git
07:18 mflow joined #git
07:19 Hounddog joined #git
07:20 citizen-stig joined #git
07:22 p4trix joined #git
07:23 GavinMagnus joined #git
07:23 Faylite_ joined #git
07:25 watabou_ joined #git
07:25 Sucks joined #git
07:25 apotry joined #git
07:26 fuchstronaut joined #git
07:28 interne7y joined #git
07:29 dopesong joined #git
07:29 Balliad joined #git
07:31 cuebix-wk joined #git
07:31 ochorocho__ joined #git
07:31 _ikke_ sdaugherty: Talk to Eugene for info :P
07:34 spearsec-lonny joined #git
07:34 Balliad joined #git
07:34 citizen-stig joined #git
07:35 lugzer joined #git
07:35 spearsec-lonny hey guys, quick question. If I clone using "https://username:password@....", even though its https, the password is sent as plaintext right? I was under the impression that the body of the request was encrypted, not the destination
07:35 troulouliou_div2 joined #git
07:37 spearsec-lonny oh wait - thats false im wrong nvm
07:37 spearsec-lonny sorry
07:37 kadoban spearsec-lonny: Yeah it's encrypted, along with the actual URL and whatever too (not the domain though, really, that'd be kind of impossible)
07:37 ache1 joined #git
07:40 dopesong joined #git
07:42 Macaveli joined #git
07:42 _ikke_ Only due to SNI, otherwise, just the IP would leak
07:43 _ikke_ though, the certificate would tell it too
07:43 dopesong joined #git
07:46 kadoban Well I was thinking of the DNS lookup too, but yeah.
07:46 ramsub07 joined #git
07:47 aax joined #git
07:49 wethu joined #git
07:49 multi_io_ joined #git
07:49 dopesong joined #git
07:50 texinwien_ joined #git
07:51 MattMaker joined #git
07:51 naught101 joined #git
07:54 ahmedelgabri joined #git
07:56 dopesong joined #git
08:00 dopesong joined #git
08:01 gma_ joined #git
08:06 MattMaker joined #git
08:07 ElChicoNube joined #git
08:09 clmsy joined #git
08:10 moriko joined #git
08:12 bongjovi joined #git
08:13 bailon joined #git
08:14 Silenced joined #git
08:14 Silenced joined #git
08:16 zeroed joined #git
08:16 kab joined #git
08:17 fuchstronaut joined #git
08:17 GavinMagnus joined #git
08:20 blur3d joined #git
08:20 dopesong joined #git
08:21 chll_ joined #git
08:24 nnyk joined #git
08:25 MattMaker joined #git
08:26 filcab joined #git
08:27 kurkale6ka joined #git
08:29 a_thakur joined #git
08:29 freimatz joined #git
08:30 playfullyExist joined #git
08:30 RajRajRaj joined #git
08:30 RajRajRaj how do i accept incoming changes after looking at the difference in git in eclipse
08:34 mrkat joined #git
08:35 kadoban RajRajRaj: GUIs and IDE integrations don't get very good support here, not enough of the knowledgeable people use them. If you don't get an answer in a while, you could try somewhere eclipse specific.
08:35 RajRajRaj kadoban:  did that. waiting for answer in there as well
08:38 apotry joined #git
08:40 jceb joined #git
08:41 spudowiar joined #git
08:42 playfullyExist joined #git
08:45 jstein joined #git
08:46 a_thakur_ joined #git
08:48 a_thakur joined #git
08:48 fuchstronaut joined #git
08:52 nnyk joined #git
08:52 lindenle joined #git
08:56 MattMaker joined #git
08:57 notebox joined #git
08:59 tvw joined #git
09:00 ochorocho__ joined #git
09:01 ncd|leeN joined #git
09:02 notebox joined #git
09:04 Felishia joined #git
09:04 Felishia joined #git
09:04 Felishia halp
09:04 Felishia how do I push to git D:
09:04 Felishia with my ssh key
09:04 dan2k3k4 joined #git
09:06 King_Hual joined #git
09:06 King_Hual joined #git
09:06 Xatenev joined #git
09:06 Xatenev git is broken
09:06 Xatenev yey
09:06 Xatenev xD
09:09 Eryn_1983_FL joined #git
09:10 irco joined #git
09:11 Felishia it's been 5 minutes doing a pull
09:12 Felishia come on
09:12 mflow joined #git
09:14 mischat joined #git
09:15 Felishia git is taking too long
09:15 Felishia and I have to retry too much
09:19 sgen joined #git
09:20 playfullyExist joined #git
09:23 edaught__ joined #git
09:24 Xatenev left #git
09:26 sdothum joined #git
09:28 edaught_ joined #git
09:28 jceb joined #git
09:28 nnyk_ joined #git
09:29 noidea joined #git
09:29 noidea joined #git
09:30 mbreedlove joined #git
09:32 guardian hello, is git cherry-pick XXX YYY where XXX and YYY are 2 different SHA1s supposed to work?
09:33 MattMaker joined #git
09:33 guardian I'm pretty sure I used to do git cherry-pick XXX YYY ZZZ to cherry pick a series of commits
09:33 guardian and now git tells me "error: a cherry-pick or revert is already in progress"
09:34 Felishia help
09:34 PCatinean joined #git
09:34 Felishia git has a bug, or linux has a bug, or something...
09:35 vktec Felishia: What are you trying to do?
09:35 Felishia vktec, clone
09:35 vktec What repo?
09:35 Felishia it works only 33.33% of the time
09:35 fuchstronaut is there an easy way to reset the timestamp of all commits before i push them?
09:35 Felishia my own repos
09:36 Felishia the problem is that it works sometimes, and sometimes not
09:36 Felishia same with pull, push, fetch... etc...
09:36 vktec Hmm... that's strange
09:36 vktec Where is the remote?
09:36 Felishia bitbucket
09:36 vktec Okay...
09:36 Jellyg00se joined #git
09:37 Felishia for the other guy it works perfectly
09:37 vktec It _might_ just be your internet connection
09:37 Felishia and we are in the same network
09:37 vktec What's the error?
09:37 Felishia no error
09:37 Felishia it just hangs
09:37 vktec Strange...
09:39 vktec How are you cloning? Using ssh or https?
09:39 Felishia ssh
09:41 vktec What's the full output from the git clone command? (paste somewhere like http://paste.debian.net/)
09:42 Felishia http works just fine
09:42 Felishia vktec, it only says cloning into 'myrepo'
09:42 Felishia and that's it
09:42 Felishia so it only affects ssh
09:42 vktec Okay
09:43 Felishia I have something
09:43 vktec Try doing `ssh git@github.com` and see if you can connect
09:43 Felishia vktec, https://gist.github.com/anonymous​/a96e143532bb32f47ffb47b5eb453ca9
09:43 Felishia that one works
09:44 Felishia actually it's like the more the objects the more likely the repo is to fail
09:44 vktec Wait, that gist is an error from a git clone?
09:44 Felishia yes
09:44 vktec Whoa
09:44 Felishia it looks like kernel something
09:45 vktec When did you last update git, out of curioslty
09:45 vktec Felishia: It's a C stack trace
09:45 Felishia I just installed it yesterday
09:45 vktec Okay
09:45 Felishia I got another computer
09:45 Felishia 2.7.4
09:46 naught101 joined #git
09:46 vktec Try `ssh git@bitbucket.com` to see if it's an issue with Bitbucket
09:47 vktec Felishia: If it's a new computer, have you updated your SSH keys?
09:47 ahr3n joined #git
09:47 Felishia vktec, it works sometimes, the ssh config is fine
09:47 NeverDie_ joined #git
09:47 vktec That's true...
09:48 MattMaker joined #git
09:49 apotry joined #git
09:49 mingrammer joined #git
09:49 vktec Also, perhaps your firewall is (intermittently) blocking the connection?
09:50 Gonzo89 joined #git
09:50 watabou_ joined #git
09:50 romerocesar joined #git
09:51 Felishia vktec, which firewall?
09:51 Felishia I have no firewall
09:51 vktec What OS are you running?
09:52 Felishia Ubuntu 16.04 LTS
09:52 vktec And it's a fresh install, right?
09:52 doev joined #git
09:53 moei joined #git
09:54 doev Hi. Everytime I push to upstream, I got a message: "Push is about to create a new Branch "master" in the repository. Continue (y/n)" .... is there something wrong?
09:54 SirOliver joined #git
09:57 dsdeiz joined #git
10:01 wethu joined #git
10:05 phanimahesh joined #git
10:06 gma_ joined #git
10:07 Corneliu joined #git
10:07 MattMaker joined #git
10:07 xall_ joined #git
10:09 Chiko joined #git
10:11 aspiers joined #git
10:11 CaptainQuirk joined #git
10:11 CaptainQuirk Hi folks
10:12 CaptainQuirk I'm in the middle of an interactive rebase
10:12 CaptainQuirk I just got a conflict
10:12 CaptainQuirk I solved it
10:12 i7c Awesome. ;)
10:12 CaptainQuirk and was ready to go on with --continue when I thought about launching my test suite
10:12 CaptainQuirk my test failed
10:13 CaptainQuirk I have a class in which two functions have been dupplicated
10:13 CaptainQuirk by rebase I guess
10:13 CaptainQuirk is it a good id to remove two of them at this stage ?
10:14 i7c That’s hard to tell. You can remove them and stage the change and continue. Might be that you run into similar situation again at a later point in rebase but there is no harm in doing it, if it is what you want.
10:15 kab doev: if you don't have that branch on upstream, that's ok
10:16 mbreedlove joined #git
10:20 watabou_ joined #git
10:20 fuchstronaut joined #git
10:22 jceb joined #git
10:23 rahtgaz joined #git
10:23 rahtgaz joined #git
10:23 catag87 joined #git
10:24 CaptainQuirk it's a feature branch that has an upstream but it's not shared by anyone else
10:25 cyan__ joined #git
10:25 Meteorhead joined #git
10:26 OnkelTem joined #git
10:27 CaptainQuirk you mean it could be that going on with rebase will recopy those lines again ?
10:27 kedare joined #git
10:28 DieguezZ joined #git
10:35 i7c Depends on how smart your commits were, I guess.
10:35 i7c Just go for it, you have nothing to lose. :P
10:37 naught101 joined #git
10:38 MattMaker joined #git
10:42 texinwien_ joined #git
10:43 mischat joined #git
10:44 dan2k3k4 joined #git
10:44 stantonk joined #git
10:46 _ikke_ Under normal circumstances a rebase should never duplicate content
10:48 wethu joined #git
10:50 Silenced joined #git
10:50 Silenced joined #git
10:53 bruce_lee joined #git
10:53 bruce_lee joined #git
10:56 mischat joined #git
10:56 rafalcpp joined #git
10:58 dopesong joined #git
11:01 yorgi_ joined #git
11:01 ochorocho__ joined #git
11:05 dopesong joined #git
11:06 osse phanimahesh: my most sincere apologies, sir. I was aslumber.
11:08 aspiers joined #git
11:10 Lunatrius` joined #git
11:10 pcre joined #git
11:12 star_pro_ joined #git
11:12 encod3 joined #git
11:14 Lunatrius` joined #git
11:15 MattMaker joined #git
11:17 ojdo joined #git
11:18 raijin joined #git
11:19 fuchstronaut is there an easy way to reset the timestamp of all commits before i push them?
11:19 HoierM joined #git
11:19 dopesong joined #git
11:19 tvw joined #git
11:20 rnsanchez joined #git
11:21 i7c _ikke_, I understood that his other branch was doing that.
11:21 i7c Might be wrong tho.
11:22 CaptainQuirk i7c
11:22 CaptainQuirk I dit it
11:23 CaptainQuirk I saw the effect of my rerere setting for the first time
11:23 jast fuchstronaut: I'm assuming you mean all commits that haven't been pushed yet, and you mean the author timestamp rather than the committer timestamp?
11:23 CaptainQuirk was a bit unsettling
11:24 fuchstronaut jast: I want to hide if I was working at night i.e., so I guess I mean the author timestamp of all commits that are to be pushed next for a certain branch
11:25 fuchstronaut kind of making a diff of origin/branch and branch, manipulating the timestamps and then doing a push
11:25 jast okay, sure, you can do that
11:25 jast assuming your upstream config is correct, it's basically this:
11:26 Bladdezz joined #git
11:26 jast git rebase -i -x 'git commit --amend --reset-author -C HEAD'
11:26 dan2k3k4 joined #git
11:26 jast first make sure your local branch is up-to-date (e.g. git pull --rebase)
11:26 jast actually, thinking about it that shouldn't matter
11:27 a_thakur joined #git
11:29 texinwien_ joined #git
11:30 Drzacek joined #git
11:30 Drzacek Hello
11:30 fuchstronaut so this will rebase the current branch ('git rebase') step by step (-i) using the following command (-x). The command will take the last commit (git commit), leave it as it is (--amend), reset the author (--reset-author), reuse the message (-C), is that right? @jast
11:30 fuchstronaut now what does HEAD do?
11:31 Drzacek HEAD is pointer to current branch
11:31 abhinav joined #git
11:31 Drzacek as I understand that
11:31 Bladdezz joined #git
11:32 lugzer joined #git
11:32 abhinav i accidentally commited a non project file to project. removed it now using git --cached rm file
11:32 abhinav how to make sure it wont stay there in the github in history also
11:32 osse abhinav: pretend it's sensitive and follow this guide: !sensitive
11:32 gitinfo abhinav: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
11:32 abhinav osse: it is
11:33 osse ok then you don't have to pretend
11:34 abhinav osse: how to install bfg
11:34 jaguarmagenta joined #git
11:34 osse abhinav: "See the BFG Repo-Cleaner's documentation for full usage and download instructions."
11:34 moritz abhinav: have you tried to google that?
11:35 jn__ joined #git
11:35 abhinav http://rtyley.github.io/bfg-repo-cleaner/ this page talks about "Usage"
11:35 settermjd joined #git
11:35 dopesong_ joined #git
11:35 osse download link to the top rgiht
11:36 mbreedlove joined #git
11:37 quackgyver joined #git
11:38 johnmilton joined #git
11:38 dopesong joined #git
11:40 encod3 joined #git
11:40 abhinav osse: i have to put  that jar inside my repo and then execute the command right?
11:40 osse i don't know
11:40 osse my guess is it can be anywhere and you can do  'java path/to/bfg.jar ... '
11:41 rtyu1120 joined #git
11:41 [Brain] joined #git
11:42 abhinav oh
11:44 mbreedlove joined #git
11:45 mehola joined #git
11:46 MattMaker joined #git
11:46 armyriad joined #git
11:48 dopesong joined #git
11:49 rgrinberg joined #git
11:49 srcerer joined #git
11:50 dopesong joined #git
11:51 MutantMahesh joined #git
11:51 romerocesar joined #git
11:54 Bladdezz joined #git
11:54 lindenle joined #git
11:55 rafalcpp joined #git
12:00 Marbug joined #git
12:01 rbern joined #git
12:01 notebox joined #git
12:02 ash_workz joined #git
12:02 tomog999_ joined #git
12:03 dopesong joined #git
12:04 abhinav osse: after everything is done, when i do git push origin --force --all it pushed to "my messed up "branch only right? and not to master
12:04 abhinav is that correct
12:05 synthroid joined #git
12:06 dopesong_ joined #git
12:07 pcre__ joined #git
12:08 a_thakur joined #git
12:08 abhinav man.
12:08 abhinav this is so horrible.
12:08 abhinav master -> master (forced update) means?
12:08 abhinav dont kill me please.
12:09 cbreak abhinav: it means something was non-fast-forward
12:09 cbreak i.e. a force push or force fetch
12:09 dopesong joined #git
12:09 MutantMahesh joined #git
12:10 cbreak abhinav: old history in master was killed, and replaced by the new one
12:10 cdown joined #git
12:10 cd-rum joined #git
12:11 abhinav cbreak: you might find me on streets soon.
12:11 abhinav thanks to git.
12:11 abhinav and linux command line.
12:12 abhinav cbreak: ok so, rewriting history of master. then it means it lost history of other cotributors?
12:12 dopesong joined #git
12:16 abhinav i dont know what you mean by rewrote master history. because in github it still shows all history of other contributors etc correct.
12:16 dopesong joined #git
12:16 abhinav thanks to my luck.
12:19 dopesong_ joined #git
12:20 cd-rum joined #git
12:20 rwb joined #git
12:22 phanimahesh abhinav: never use --force without explicit refspec.
12:22 abhinav phanimahesh: docs told me to
12:22 phanimahesh Or with --all, for that matter.
12:22 abhinav but i wall take care next time
12:22 phanimahesh abhinav: Which docs? let's get them corrected.
12:23 abhinav https://help.github.com/arti​cles/remove-sensitive-data/
12:23 l4v2 joined #git
12:23 phanimahesh Ah. if we are talking sensitive data rewriting everything is intended.
12:23 notebox joined #git
12:23 abhinav phanimahesh: now, how do i actually search in github for my removed file in history? to confirm that its really gone from current branch and history?
12:23 phanimahesh though it doesn't prevent others from digging that data up, if they know the commit ids
12:23 MattMaker joined #git
12:23 abhinav ok
12:24 star_pro_ joined #git
12:24 abhinav phanimahesh: how to make it real 100% gone?
12:24 phanimahesh abhinav: You can't.
12:24 abhinav :-(
12:24 jn__ left #git
12:24 phanimahesh Change all credentials.
12:24 abhinav phanimahesh: how do i get the commit ids for that file now?
12:24 phanimahesh And don't ever commit anything sensitive again.
12:24 catag87 joined #git
12:24 phanimahesh You'll have them probably in your reflog.
12:25 phanimahesh Others may have a copy if they cloned the repo before you cleaned it
12:25 abhinav phanimahesh: i cloned from upstream. created "Mybranch". committed wrong file to "mybranch". now removed that file from "mybranch" using that doc. is that enough?
12:25 abhinav phanimahesh: i have not yet merged "mybranch" to upstream master. shall i just delete my branch and create new branch for safety?
12:25 i7c Have you pushed?
12:25 i7c That branch.
12:25 abhinav i pushod to github. but did not merged to upsteram
12:26 phanimahesh Okay. Then if you force pushed my branch the changes are not easily accessible
12:26 i7c Then what phanimahesh applies.
12:26 abhinav phanimahesh: how can I access those commit ids?
12:26 i7c It’s still there. Somewhere. For some time.
12:26 abhinav i7c: how much time?
12:26 phanimahesh abhinav: Don't sweat over it. Difficult to say.
12:26 i7c Don’t know. Depends on github. And someone could have already pulled.
12:26 abhinav this is all private repo. not a public repo.
12:27 abhinav i7c: they dont.
12:27 abhinav i7c: no one pulled as of now.
12:27 phanimahesh Assume everything you accidentally made public is right on google home page for anyone to see, and change everything you'll change in that scenario
12:27 abhinav i7c: phanimahesh does deleting this branch completely, and created another makes it 100% safe?
12:27 phanimahesh abhinav: Nope.
12:27 abhinav phanimahesh: i told na, its not a public repo, but a private one.
12:27 i7c You can't get 100% safe because it’s already out there.
12:27 abhinav :-
12:27 abhinav (9
12:28 phanimahesh Once you commit something to git, it is very difficult to lose it. That's what makes git appealing for revision control.
12:28 i7c 100% safe is changing creds.
12:28 abhinav i dont understand how changing my github credential makes that file really go from everywhere?
12:28 i7c Not those.
12:28 abhinav then?
12:28 i7c The ones you committed by accident.
12:28 i7c :)
12:28 i7c Or whatever it was.
12:29 abhinav i did not commited any credentials. but a sensitive file with a sensitive data.
12:29 abhinav which is not password.
12:29 jeffreylevesque joined #git
12:29 abhinav personal file. kind of.
12:29 phanimahesh abhinav: Pray no one pulled that repo before you cleaned it up then.
12:29 abhinav phanimahesh: no one pulled.
12:29 abhinav i am 100% sure.
12:29 bremner you cannot be
12:30 phanimahesh IF you are sure, then everything is alright.
12:30 abhinav bremner: i can be. trust me.
12:30 bremner unless no one else has ever had permission
12:30 i7c Well it floats around as a blob on github now and if nobody guesses the hash maybe nobody will ever find it. :P
12:30 a_thakur_ joined #git
12:30 thoraxe joined #git
12:30 i7c Maybe you could delete the repo and make a new one.
12:30 abhinav bremner: they had permission. but it all just happend withoun 5 minutes. and others are busy working.
12:30 phanimahesh The odds of guessing it are astronomical. Let's not scare poor abhinav.
12:30 abhinav i7c: how can I find it then?
12:30 abhinav phanimahesh: thanks! :-)
12:30 i7c You can’t.
12:31 abhinav i7c: thats good news!
12:31 bremner abhinav: fine. You are using "100% sure" in a sense I happen to disagree with, but if you're happy...
12:31 abhinav bremner: its just a small team!
12:31 phanimahesh abhinav: here's some free advice: Never say you are 100% sure when it comes to security related stuff.
12:31 phanimahesh Often, no one is.
12:32 abhinav ok. taking extra care from now onwards.
12:32 dopesong joined #git
12:32 i7c Another free advice: git add selectively ;)
12:32 phanimahesh What if one of your team members has a server that automatically pulls everything once in a while?
12:32 abhinav right.
12:32 i7c Don’t do commit -a or crap like that.
12:32 phanimahesh let's say for testing
12:32 i7c usee add -p
12:32 abhinav using gui git program sow.
12:32 abhinav now*
12:32 abhinav phanimahesh: i will confirm if thats a case.
12:32 phanimahesh abhinav: get comfortable with git commands.
12:33 usm4n joined #git
12:33 abhinav yes.
12:33 TooLmaN joined #git
12:33 phanimahesh i7c: I gave a lecture just this week on how and why not to use git add -a
12:33 i7c If you ran add -p and you see "My diary of how I want to have a pony" on the terminal, you would have probably figured something went wrong. ;)
12:33 i7c phanimahesh, uh-huh.
12:34 i7c And why would that be.
12:34 phanimahesh I see repos full of IDE crap
12:34 i7c :)
12:34 phanimahesh because all tutorials taught them to do git add -a
12:34 phanimahesh or git commit -am
12:34 phanimahesh Many did not know that you can write a lengthier commit message
12:34 i7c add -a is not a thing. It’s -A! </smartassery>
12:35 i7c Yeah, well commit messages ...
12:35 i7c There are people here at work I really gave up on. :D
12:35 phanimahesh Most thought the commit message describes the state of the project.
12:35 phanimahesh so we have gems like "everything working"
12:35 i7c lol
12:35 phanimahesh most messages are written this way.
12:36 abhinav :-D
12:36 i7c Some commit ten times with "WIP" and then with "Done".
12:36 i7c They should be sued.
12:36 phanimahesh I'm new here, and couldn't stand it. Started biweekly git workshops
12:36 phanimahesh i7c: I do that, but always rebase, squash and rearrange before merges.
12:36 abhinav whats WIP?
12:36 i7c yeah that’s different ;)
12:36 i7c Work in progress
12:36 moritz abhinav: work in progress
12:36 abhinav ok
12:36 phanimahesh But if anyone actually merges that, burn them at the stake!
12:37 i7c I actually try to make "meaningful" commits from the beginning. So I give them proper messages already.
12:37 i7c And I fix them at later points but I hardly ever squash, unless it really makes sense to have some changes in one change set.
12:37 fission6 joined #git
12:38 phanimahesh I try, but sometimes I have to do not so good things. But I take care to communicate to not merge them until I clean it up.
12:38 johnsno joined #git
12:38 i7c Sure, sometimes things get messy. :D
12:38 Noldorin joined #git
12:39 abhinav anyone familiar with circleci? thats integrated to our github! :-(
12:39 abhinav will it store?
12:39 fission6 whats the best path to persue to address the following. I was working on a topic branch though i thought i was in master. I fixed a small bug in some code and commited it to the topic branch when i meant to commit to master. I dont care its in the topic branch but i want just that commit in master. My first reaction was to just make the changes manually and commit in master but curious if there was a better approach, again in this code it was a three line
12:39 i7c Will it care about some abitrary branch?
12:39 fission6 file change so it wasn't to bad to do again
12:39 i7c CIs often react to pushs on a specific branch.
12:39 abhinav i7c: yes. it reads all branches. non merged too.
12:40 abhinav whenever i push to "mybranch" it runs some tests.
12:40 i7c fission6, cherry-pick
12:40 fission6 i7c: ok, how does that work, i find the commit
12:41 i7c Checkout master, git cherry-pick <commit-id or ref>
12:41 mingrammer joined #git
12:42 abhinav ok
12:42 i7c It’s also possible with some rebase jugglery.
12:42 abhinav not for me.
12:43 osse joined #git
12:43 abhinav its still there on github.
12:44 abhinav showing in red color as delete file.
12:44 i7c Well if you just deleted the file and commit the deletion, ofc.
12:44 i7c Git tracks the history, remember.
12:44 wethu joined #git
12:45 fission6 thanks i7c
12:45 abhinav i7c: but i just rewrote the history no?
12:45 i7c It appears not. But you should. :p
12:45 i7c Dunno what you did exactly.
12:45 espindola joined #git
12:45 abhinav i7c: any good docs for that?
12:46 i7c git checkout thatbranch && git reset --hard <to-commit-before-file-was-added> && git push --force-with-lease <remote> thatbranch
12:47 i7c Let’s shorten that. git checkout -B thatbranch <clean commit> && git push ...
12:47 jast fuchstronaut: sorry, was busy. HEAD is the arg for -C here, i.e. it will reuse the commit metadata from the 'current' commit at that time (during the rebase, the commit that was just picked)
12:47 i7c :)
12:48 abhinav i7c: i dont want to touch anything in master. my file is not there in masters history.
12:48 abhinav only my branch.
12:48 i7c Who said anything about master?
12:48 abhinav just confirming.
12:49 i7c Just replace thatbranch by your branch name.
12:49 jast the very first bit switches to your other branch
12:50 abhinav i7c: i am currently on "mybranch" only. your command takes me to master and then deletes "mybranch"?
12:51 jaguarmagenta joined #git
12:52 dopesong joined #git
12:53 Eryn_1983_FL joined #git
12:53 Codfection joined #git
12:53 algae joined #git
12:53 DieguezZ joined #git
12:54 MattMaker joined #git
12:55 jast it takes you to 'mybranch', i.e. the first bit would be a no-op
12:57 i7c abhinav, o_o
12:58 abhinav ok
12:58 i7c abhinav, just do git reset --hard <previous commit without the darn file>
12:58 i7c And then push it with the force.
12:58 abhinav ok
12:58 SourTrout joined #git
13:00 dopesong joined #git
13:00 cyan__ joined #git
13:02 ochorocho__ joined #git
13:03 sanketdg joined #git
13:03 citizen-stig joined #git
13:05 hahuang65 joined #git
13:06 dopesong joined #git
13:06 Lomex joined #git
13:06 ramsub07 joined #git
13:06 andlabs joined #git
13:07 settermjd joined #git
13:12 Silenced joined #git
13:12 Silenced joined #git
13:13 dopesong joined #git
13:13 fuchstronaut joined #git
13:14 unbalancedparen joined #git
13:14 ExoUNX joined #git
13:15 dopesong joined #git
13:16 daniel_rose joined #git
13:17 AndreasLutro joined #git
13:18 AndreasLutro I have a python application that interacts with git. the command `git --git-dir=/path/to/repo/.git --work-tree=/path/to/repo add -- path/to/dir` failed with "fatal: pathspec 'path/to/dir' did not match any files" even though it works fine if I run it manually, regardless of CWD. any likely causes?
13:20 zivester joined #git
13:22 dopesong joined #git
13:22 Ediz joined #git
13:25 a_thakur joined #git
13:26 Macaveli joined #git
13:27 CheckDavid joined #git
13:27 kbs` joined #git
13:28 f3r70rr35f joined #git
13:28 kbs` left #git
13:28 fmcgeough joined #git
13:29 kbs joined #git
13:29 osse AndreasLutro: is 'path/to/dir' relative to the work tree ?
13:29 osse afaik it should be
13:29 rnsanchez_ joined #git
13:29 usm4n joined #git
13:29 AndreasLutro it is yes
13:30 AndreasLutro works as expected if I run it from a shell - I'll have to start logging out every environment variable next :/
13:31 subhojit777 joined #git
13:31 dopesong joined #git
13:32 mbrzuzy joined #git
13:32 MattMaker joined #git
13:32 osse AndreasLutro: if you use --git-dir and --work-tree make sure you *don't* set GIT_DIR and GIT_WORK_TREE in the environment
13:33 AndreasLutro I haven't set them myself at least
13:33 kpease joined #git
13:33 naught101 joined #git
13:34 dopesong joined #git
13:35 dopesong joined #git
13:35 jaafar joined #git
13:36 SirOliver joined #git
13:37 vuoto joined #git
13:37 Gsham joined #git
13:37 dopesong joined #git
13:39 fission6 joined #git
13:41 Dougie187 joined #git
13:41 canton7 joined #git
13:42 abhinav i7c: i hard reset. git push --force. the branch is at old state. but the github still has that commit which lists the file in red.
13:44 dopesong joined #git
13:45 Lomex joined #git
13:46 tabrez joined #git
13:46 abhinav i7c: phanimahesh this thing worked. http://stackoverflow.com/questions/7​048690/delete-github-commit-history
13:47 abhinav finally.
13:47 BigWillie joined #git
13:47 Lomex_ joined #git
13:49 hashpuppy joined #git
13:49 t0by joined #git
13:51 vuoto joined #git
13:52 doebi joined #git
13:52 leeN joined #git
13:52 romerocesar joined #git
13:53 dopesong joined #git
13:53 kaldoran joined #git
13:54 cuebix-wk joined #git
13:56 SirOliver joined #git
13:59 anuxivm joined #git
14:02 PioneerAxon joined #git
14:03 geoid joined #git
14:03 robotroll joined #git
14:04 MattMaker joined #git
14:04 LionsMane joined #git
14:06 DieguezZ joined #git
14:06 LionsMane joined #git
14:06 phaleth joined #git
14:07 SirOliver joined #git
14:07 cdg joined #git
14:09 SirOliver joined #git
14:10 GavinMagnus left #git
14:10 abhinav thanks all for support. have a horror free day.
14:10 abhinav bye.
14:11 xpk joined #git
14:12 wferi joined #git
14:13 wferi Hi! I created a simple tag "A", then decided I'd rather have a signed tag. So I did "git tag -f -s A A"
14:14 raijin joined #git
14:14 irco joined #git
14:15 muthu_ joined #git
14:15 wferi everything seems right, but "A" now tags my previous tag (not the commit tagged by the old "A")
14:15 fuchstronaut joined #git
14:15 wferi which means I've got two tags in my repository with the same name
14:16 wferi it's visible with "git cat-object -p"
14:16 dopesong joined #git
14:16 wferi I mean "git cat-file -p"
14:16 MattMaker joined #git
14:16 wferi under refs/tags the file points to the new (signed) tag, so everything seems right
14:16 Lomex joined #git
14:17 wferi will this cause problems later?
14:17 muthu__ joined #git
14:17 ResidentBiscuit joined #git
14:18 catag87 joined #git
14:18 catag87 joined #git
14:19 jast wferi: it's probably a good idea to fix it by doing it again: 'git tag -f -s A A^{commit}'
14:19 Lomex_ joined #git
14:19 jast your double-tag is not really a problem as far as git is concerned, but it's likely to confuse people
14:20 wferi the problem is that I've already pushed it
14:20 wferi git push did not show pushing two tags, only one
14:20 wferi but it certainly pushed both
14:20 jast well, it's up to you whether you want to push again or leave it as it is. there isn't really any other option. :)
14:20 jast basically your new tag points to the old tag object rather than the commit itself
14:21 wferi exactly
14:21 jast your graph structure is: ref -> A(new) -> A(old) -> commit
14:21 osse my guess is the old tag is a tag object, but has no reference pointing to it. and the new tag points to that instead of the commit
14:21 osse two tag objects, but only one tag in refs/tags
14:21 osse d'accord
14:21 jast so you'll keep dragging it around with you, even though it doesn't have a name of its own
14:21 wferi yes, that's what I have now
14:21 jast the only way to fix that is to overwrite your tag with a new one
14:21 osse I would nuk'em both to hell and start over.
14:21 jast is it worth it? up to you :)
14:22 a3Dman joined #git
14:22 jimi_ joined #git
14:22 wferi I just don't know whether it'll cause any problems in the future
14:23 wferi probably not, if the old tag does not surface, just lets references through
14:23 dopesong joined #git
14:23 osse git show A is prolly confusing
14:23 osse if it shows two tags and a commit
14:24 wferi no, it skips the old tag altogether
14:24 wferi osse: no, you're right, I looked at the wrong tag
14:25 jast I just tried it, too :)
14:25 wferi okay, I'll get rid of them and push again
14:26 wferi probably nobody pulled them anyway...
14:26 jast even if they did, well, the tag still points to the same commit afterwards and it's signed, too
14:26 jast not that big a deal IMO
14:27 wferi yeah... but how do I delete my old tag?
14:27 osse not needed
14:27 wferi by id?
14:27 osse it will be GC'ed with
14:27 osse with time
14:27 wferi really? are tags GC-ed?
14:27 osse once you delete/rewrite the new tag the old tag isn't pointed to anymore
14:27 stantonk joined #git
14:27 jast if they're not referenced by a tag ref
14:27 osse pretty sure all objects are GC'ed
14:28 jast yeah... no exceptions :)
14:28 jceb joined #git
14:28 wferi ah, right, but tags usually are always pointed to by refs/tags/something
14:28 jast which is clearly the right thing to do for tags... if you wanted them to stick around, you'd keep the ref
14:28 jast exactly
14:28 jast so if you overwrite the ref with a newly created tag object, the old one stops being referenced
14:28 wferi and as soon as I delete the file, the only reference is gone
14:29 snowkidind joined #git
14:29 osse a tag without a ref is just as useless as a blob/tree/commit without one
14:29 wferi unless the tag was tagged by some mistake...
14:29 jast right, and the tag that tagged it is still referenced :)
14:31 SirOliver joined #git
14:32 marc_v92 joined #git
14:33 crypticGator joined #git
14:34 ams__ joined #git
14:36 wferi thanks friends, I successfully replaced the signed tag, hopefully leaving the old one unreferenced thus eligible for GC
14:38 nezZario yeesh .. i cannot turn off autocrlf for the life of me .. how do I turn this junk off?
14:39 nezZario git config --global core.autocrlf false a billion times ... still says "warning: CRLF will be replaced by LF in...."
14:39 dopesong joined #git
14:39 bremner local repo settings override, fwiw
14:40 MattMaker joined #git
14:40 nezZario it's a new / fresh repo ...
14:41 nezZario although i'd love to know how to override it to false
14:42 nezZario https://i.imgur.com/6dH2hP8.png
14:42 nezZario bugging me to no end .. i'll google some more later i guess
14:43 osse what git does there is the general recommendation brtw
14:43 osse btw
14:43 osse do you have a '.gitattributes' ?
14:44 dopesong joined #git
14:44 nezZario Ahhh!
14:44 RedShift joined #git
14:44 nezZario yeah, there is a .gitattributes in that particular subdirectory
14:44 nezZario that's it!  thanks
14:47 Anticom joined #git
14:48 ShekharReddy joined #git
14:48 CEnnis91 joined #git
14:51 texinwien_ joined #git
14:54 RustyShackleford joined #git
14:55 t4nkd joined #git
14:56 lindenle joined #git
14:56 sangy joined #git
14:58 C4ta|Work left #git
14:58 jungsubk joined #git
14:59 dopesong joined #git
15:00 shinnya joined #git
15:00 espindola joined #git
15:00 le_melomane joined #git
15:01 nnyk_ joined #git
15:01 stantonk joined #git
15:02 star_pro_ joined #git
15:03 crose joined #git
15:03 ochorocho__ joined #git
15:03 SourTrou_ joined #git
15:04 jceb joined #git
15:05 BlaXpirit hello, I'm working on a pull request so I have a branch with some commits. I recently merged master to resolve merge conflicts, now I've been asked to rebase instead
15:06 dopesong joined #git
15:06 BlaXpirit how can I do this safely?  I would also like to squash the changes I introduced in the merge conflict into an earlier commit, because well... otherwise the changes wouldn't make sense
15:06 unreal_ joined #git
15:06 BlaXpirit s/conflict/commit/
15:07 jaguarmagenta joined #git
15:07 dopesong joined #git
15:07 postmen joined #git
15:08 BlaXpirit hm, the merge commit doesn't show up in  git rebase -i master
15:08 jast there's an option -p to preserve merge commits
15:08 jast to abort while you're still in the editor, remove all lines, save and quit
15:08 postmen hi
15:08 gitinfo postmen: 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.
15:09 BlaXpirit jast, then that shows only the merge commit
15:09 postmen anybody knows if there is git in remix os?
15:10 jast BlaXpirit: well, that's impractical I guess :) is the merge commit at the top right now?
15:10 BlaXpirit jast, yes
15:10 jast (in your commit history, not in rebase -i)
15:10 LionsMane joined #git
15:10 jast okay, and it's a merge from master, so no exciting changes from you, right?
15:10 MattMaker joined #git
15:11 jast except conflict resolution
15:11 BlaXpirit jast, actually i did some changes :(
15:11 jast I'm not talking about what you did during conflict resolution, just the commits that got merged in
15:11 BlaXpirit to conceptually explain, I guess I would want to save the diff between my branch and master,  discard the merge commit, then rebase what's left, then reapply the diff
15:11 zivester joined #git
15:11 BlaXpirit in fact i may do exactly that
15:11 jast my first idea was to magically turn the merge into a normal commit, then go ahead with rebase -i
15:11 BlaXpirit wait no that still makes no sense
15:12 Topic for #git is now Welcome to #git, the place for git help and irregular expressions | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-svn: now you have two problems.
15:12 Bounga joined #git
15:12 Bounga Hello!
15:12 gitinfo Bounga: 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.
15:13 BlaXpirit jast, I do not understand.  I did the merge master, but sadly during the merge commit I did also make some changes, because basically the new changes in master kinda went against my changes
15:13 ShekharReddy joined #git
15:13 Bounga Can anyone tell me why after having rm a remote from my config remote branches of this branch still appears when doing a git branch -a?
15:13 jbitdrop joined #git
15:14 Doginal joined #git
15:14 tyreld joined #git
15:15 nidr0x joined #git
15:15 osse Bounga: There's no particular reason I think. They're just not deleted
15:15 nnyk_ joined #git
15:16 osse Bounga: git fetch --prune --all fixes it I think
15:16 jast BlaXpirit: okay... it's a little to separate out your changes from whatever else happened in the merge proper
15:16 osse Otherwise use git update-ref -d by hand
15:16 jast so my idea was turning the merge commit into a normal commit (that looks like you squashed in the changes from master, plus your own changes)
15:17 jast then hopefully let rebase -i do the work of untangling that and squashing it into your other commit, while figuring out that the other changes from your merge are no longer necessary.
15:17 jast it's a long shot, though
15:17 diogenese joined #git
15:17 Bounga osse: git remote -v only says there's origin available. But git branch -a lists remotes/gitlab/*
15:17 BlaXpirit I guess I would want to save the current state of my branch, discard the merge commit, then rebase what's left, then overwrite the files with previously saved state
15:17 jast I guess that will work...
15:18 BlaXpirit thanks
15:18 jast though you'll probably have to re-fix a bunch of conflicts during the rebase
15:18 dopesong joined #git
15:18 BlaXpirit oh no, you're right
15:18 jast easy way to overwrite the files without having to zip everything up:
15:18 jast well, there's no way around that
15:18 BlaXpirit it's just 2 files so i'm ok
15:18 jast anyway, remember the commit ID of the merge. throw it away (git reset --hard HEAD~, throws away uncommitted changes, too). do the rebase.
15:19 jast then, git read-tree --reset -u <merge ID>
15:19 BlaXpirit cool, thanks
15:19 jast that should leave you with your files restored from the merge commit, all changes staged, and all you have to do is check for sanity and commit :)
15:19 MattMaker joined #git
15:20 jast git checkout <merge ID> -- . (from the top level) might work, too, and is more user-friendly, I guess
15:21 kbs joined #git
15:23 Doginal joined #git
15:25 le_melomane joined #git
15:26 azerus joined #git
15:27 dopesong joined #git
15:27 thiago joined #git
15:29 Bounga osse: Ok so I had to 'git branch -rd remote/branch'
15:30 clemf joined #git
15:33 jeffreylevesque joined #git
15:33 nnyk_ joined #git
15:33 davegarath joined #git
15:34 strk joined #git
15:35 choki joined #git
15:36 IWishIKnew joined #git
15:37 chachasmooth joined #git
15:37 strk where is the mapping between svn committer and git author stored, for git-svn ?
15:38 strk since I changed my email address I'm getting different hashes for commits on different clones and it seems to be related to different emails
15:39 kbs I don't know about git-svn, but in git the author email is part of the commit (hence changed emails will result in changed commit ids)
15:39 strk the commit is _generated_ by git-svn
15:39 iota_pi joined #git
15:39 EvilPeng1 joined #git
15:40 strk so depending on where git-svn stores the svn_committer-to-git_author, the commit will be different
15:40 dopesong joined #git
15:40 lindenle joined #git
15:40 postmen left #git
15:40 Lomex joined #git
15:40 circ-user-03wEf joined #git
15:41 strk found: git config.svn.authorsfile
15:43 daniel_rose joined #git
15:44 sparetire joined #git
15:44 subhojit777 joined #git
15:44 dopesong joined #git
15:45 emPi joined #git
15:46 marc_v92 joined #git
15:46 dreiss joined #git
15:46 strk but, git svn rebase doesn't seem to see changes in that file :(
15:46 sparetire joined #git
15:47 kbs oh, git-svn seems just a perl script :) interesting. I also see --use-log-author and so forth, but basically it seems to me that on the git side at least, the email does land into the commit object
15:47 marc_v92 joined #git
15:47 MattMaker joined #git
15:47 dwas joined #git
15:47 mehola joined #git
15:48 israelzuniga joined #git
15:49 dopesong joined #git
15:50 strk git svn reset # saved my life
15:50 strk procedure: (1) git svn reset to before shit happened (2) git svn fetch again
15:51 circ-user-03wEf joined #git
15:54 Doginal joined #git
15:56 strk 1.5) tweak authorsfile content ...
15:58 MattMaker joined #git
15:59 pur3eval joined #git
16:01 raijin joined #git
16:01 baxx joined #git
16:02 Doginal joined #git
16:03 zacts joined #git
16:03 spudowiar joined #git
16:04 Guest55 joined #git
16:07 kbs nice, glad you found a solution :) git hard-bakes the author into a commit which I expect is a deliberate choice to assert provenance
16:07 Asenar joined #git
16:07 jimi_sanchez joined #git
16:08 strk yep, that makes sense
16:09 strk it's just that I had 2 slighly different git-svn setups, and not getting the same result
16:09 strk the difference being in the authorsfile being used
16:09 strk not an easy thing, to modify an authorsfile
16:10 daniel_rose joined #git
16:11 HyP3r Whats a easy way to extract one specitic file from a set of tags out of my git repository?
16:11 dan2k3k4 joined #git
16:11 kbs thankfully (I think!) haven't had to deal with svn much but glad you found the solution
16:12 stantonk joined #git
16:12 HyP3r svn? I don't use svn
16:13 kbs HyP3r: meant for strk
16:14 HoierM joined #git
16:15 stantonk joined #git
16:15 bremner HyP3r: you want many versions of the same file?
16:15 NeverDie joined #git
16:16 D[4]ni joined #git
16:17 fuchstronaut joined #git
16:17 fuchstronaut joined #git
16:20 osse HyP3r: for t in tag1 tag2 tag3; do git show "$t:path/to/file" > "file_$t"; done
16:21 context joined #git
16:21 MattMaker joined #git
16:21 Darcidride joined #git
16:22 context hi, im using credential.helper = osxkeychain
16:22 context and it works.
16:22 HyP3r bremner: yes
16:22 HyP3r osse: thanks
16:22 context but if i ssh into that laptop and try doing anything it asks for username/password
16:22 madewokherd joined #git
16:22 context anyone know of a way to keep using the keychain even though im on ssh
16:23 star_pro_ joined #git
16:25 anuxivm joined #git
16:25 strk left #git
16:26 snowkidind joined #git
16:27 robotroll joined #git
16:29 HyP3r is there a way to list all changes to a file? I have a file in a big git repository (linux) is aviable in 3.18 and now its gone in 3.19. Was it deleted or moved?
16:30 osse HyP3r: maybe it was renamed. try  git diff --find-renames v3.18 v3.19 -- file
16:30 kbs oh, nice - good to know
16:31 NeverDie_ joined #git
16:31 Darren_ joined #git
16:32 romerocesar joined #git
16:32 osse HyP3r: alternatively:  git log v3.19 -- file   will find the last commit it was changed in.
16:33 markelite joined #git
16:33 stantonk joined #git
16:33 vdv joined #git
16:34 HyP3r osse: I'm consufused with your '--' you mean 'git log v3.19 -- drivers/mtd/nand/fsl_nfc.c'
16:34 usm4n joined #git
16:34 osse HyP3r: !--
16:34 gitinfo HyP3r: [!dashes] Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"
16:34 diegoviola joined #git
16:34 HyP3r ah ok
16:35 osse HyP3r: more or less the same thing as if you wanted to remove a file named -r: rm -- -r
16:35 ochorocho__ joined #git
16:36 Arban joined #git
16:37 daniel_rose joined #git
16:38 kbs dumb question (as I'm using merkle trees in a different context) I assume that the only way to know that a git commit is descended from another is to linearly walk down the commit chain correct? There's no magic that lets it access the commit history other than linearly?
16:38 HyP3r Its totally confusing, the file is only affecting three commits
16:38 kbs (for simplicity, assuming there's only linear history)
16:39 osse HyP3r: then it came to be, was modified once, then deleted/renamed. do a git show --stat --find-renames on the newest commit
16:42 martinkl_ joined #git
16:43 zacts joined #git
16:43 osse HyP3r: huh, i have a linux repo here and i can't find that file at all
16:44 MattMaker joined #git
16:46 cdg joined #git
16:47 xall_ joined #git
16:47 mbreedlove joined #git
16:48 freimatz joined #git
16:50 zacts_pi joined #git
16:50 PioneerAxon joined #git
16:51 Jellyg00se joined #git
16:52 UncleCJ joined #git
16:52 blackwind_123 joined #git
16:53 paul424 joined #git
16:54 mbreedlove joined #git
16:54 wcpan joined #git
16:56 mbreedlove joined #git
16:57 piling joined #git
16:59 nettoweb joined #git
17:00 choki joined #git
17:00 govg joined #git
17:00 snowkidind joined #git
17:01 stantonk joined #git
17:02 DieguezZ joined #git
17:03 usm4n_ joined #git
17:04 HyP3r osse: I have a special repository, fsl_nfc.c is from a custom linux-repostiroy (fork)
17:04 osse ah
17:05 daniel_rose joined #git
17:07 InfoTest joined #git
17:07 rgrinberg joined #git
17:08 dopesong joined #git
17:09 linuxmint joined #git
17:09 circ-user-03wEf joined #git
17:10 durham joined #git
17:11 kutsuya joined #git
17:11 clemf joined #git
17:13 tvon joined #git
17:13 tvon left #git
17:13 SteffanW joined #git
17:14 playfullyExist joined #git
17:16 qlkzy joined #git
17:16 wloncom joined #git
17:17 clemf_ joined #git
17:18 ramsub07 hello, i'm working on a branch and i have made some changes. I want to have them as a commit but not in the current branch, but in a temproary branch, parallel to this. How do i do ?
17:19 stantonk joined #git
17:19 osse ramsub07: !float
17:19 gitinfo ramsub07: 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.
17:20 ramsub07 osse: then when i come back to the current branch, the changes won't be there, right ?
17:21 osse correct
17:21 zacts joined #git
17:23 RajRajRaj joined #git
17:23 wcpan joined #git
17:25 zincrokx joined #git
17:25 ahmedelgabri joined #git
17:27 daniel_rose joined #git
17:27 cdg joined #git
17:28 Repox joined #git
17:29 mdw joined #git
17:30 danslo_ joined #git
17:32 stantonk joined #git
17:32 Dyonisos joined #git
17:32 star_pro_ joined #git
17:33 SourTrout joined #git
17:34 GavinMagnus joined #git
17:35 GavinMagnus left #git
17:35 hahuang65 joined #git
17:36 zacts_pi joined #git
17:36 Ahmed90 joined #git
17:37 raijin joined #git
17:37 jaguarmagenta joined #git
17:39 Matsv joined #git
17:40 spudowiar joined #git
17:41 happy-dude joined #git
17:41 nnyk joined #git
17:41 thiago joined #git
17:42 clemf joined #git
17:42 akul joined #git
17:42 xall_ joined #git
17:44 dopesong joined #git
17:45 mischat joined #git
17:46 baxx joined #git
17:46 ctcrnitv joined #git
17:48 mehola joined #git
17:48 jaguarmagenta joined #git
17:49 le_melomane joined #git
17:50 netj joined #git
17:50 medeirosthiiago joined #git
17:51 dreiss joined #git
17:51 star_pro_ joined #git
17:51 fullstack joined #git
17:52 snowkidind joined #git
17:52 medeirosthiiago joined #git
17:54 nedbat joined #git
17:55 MatthewAllan93 joined #git
17:56 notebox joined #git
17:56 zarel joined #git
17:57 dopesong joined #git
17:58 refried_ joined #git
17:59 iamtj joined #git
18:00 mbreedlove joined #git
18:00 mischat joined #git
18:00 stantonk joined #git
18:00 Cooler216 joined #git
18:01 sangy Hello, what's a good way to print parts of a commit header (e.g., the tree hash and the parents only). I've been looking at cat-file but I'm not sure if this accomplishes what I want
18:01 kisonecat joined #git
18:02 bremner cat-file -p | sed ?
18:02 clemf joined #git
18:02 osse sangy: git log --pretty='your stuff here' -1
18:02 sangy osse: oh, why didn't I think of that. Thanks!
18:03 pur3eval joined #git
18:03 stantonk joined #git
18:04 dopesong joined #git
18:04 osse sangy: lack of coffee
18:04 Jellyg00se joined #git
18:05 mbreedlo_ joined #git
18:05 mingrammer joined #git
18:06 Ratler joined #git
18:06 Ratler joined #git
18:06 RajRajRaj left #git
18:07 mbreedlove joined #git
18:07 davisonio joined #git
18:07 Limes_ joined #git
18:08 mischat joined #git
18:08 clemf joined #git
18:08 diogenese joined #git
18:08 D-Boy joined #git
18:09 Captain_Ramius joined #git
18:10 settermjd joined #git
18:12 mbreedlove joined #git
18:13 dopesong joined #git
18:14 chachasmooth joined #git
18:14 jeremyhall joined #git
18:15 mbreedlove joined #git
18:16 King_Hual joined #git
18:16 King_Hual joined #git
18:16 dopesong joined #git
18:17 mbreedlove joined #git
18:19 lindenle joined #git
18:19 dopesong joined #git
18:20 star_pro_ joined #git
18:28 Codfection joined #git
18:32 Ahmed-90 joined #git
18:32 dopesong joined #git
18:33 danslo joined #git
18:35 davisonio joined #git
18:37 Gsham joined #git
18:38 jeremyhall joined #git
18:39 ynanm joined #git
18:39 Darren_ joined #git
18:40 zacts joined #git
18:40 SimonNaa joined #git
18:41 dopesong joined #git
18:41 SourTrout joined #git
18:42 lindenle joined #git
18:42 jlebar joined #git
18:45 GavinMagnus joined #git
18:50 GavinMagnus left #git
18:50 beastd joined #git
18:51 fuchstronaut joined #git
18:52 context left #git
18:54 t-mart__ joined #git
18:54 siprbaum joined #git
18:54 ynanm left #git
18:55 dopesong joined #git
18:56 dsdeiz joined #git
18:56 dsdeiz joined #git
18:56 ajf- joined #git
18:56 siprbaum joined #git
18:56 GavinMagnus joined #git
18:57 GavinMagnus left #git
18:58 troulouliou_div2 joined #git
18:59 SourTrout joined #git
18:59 Sasazuka joined #git
18:59 catag87 joined #git
19:00 mingrammer joined #git
19:01 dopesong joined #git
19:01 catag87 joined #git
19:02 mbreedlove joined #git
19:04 NeverDie joined #git
19:06 SourTrou_ joined #git
19:09 boombatower joined #git
19:10 mwhooker joined #git
19:10 sangy osse: I should get coffee, that's right
19:10 apotry joined #git
19:11 mwhooker joined #git
19:11 Kulrak joined #git
19:11 Kulrak joined #git
19:11 DieguezZ joined #git
19:12 mwhooker joined #git
19:13 mbreedlove joined #git
19:15 dopesong joined #git
19:15 dhollinger joined #git
19:15 mbreedlove joined #git
19:17 vuoto joined #git
19:18 mbreedlove joined #git
19:18 iamtj joined #git
19:18 apotry joined #git
19:18 Kicer86 joined #git
19:20 mbreedlove joined #git
19:20 zarel joined #git
19:22 mbreedlove joined #git
19:23 MattMaker joined #git
19:23 Marbug joined #git
19:24 mbreedlove joined #git
19:24 pur3eval joined #git
19:24 pampeho joined #git
19:25 vuoto joined #git
19:26 jeremyhall joined #git
19:27 vuoto joined #git
19:27 SwiftMatt joined #git
19:27 MattMaker joined #git
19:28 xkr47 joined #git
19:28 Marbug_ joined #git
19:31 foist joined #git
19:32 foist_ joined #git
19:33 settermjd joined #git
19:33 dopesong joined #git
19:33 rgrinberg joined #git
19:34 vuoto joined #git
19:34 vuoto joined #git
19:35 Marbug joined #git
19:35 MattMaker joined #git
19:36 dopesong joined #git
19:36 nwkj86 joined #git
19:36 cdown joined #git
19:38 mbreedlove joined #git
19:39 vuoto_ joined #git
19:40 pur3eval joined #git
19:40 skylite joined #git
19:44 MattMaker joined #git
19:45 StuartMI joined #git
19:46 nidr0x joined #git
19:48 dopesong joined #git
19:49 mehola joined #git
19:49 iamtj joined #git
19:50 bipolar joined #git
19:50 clemf joined #git
19:50 clemf joined #git
19:53 dopesong joined #git
19:54 mingrammer joined #git
19:54 Marbug joined #git
19:56 dopesong joined #git
19:56 star_pro_ joined #git
19:57 robotroll joined #git
19:58 spudowiar joined #git
20:01 Gianormagantrous joined #git
20:02 Rodya_ joined #git
20:02 nilg joined #git
20:04 dopesong joined #git
20:04 GavinMagnus joined #git
20:04 EvilPeng1 joined #git
20:06 mbreedlove joined #git
20:07 elastix joined #git
20:07 stantonk joined #git
20:07 dopesong joined #git
20:08 Armanty joined #git
20:08 setuid joined #git
20:09 setuid I've got a repo that I just created, set the user.name/user.email correctly, I can see them with 'git config --user.name' and it reports what I expect, but when I try to push, it gets $USER instead of the git values.
20:09 setuid I also set those same values with --global, and verified in ~/.git/config and ~/.gitconfig. Where is it plucking $USER from, and how do I tell it to use the local values in the project?
20:10 MattMaker joined #git
20:10 Seveas setuid: git config --show-origin user.name
20:11 Armanty Hi,  has anyone here ever configured a git repo with phpstorm?
20:11 setuid Seveas, just spits out the --help output
20:11 manizzle joined #git
20:11 setuid error: unknown option `show-origin'
20:12 perlpilot setuid: what do you mean by "when I try to push, it gets $USER"?  Can you show a transcript of what you're doing?
20:12 Seveas setuid: upgrade git :) (--show-origin is a fairly new feature)
20:12 Kartagis git config user.name
20:12 setuid perlpilot, It gets my login username, not the repo user
20:12 dhollinger joined #git
20:12 Seveas (2.8.0 has it)
20:12 setuid Seveas, I'm using the latest available git on Ubuntu 16.04
20:13 setuid And can't go newer than that, unless it's in the repo
20:13 setuid perlpilot, git init; git add foo bar; git commit; git push origin master
20:13 Seveas setuid: ppa:dennis/git-next for bleeding edge :)
20:13 setuid Seveas, no can do
20:13 setuid I'll stick with the current version for now
20:14 vuoto joined #git
20:14 cdown_ joined #git
20:15 perlpilot setuid: if you're on unix, use the "script" command to get a transcript of your commands and their results.
20:15 setuid perlpilot, I'm trying to push the git repo to launchpad, which works when I use 'raw' bzr commands
20:15 setuid It says: No such Launchpad account: myname
20:15 setuid Permission denied (publickey).
20:16 setuid where 'myname' is my laptop's login username
20:16 Seveas erm, pushing has *nothing* to do with user.name/user.email
20:16 Seveas those are only used when making commits
20:16 perlpilot (which is why I wanted a transcript :)
20:16 Seveas fix up your remote url to include the username to push as
20:17 setuid It needs to be able to authenticate to launchpad -somehow-, and that requires a username known to lp, which is tied to ssh, and reads ~/.ssh/config where the correct username and identityFile are located.
20:17 Seveas also, launchpad's git support sucks :)
20:17 ajf- joined #git
20:17 Armanty how can i find the git repository url? Is it just the source path of:  github/[insert_name]?
20:17 Seveas Armanty: git remote -v
20:17 perlpilot Armanty: git remote -v ?
20:17 texinwien_ joined #git
20:18 setuid screw it, I'll use git to commit to the local bzr branch, and use bzr to push it to lp
20:18 edaught joined #git
20:19 perlpilot setuid: good luck
20:20 dopesong joined #git
20:20 mbreedlove joined #git
20:20 Armanty Seveas: i dont know if it worked but upon entering that command nothing was returned? Must I be in the master branch?
20:21 jlebar I work on LLVM, and we're talking about moving our VCS of record from SVN to git.  We have existing read-only git mirrors, but the setup is kind of screwed up.  To simplify a bit: Clang and LLVM are separate git repositories, even though to build clang you need a checkout of llvm *at the same SVN revision*.  So I'd like to fix this as part of our move to git and model everything as a single repository.  The problem I'm running into is figuring out how to migrate
20:21 ahr3n joined #git
20:23 MattMaker joined #git
20:23 setuid I figured it out... my ~/.ssh/config had a block for bazaar.launchpad.net with user 'setuid' and my identityfile, but not one for git.launchpad.net, added that, now it works
20:26 moritz jlebar: you can use a subtree merge, I think
20:26 moritz or just subtree
20:26 Balliad joined #git
20:27 moritz without the --squash that some tutorials use
20:27 jlebar moritz, I was looking at subtree merge, but I'm not sure it solves what I need.  You should be able to check out an old version of the branch and get a *full* checkout, including the llvm bits.
20:28 jlebar moritz, If I just subtree merge at head, then the old revs of the branch will (I think?) just contain clang bits.
20:28 jlebar moritz, Maybe plain git subtree, I hadn't looked at that...
20:28 daniel_rose joined #git
20:28 moritz jlebar: ah, I hadn't considered that
20:29 jlebar moritz, I think getting that will mean I need to replay the branch commit by commit.
20:30 HanClinto joined #git
20:31 dopesong joined #git
20:31 setuid left #git
20:32 moritz jlebar: yes, some nastiness with git-filterbranch is likely required
20:35 raijin joined #git
20:35 jlebar moritz, The thing I am stuck on with the filter-branch approach is getting the merge parents right.  That is, I can edit the clang branch so that every commit has the right llvm contents.  But when it pulls from upstream clang, it now needs to pull from the upstream merged repo.
20:35 dopesong joined #git
20:35 jlebar Maybe that's just git merge -s ours --no-commit upstream_hash?
20:37 nidr0x joined #git
20:38 stantonk joined #git
20:38 nnyk joined #git
20:38 ramsub07 hello, how to checkout to a previous commit, run tests and come back to current HEAD again ?
20:39 _ikke_ git checkout <commit> && ./run_tests && git checkout -
20:39 fission6 joined #git
20:39 EvilPeng1 joined #git
20:40 jaguarmagenta joined #git
20:41 elementalest joined #git
20:41 elementalest joined #git
20:41 jaguarma_ joined #git
20:42 mwhooker joined #git
20:46 dhollinger joined #git
20:46 ItSANgo joined #git
20:46 moei joined #git
20:47 ochorocho__ joined #git
20:47 GavinMagnus left #git
20:48 ramsub07 how to come out of detached head state ?
20:48 ramsub07 _ikke_: ^
20:48 stantonk joined #git
20:48 acetakwas joined #git
20:49 _ikke_ ramsub07: git checkout - should fix that
20:49 _ikke_ (including the dash)
20:49 Dougie187 left #git
20:50 mingrammer joined #git
20:50 dsantiago joined #git
20:50 Jonathel joined #git
20:51 dopesong joined #git
20:52 fuchstronaut joined #git
20:52 MattMaker joined #git
20:53 Faylite joined #git
20:54 Armanty how do i get the git repo URL of a local git repo i just created
20:54 Lunatrius joined #git
20:55 _ikke_ You mean so you can clone it somewhere else?
20:56 Armanty No, I want to use phpstorm ide. and its asking for a git repo url
20:56 Armanty i guess that would be cloning the repo, so0 yes
20:56 kpease joined #git
20:59 dopesong joined #git
20:59 ac3takwas joined #git
20:59 a3Dman joined #git
21:00 _ikke_ If you have it locally, you don't need a clone url
21:00 _ikke_ You don't need to clone it
21:00 _ikke_ You just need to create a local project
21:00 reim joined #git
21:00 _ikke_ That option is for when you need to still clone it from somewhere
21:01 Arban joined #git
21:01 stantonk joined #git
21:01 Armanty but how to i make it so that my ide can work with the version control
21:02 _ikke_ You don't need to do anything special
21:02 stantonk joined #git
21:02 _ikke_ It should detect that it's a git repository
21:03 Gsham joined #git
21:03 Armanty i dont think it does
21:03 dopesong joined #git
21:03 Armanty ffor the git repo url ive given it the src path : "C:// ... github/[prj-nmae)
21:03 kpease joined #git
21:03 Armanty and that apparently doesnt work
21:04 _ikke_ Are you still in the new project dialogue?
21:04 stantonk joined #git
21:04 perlpilot Armanty: possibly stupid question, but ... you do have git integration enabled, right?
21:05 Armanty no im before that. Options: create a new prj, open exisitng, create new prj from existing, or check out with VCS
21:06 Armanty ive been selecting the last one with asks for a(n) url
21:07 System42 joined #git
21:08 System42 Out of curiosity: What would happen if someone forked a public repo and then that repo rebased their public history? (I would never do this in a million years because I understand that you don't rebase public history, but I was wondering how git/github handles that.)
21:08 btree joined #git
21:09 minix joined #git
21:11 _ikke_ They would have to force push (as is normal), but for the rest, it's nothing special github has to handle
21:11 editshare-ericf joined #git
21:11 System42 _ikke_: I guess just future merges from "upstream" would be awful?
21:12 perlpilot System42: no, because once you figured out what happened, you'd make a new clone
21:12 perlpilot :-)
21:12 jeremyhall joined #git
21:12 _ikke_ System42: You would get a messy merge, yes
21:12 Armanty i fixed it .. i think. it seems phpstorm could not find git.exe, maybe i can try this aagain
21:13 nidr0x joined #git
21:13 jfelchner joined #git
21:14 dopesong joined #git
21:18 Guest19 joined #git
21:19 ahr3n joined #git
21:19 neanderslob joined #git
21:20 neanderslob_ joined #git
21:20 MattMaker joined #git
21:21 Guest19 joined #git
21:21 xall_ joined #git
21:22 dopesong joined #git
21:22 durham_ joined #git
21:23 steadystatic joined #git
21:24 steadystatic So I’m a command line guy, and I love Git…but at work everyone uses Eclipse and they’re fighting with EGIT (Eclipse Neon).
21:24 _ikke_ yay
21:24 steadystatic Is the client just miserable? The command line reports a clean status but the UI keeps globbing onto issues
21:25 m0viefreak joined #git
21:25 steadystatic I have never been a big fan of Eclipse
21:25 vktec eclipse--
21:25 _ikke_ They have their own implementation of git, with their own bugs / idiosyncrisies
21:25 HedgeMage steadystatic: Yes, that interface is horrible.  One of my grad students tried to use it and OMG the shit I had to untangle for him.
21:26 steadystatic :( I was afraid of that - they’ve been using SVN for years and more new hires want to use Git (including me) but the problem is their precious Eclipse
21:27 vktec Solution: get them to use cli tools or a stand-alone GUI
21:28 apotry joined #git
21:30 btree left #git
21:30 LaptopBrain joined #git
21:30 Darcidride joined #git
21:31 vjacob joined #git
21:31 MattMaker joined #git
21:32 cebor_ joined #git
21:33 fstd joined #git
21:33 dopesong joined #git
21:33 ResidentBiscuit joined #git
21:34 LiohAu joined #git
21:34 LiohAu Is there a way to solve that error : "fatal: multiple stage entries for merged file '.gitattributes'" ?
21:34 LiohAu and also is there an explanation for it?
21:34 neanderslob joined #git
21:35 danslo_ joined #git
21:36 aidalgol joined #git
21:37 star_pro_ joined #git
21:37 Sucks joined #git
21:38 stantonk joined #git
21:38 dreiss joined #git
21:38 andlabs joined #git
21:40 inflames joined #git
21:40 Ediz joined #git
21:41 unbalancedparen joined #git
21:43 neanderslob joined #git
21:43 neanderslob_ joined #git
21:44 _ikke_ What does git status say? (And what commit gave you that error)
21:44 cd-rum joined #git
21:44 dopesong joined #git
21:44 inflames joined #git
21:45 andrybak joined #git
21:45 mingrammer joined #git
21:45 Sucks joined #git
21:46 vjacob joined #git
21:46 JanC_ joined #git
21:46 yorgi_ joined #git
21:47 Sucks joined #git
21:50 mehola joined #git
21:50 clemf joined #git
21:50 johnmilton joined #git
21:50 cd-rum_ joined #git
21:51 neanderslob joined #git
21:54 MattMaker joined #git
21:54 clemf joined #git
21:55 b1tchcakes joined #git
21:55 clemf joined #git
21:56 stantonk joined #git
21:57 WaReZ joined #git
21:58 mellernoia joined #git
21:58 johnmilton joined #git
21:58 astrofog joined #git
21:59 clemf joined #git
22:00 HappyLoa- joined #git
22:00 dopesong joined #git
22:00 johnmilton joined #git
22:01 stantonk_ joined #git
22:02 izabera http://eagain.net/articles/g​it-for-computer-scientists/
22:03 ramsub07 how do i remove a file from tracking ?
22:03 neanderslob joined #git
22:04 kbs eclipse uses jgit I assume... (as does gerrit, though so far gerrit has been good to me)
22:04 stantonk joined #git
22:06 _ikke_ ramsub07: git rm --cached <file>
22:08 EvilPeng1 joined #git
22:09 NeverDie_ joined #git
22:09 joki joined #git
22:09 liamonade joined #git
22:09 Jonathel joined #git
22:12 Mahesh joined #git
22:13 dopesong joined #git
22:13 troulouliou_div2 joined #git
22:13 Mahesh left #git
22:15 MattMaker joined #git
22:17 clemf joined #git
22:19 fuchstronaut joined #git
22:19 ascarter joined #git
22:20 jimi_ joined #git
22:21 ochorocho__ joined #git
22:21 BrianBlaze420 joined #git
22:24 jlebar How do I get the current revision from the index-filter command of git-filter-branch?  git rev-parse HEAD doesn't work because HEAD isn't updated.
22:24 stantonk joined #git
22:25 zvive joined #git
22:26 MattMaker joined #git
22:27 ahf joined #git
22:30 dopesong joined #git
22:30 jaguarmagenta joined #git
22:31 cdown_ joined #git
22:32 dopesong joined #git
22:32 chachasmooth_ joined #git
22:33 osse jlebar: use the variable $GIT_COMMIT
22:33 neanderslob_ joined #git
22:34 Bennux joined #git
22:34 dopesong joined #git
22:35 jlebar osse, Oh, that's even in the man page.  Hooray.  Thank you.
22:35 neanderslob joined #git
22:36 danslo_ joined #git
22:37 netj joined #git
22:38 dopesong joined #git
22:39 chachasmooth joined #git
22:39 MattMaker joined #git
22:41 cyphase joined #git
22:41 HoierM joined #git
22:43 stantonk joined #git
22:47 MZAWeb_ joined #git
22:48 dopesong joined #git
22:50 dsantiago joined #git
22:52 jlebar All right, next question...suppose I want to git-ls-files on an arbitrary commit.  Is the best thing to do git-read-tree --index-output=/tmp/something and then do git ls-files on that?
22:53 dopesong joined #git
22:54 MattMaker joined #git
22:57 Rodya_ joined #git
22:58 neanderslob joined #git
22:59 wethu joined #git
23:01 neanderslob_ joined #git
23:03 dopesong joined #git
23:04 l4v2 joined #git
23:06 watabou_ joined #git
23:08 rbilinda joined #git
23:09 neanderslob joined #git
23:09 neanderslob_ joined #git
23:10 jimi_ joined #git
23:10 ajf- joined #git
23:10 neanderslob joined #git
23:11 dopesong joined #git
23:12 cbreak jlebar: git ls-tree
23:13 ajf- joined #git
23:13 MattMaker joined #git
23:15 MattMaker joined #git
23:16 rossome joined #git
23:17 raijin joined #git
23:18 jeffreylevesque joined #git
23:19 lindenle joined #git
23:21 Chiko joined #git
23:21 fuchstronaut joined #git
23:24 lindenle joined #git
23:26 FuzzySockets joined #git
23:28 ochorocho__ joined #git
23:29 ajf- joined #git
23:30 bastelfreak joined #git
23:33 mingrammer joined #git
23:36 danslo_ joined #git
23:38 cdg_ joined #git
23:40 Gsham joined #git
23:42 ahrc333ff joined #git
23:49 b1tchcakes joined #git
23:50 mehola joined #git
23:53 Rodya_ joined #git
23:53 paul424 joined #git
23:55 amponce joined #git

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