Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-19

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

All times shown according to UTC.

Time Nick Message
00:00 kbs hm, there's an inverse missing somewhere in there - late in the day.. sigh
00:00 RustyShackleford its going to be a disaster
00:00 RustyShackleford now if its my own branch that noone else will be using, a force push safe right?
00:00 RustyShackleford I just like to rebase so I don't diverge too far from master
00:01 RustyShackleford and it makes life easy for the guy merging pull requests
00:01 kbs sure - if no-one is doing anything with a ref, should be fine
00:03 RustyShackleford just to make sure I'm alert and stone cold sober
00:03 fstd_ joined #git
00:04 ResidentBiscuit joined #git
00:06 kbs I'm sort of liking gerrit's workflow than github, after having used both for small team projects. It's usually less taxing for me to look at history. anyhoo...
00:07 ResidentBiscuit joined #git
00:08 andlabs joined #git
00:08 mdw joined #git
00:08 mingrammer joined #git
00:10 romerocesar joined #git
00:10 madewokherd joined #git
00:11 drbean_ joined #git
00:13 ncd|leeN joined #git
00:15 lugzer joined #git
00:15 [2]tommycannady joined #git
00:18 [2]tommycannady left #git
00:19 tommycannady joined #git
00:19 tommycannady hi
00:19 tommycannady there is a huge issue with git
00:19 tommycannady er with me using it :)
00:19 tommycannady not with git itself
00:20 tachoknight___ joined #git
00:20 tommycannady I with git push command my result is permission denied
00:20 tommycannady is anyone there ?
00:21 livingstn joined #git
00:21 SourTrout are you pushing to github?
00:21 tommycannady to bitbucket
00:21 tommycannady I apologize for not specifing
00:21 SourTrout is it using SSH or HTTPS?
00:21 tommycannady SSH
00:21 tommycannady i also attempted to add a new ssh key
00:22 tommycannady but it would not accept a new or even old key
00:22 diogenese joined #git
00:22 tommycannady then someone messaged me about "simulation external life and simulation hypothesis" :| it was so odd......
00:22 tommycannady but back to this git idea
00:23 tommycannady I like git a lot but i don't seem to get it working all the time
00:23 SourTrout well i havent used bitbucket before so I'm not sure I could point you in the right direction. can you do a pull?
00:23 tommycannady I'm not sure but I'd rather not attempt one : )
00:23 tommycannady I do have backups however
00:23 n-st joined #git
00:24 tommycannady bitbucket ususally works the same way as github
00:24 tommycannady but there is a huge huge issue here
00:24 kadoban tommycannady: How are you choosing what key? What is 'git remote -v' output? What happens when you do 'ssh git@bitbucket.com'
00:24 tommycannady oh it actually said no data i believe
00:24 tommycannady I'll try it again
00:24 tommycannady oh that
00:24 tommycannady that gave the right data
00:24 tommycannady I'll look again
00:25 tommycannady there now you have it on your timethread if you look
00:25 cyphase joined #git
00:25 ljc joined #git
00:26 tommycannady thanks for a check on that
00:26 tommycannady I agree
00:26 kbs left #git
00:26 kadoban wat
00:26 a3Dman joined #git
00:26 tommycannady on git remote -v i mean
00:26 tommycannady it matches the repo
00:26 tommycannady I did check it
00:26 tommycannady I followed all of the instructions
00:27 tommycannady and almost had it working
00:27 tommycannady but then the git key would not accept at bitbucket so maybe it's a bitbucket issue ?
00:27 tommycannady that could be
00:27 tommycannady fortunately there is a bitbucket channel
00:27 tommycannady thanks again man
00:27 kadoban I was more wating about the timethread stuff and whatever, but okay cool, sounds like you figured it out possibly?
00:28 tlolczyk There is a  github project I want to clone locally and uise the code to start a slightly different project.  What I want to do is start a new branch make it master. take the old master integrate it into a new master, but I want future fetches from the old project to go into a branch old_master. how can I do that?
00:28 zacts joined #git
00:29 jackp10 joined #git
00:29 jackp10 hi everyone
00:29 gitinfo jackp10: 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.
00:30 justanotheruser joined #git
00:31 mwhooker joined #git
00:32 mwhooker joined #git
00:32 jackp10 I desperately need help. I was checking few things on the client server (live site) and, as I was working also on my local copy, I ran the command “git reset —hard {xxxxxx}” where xxxx is the latest commit. The problem with this is that the site (apache) is updating a json file when a user make some actions and those changes needs to be saved in the repository farily frequent. Now, I had that file unstaged and by running tha
00:32 jackp10 command, I fear I lost all those client inputs.
00:32 jackp10 please tell me that it is not the case (although I have a bad feelings about this)
00:32 SourTrout tlolczyk: sounds like you just need to fork, create a new branch, then as commits are made do a pull request into that new branch
00:33 danslo_ joined #git
00:34 kadoban jackp10: Check 'git status' I guess, and see what's actually in the file in question, but if it's gone and hasn't even been staged into git, yeah git can't help you.
00:35 jackp10 I ran the ‘git status’ and that file is not even there
00:35 stantonk joined #git
00:35 kadoban jackp10: And if you just 'ls the_file' I assume it's not there?
00:35 jackp10 the file is there because of previous inputs saved in the repository
00:36 Darren_ joined #git
00:36 jackp10 but probably does not contain all the new changes apache has added to it since last time it was pushed to the repository
00:36 kadoban Yeah, sounds like the new content is gone then.
00:37 jackp10 (damn)
00:39 kadoban A little to late to point this out, but I can't imagine a flat JSON file is a good way to store user input in a webpage. Isn't that racey as hell, amongst other issues? You should probably use sqlite or something, and remember that git is not a replacement for backups.
00:39 kadoban I never store stuff like user input in git, that just seems odd.
00:39 mingrammer joined #git
00:41 jackp10 kadoban, you are right and that was a bad call when the app design was done.. We are in the process of moving all those to mysql, which would solve this kind of constant issues
00:41 jackp10 I have to hope that the client does daily backups to the site
00:41 ochorocho__ joined #git
00:42 kadoban Hope so :-/
00:42 LeBlaaanc joined #git
00:43 ekinmur joined #git
00:44 dunpeal joined #git
00:46 rgrinberg joined #git
00:51 cqi joined #git
00:52 Jon28 joined #git
00:54 cd-rum joined #git
00:55 jaguarmagenta joined #git
00:56 elisa87 joined #git
00:57 elisa87 do you know how to solve this issue? https://dpaste.de/vrV8
00:57 elisa87 db.sqlite3 was in my .gitignore in local repo initially before I pull it into pythonanywhere by git pull
00:58 osse elisa87: line 11 says what to do
00:58 durham_ joined #git
00:58 osse also, !ignore_tr
00:58 gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
00:58 SourTrout joined #git
00:58 cd-rum_ joined #git
01:01 dreiss joined #git
01:02 lindenle joined #git
01:03 Electrometro joined #git
01:03 xall_ joined #git
01:05 livingstn joined #git
01:07 pks joined #git
01:09 lugzer joined #git
01:10 User458764 joined #git
01:10 Dougie187 joined #git
01:11 romerocesar joined #git
01:12 cyphase joined #git
01:14 zacts joined #git
01:14 mehola joined #git
01:16 mwhooker joined #git
01:17 danimal2 joined #git
01:18 fahadash joined #git
01:23 cagmz joined #git
01:29 tanuki joined #git
01:31 eroussel joined #git
01:31 arescorpio joined #git
01:34 jost_ joined #git
01:36 thiefg joined #git
01:36 jaguarmagenta joined #git
01:38 MattMaker joined #git
01:38 cdg joined #git
01:40 NeXTSUN joined #git
01:46 Digitteknohippie joined #git
01:46 lugzer joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and surveys | 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 | rerere: the git that keeps on giving
01:50 Asiajey joined #git
01:51 mwhooker joined #git
01:52 sdothum joined #git
01:56 MattMaker joined #git
01:56 bluezone joined #git
01:57 meloc joined #git
01:57 xall_ joined #git
01:58 ekinmur joined #git
02:03 HoierM joined #git
02:05 IWishIKnew joined #git
02:06 texinwien joined #git
02:08 FuzzyMaven joined #git
02:08 dan2k3k4 joined #git
02:09 MattMaker joined #git
02:09 jimi_ joined #git
02:11 hexagoxel joined #git
02:11 romerocesar joined #git
02:12 ajf- joined #git
02:15 Rikil joined #git
02:18 harish_ joined #git
02:18 thiago joined #git
02:19 xall_ joined #git
02:19 Noldorin joined #git
02:19 anuxivm left #git
02:20 dunpeal joined #git
02:21 MattMaker joined #git
02:22 sangy joined #git
02:23 sawtooth_ joined #git
02:25 ekinmur joined #git
02:28 Rikil joined #git
02:29 stantonk joined #git
02:30 mwhooker joined #git
02:30 rchavik joined #git
02:30 chachasmooth joined #git
02:30 stantonk joined #git
02:31 stantonk joined #git
02:31 cqi joined #git
02:32 Khisanth joined #git
02:34 MattMaker joined #git
02:34 danslo_ joined #git
02:35 Electrometro joined #git
02:36 Lyqyd joined #git
02:39 lugzer joined #git
02:40 nettoweb joined #git
02:41 romerocesar joined #git
02:44 ochorocho__ joined #git
02:44 ResidentBiscuit joined #git
02:46 LeBlaaanc joined #git
02:49 skyfaller left #git
02:54 sangy Hi, does anyone know why git show --format=%P prints the parent hashes *and* part of the diff?
02:54 thiago because you asked for it
02:54 thiago it's git *show*
02:55 thiefg joined #git
02:55 sangy shouldn't it just print what I asked it to?
02:55 sangy i.e. the format string?
02:55 thiefg left #git
02:55 thiago yes, it should print what you asked for
02:55 thiago you asked for the parent hash *and* the diff
02:56 thiago git show always shows the diff. That's the point of git show.
02:56 sangy hmm, I find that unexpected, are all of these commits diff-less? https://ptpb.pw/smgT
02:57 thiago I can't make heads or tails of your paste
02:57 LeBlaaanc joined #git
02:57 sangy I did git log --merges --onleline and got the commits (from the git.git repository)
02:57 sangy for each hash, I did git show --pretty=%P $hash, and got these
02:58 thiago yes, they're diffless
02:58 sangy hmm, interesting. Any alternative command to just print part of the header with a format string?
02:58 ekinmur joined #git
02:59 thiago yes
02:59 drbean joined #git
02:59 thiago but let's take a step back: what are you trying to achieve?
03:00 sangy I'm just trying to create a log of all the parents of merge commits
03:00 sangy [parent1] [parent2]
03:00 thiago why?
03:01 sangy It's an experiment, I just want to re-do the same merge with different git libraries
03:01 sangy and compare against the original
03:01 thiago git rev-list --parents --merges
03:02 romerocesar joined #git
03:02 cd-rum joined #git
03:03 sangy nice, thanks. I assume it's [parent 1] [parent 2] ... [parent n] [merge commit]?
03:03 thiago no, the other way around
03:03 thiago commit parent1 parent2 ...
03:04 sangy great, thanks!
03:04 lindenle joined #git
03:06 RickLee joined #git
03:07 RickLee joined #git
03:10 zumba_addict joined #git
03:11 zumba_addict hi folks, I ran git commit few times this morning. I wanted to find out what changes I made. Is it possible to show what files& changes I made on a specific commit?
03:12 zumba_addict I haven't executed git push yet
03:13 dmarr git show <sha>
03:13 zumba_addict k
03:13 zumba_addict looks like git log showed the logs that I've commited and pushed.
03:13 LeBlaaanc joined #git
03:13 MattMaker joined #git
03:14 zumba_addict right now, it's saying modified: package.json
03:14 dmarr git log -p
03:14 zumba_addict k
03:14 zumba_addict maybe i haven't executed git commit. Maybe i only ran git add .
03:14 zumba_addict i tried git diff package.json and didn't show any changes
03:14 dmarr or, maybe you ran commit but not add
03:15 zumba_addict k
03:15 zumba_addict when I run git status, I get this - (use "git reset HEAD <file>..." to unstage)
03:15 zumba_addict modified:   package.json
03:15 dmarr ok so its added
03:15 mehola joined #git
03:15 dmarr git diff --cached
03:15 zumba_addict added but not committed?
03:15 dmarr ya
03:16 zumba_addict that is awesome!
03:16 zumba_addict i see the changes I made. I'll put that command in my notes now :)
03:17 Dougie187 left #git
03:17 zumba_addict thanks a lot
03:17 zumba_addict did you see my other post in #javascript regarding npm issue?
03:17 Lyqyd_ joined #git
03:17 dmarr np! yeah - not sure what the deal with that is
03:17 ResidentBiscuit joined #git
03:18 zumba_addict and many people have submitted issues on the node github repo
03:18 zumba_addict same issue
03:18 MattMaker joined #git
03:18 zumba_addict https://github.com/npm/npm/issues/10727
03:19 zacts joined #git
03:20 k3rn31 joined #git
03:21 romerocesar joined #git
03:22 jaguarmagenta joined #git
03:23 treaki__ joined #git
03:23 a_thakur joined #git
03:24 danimal2 joined #git
03:24 Goplat joined #git
03:25 willhunt joined #git
03:31 zumba_addict is there a way to check if I really haven't executed git commit?
03:32 thiago look at your terminal
03:32 thiago if you executed it, you should see it
03:32 thiago or just remember whether you pressed Enter
03:32 romerocesar joined #git
03:33 zumba_addict I couldn't remember what I did before I went home. I had to many things going today
03:33 zumba_addict it's been like 6 hours
03:33 zumba_addict i ran history but there's just tons of commands
03:33 thiago obviously git doesn't record the actions you didn't do
03:34 thiago your shell's history rcords all commands you have run and none that you didn't run
03:34 zumba_addict for git add ., one indicator I see is that it shows "(use "git reset HEAD <file>..." to unstage)"
03:35 zumba_addict but looks like git log won't show any commit that hasn't been pushed. Or am I wrong?
03:35 thiago yes, if you stage something, git status gives you the information on how to unstage
03:35 thiago git log will show all commits, pushed or not
03:35 dmarr git reflog
03:35 zumba_addict k
03:35 thiago all commits in the current branch, that is
03:35 zumba_addict got it
03:35 zumba_addict what is git reflog
03:36 dmarr also git commit before you go home but leave the git push for the morning #protip
03:36 zumba_addict So I guess, I really didn't execute git commit
03:36 thiago I don't want to confuse you now
03:36 zumba_addict will do
03:36 thiago yeah, no "push and run"
03:36 stantonk joined #git
03:36 zumba_addict looks like here's what happened
03:36 lindenle joined #git
03:37 zumba_addict i updated package.json and was planning to run git commit but my mind changed and though of executing npm test which failed.
03:37 thiago good idae
03:37 zumba_addict then I updated package.json again thinking that the change I made was the culprit
03:37 zumba_addict but it wasn't :)
03:37 kadoban joined #git
03:37 zumba_addict i'll do a git commit now
03:38 zumba_addict I thought I executed it but git log didn't show any
03:38 zacts joined #git
03:39 zumba_addict git push successful. I'm going to check our Jenkins job now since it's been failing
03:39 thiago it was failing before your change?
03:40 zumba_addict on my machine and another dev's machine before my change
03:40 zumba_addict but on the 3rd dev's machine, it was fine
03:40 zumba_addict it's npm install issues
03:41 zumba_addict i escalated the issues to the Node tam
03:41 thiago looks like you need to update your CI rules or environment to catch more cases
03:41 zumba_addict team
03:41 zumba_addict yup, we need
03:42 watabou joined #git
03:43 cyan__ joined #git
03:46 dsantiago joined #git
03:46 kadoban joined #git
03:49 a_thakur joined #git
03:51 mehola joined #git
03:51 phanimahesh joined #git
03:54 clemf joined #git
03:55 LeBlaaanc joined #git
04:02 clemf joined #git
04:02 macivy joined #git
04:02 romerocesar joined #git
04:04 HanClinto joined #git
04:05 durham joined #git
04:06 mingrammer joined #git
04:09 nilg joined #git
04:09 dsantiago joined #git
04:13 rscata joined #git
04:16 danimal2 joined #git
04:18 xall_ joined #git
04:19 morenoh149 joined #git
04:24 stantonk joined #git
04:25 ngavoii joined #git
04:26 EvilPeng1 joined #git
04:27 LeBlaaanc joined #git
04:32 romerocesar joined #git
04:35 durham joined #git
04:37 Limes_ joined #git
04:40 vuoto joined #git
04:41 drbean_ joined #git
04:45 ochorocho__ joined #git
04:46 kugel joined #git
04:48 shinnya joined #git
04:51 du recommendations for a linux git client, for a friend?
04:52 du 21:38 <@Mrgoose> yea but there isn't a good GIT GUI in linux
04:54 dreiss joined #git
04:54 a_thakur joined #git
04:57 zumba_addict is it possible to keep the execute bit of a file? let's say we execute chmod +x node_modules/webtools/setup.sh
04:57 drbean joined #git
04:58 subhojit777 joined #git
04:58 du i believe you can configure to track and ignore file permissions
04:58 zumba_addict k
04:58 Cabanossi joined #git
04:58 kadoban zumba_addict: What do you mean keep? git does track the executable bit
04:58 freimatz joined #git
04:59 zumba_addict i want to add executable bit so that when i git clone the repo again, I don't have to rerun chmod +x thefile.sh
04:59 zumba_addict so git is aware about the file permissions bits?
04:59 du i know that my repository is tracking file permissions without any additional configuration
04:59 kadoban zumba_addict: Then just set the executable bit, stage that, and commit it. Git tracks executable bit, no other bits.
04:59 zumba_addict k
05:00 zumba_addict cool
05:00 zumba_addict i wasn't aware
05:00 du yeah, because i remember specific commits i made that were just file permissions
05:00 mingrammer joined #git
05:00 zumba_addict got it
05:01 emPi joined #git
05:03 romerocesar joined #git
05:04 zumba_addict yup, git knows about the files perms. I just tested it :)
05:04 zumba_addict old mode 100644
05:04 zumba_addict new mode 100755
05:04 zumba_addict sweet
05:05 mwhooker joined #git
05:06 danimal2 joined #git
05:09 lordjancso joined #git
05:10 Darren_ joined #git
05:12 drbean_ joined #git
05:13 armyriad joined #git
05:13 dunpeal joined #git
05:15 Sucks joined #git
05:17 stuh84 joined #git
05:18 mingrammer joined #git
05:22 romerocesar joined #git
05:23 sostenuto joined #git
05:25 danimal2 joined #git
05:26 drbean joined #git
05:26 Mo joined #git
05:27 Mo Hi, how can I remove a submit from my local repo completely, not submitting a revert change?
05:29 thiago Mo: "submit" is not a Git operation
05:29 thiago what do you mean by that? What do you want to do?
05:31 Mo thiago: commit, sry, too many vcs.  I have a bare repo doing   git p4 sync   continiuously. Now on p4 I had a wrong submit. I was able at least to rename the text of that submit. Now on the git clone I like to rename that submit or remove it completely from history.
05:32 Mo What about git reset --hard HEAD~1   would that leave a sane repo without the last change?
05:33 muthu joined #git
05:33 thiago what do you mean by "rename the text of that submit" in p4?
05:33 thiago did you change the commit in the p4 repo?
05:35 Mo I just changed the subscription which was the error.. the change itself was meaningless, not harmful...
05:35 thiago subscription?
05:36 Mo sry, description.   p4 submit -d "wrong description"
05:36 thiago that creates a p4 commit
05:36 thiago what do you mean when you said you renamed it?
05:36 watabou joined #git
05:37 lindenle joined #git
05:39 Mo thiago:   p4 change -u 4711 -d "correct description"
05:40 Mo New git p4 sync don't get those changes anymore.
05:40 thiago right
05:40 thiago delete your git clone and restart
05:41 thiago and never rewrite p4 history again
05:41 Mo thiago: That is fatal, deleting the clone and re cloning will change all change ids in git.
05:41 anbz joined #git
05:42 ThomasLocke joined #git
05:42 ThomasLocke joined #git
05:42 thiago yes
05:42 thiago rewriting history in perforce causes that
05:42 Mo thiago: The mistake was not the rewrite, but the submit itself.  In p4 I was able to fix at least the description, but in my git clone I can't get that last commit deleted or description modified.
05:42 drbean_ joined #git
05:42 thiago the submit may have been a mistake
05:42 thiago rewriting was definitely a mistake
05:42 thiago NEVER do it again
05:43 Mo No, rewriting history in P4 is not the cause, every new clone could generate different ids, that is a common issue of git p4.
05:43 Mo We often rewrite the P4 history here and there if submits have typos in the description.
05:44 thiago rewriting requires re-cloning
05:44 Mo What if I do git reset --hard HEAD~1 on that git clone?
05:44 thiago I don't know if git p4 keeps a cache of what the last p4 change ID it worked on
05:45 thiago you can try that, but if anyone has already downloaded that change from Git, they will have to delete their Git clones and re-clone.
05:46 Mo fatal: This operation must be run in a work tree   It's a bare repo.
05:46 Mo No, it's my local clone only, that is used for a web-browser, that cannot deal with P4 itself.
05:46 thiago edit the refs/heads/master file directly
05:46 romerocesar joined #git
05:47 Mo But that would only set the head to somewhere else, but would not delete the last commit?
05:47 thiago the two things are one and the same
05:48 thiago btw, you can use git update-ref instead of editing the file
05:49 liuzhen joined #git
05:49 Mo My current head is   * commit 69af85eeea9057067b169c0d7d0797edf4b0c194 (refs/remotes/p4/master, refs/remotes/p4/HEAD)      but that does not match the content of refs/heads/master
05:49 DolphinDream joined #git
05:50 qt-x joined #git
05:50 deitarion left #git
05:51 zeroed joined #git
05:51 thiago update the remotes/p4/master ref too
05:51 Mo I see,  (HEAD -> refs/heads/master)  has stopped somewhere in the past.
05:52 danimal2 joined #git
05:52 govg joined #git
05:53 jungsubk joined #git
05:54 dsdeiz joined #git
05:54 Andrew_K joined #git
05:55 lolmac joined #git
05:55 Mo thiago: Wow, marvellous. After that another git p4 sync got the "new history" from p4. Thanks.
05:56 thiago hint: don't change existing commits anymore
05:57 drbean joined #git
05:58 Mo Sometimes I must, and now I know how to sync that back to the git clone.
05:59 thiago Git history cannot be changed
05:59 thiago Mo: a history !rewrite in Git is a major thing. You'll need to delete and re-clone.
05:59 gitinfo Mo: 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
05:59 thiago so don't do it in p4 either.
06:00 xall_ joined #git
06:00 Macaveli joined #git
06:02 cdown joined #git
06:02 nnyk joined #git
06:04 danimal2 joined #git
06:04 cdown_ joined #git
06:07 jeus2 joined #git
06:10 romerocesar joined #git
06:11 Billykv joined #git
06:11 ramsub07 joined #git
06:13 pneuma joined #git
06:15 Samual joined #git
06:17 DolphinDream joined #git
06:18 jeus2 joined #git
06:20 dreiss joined #git
06:20 vtq joined #git
06:22 ache1 joined #git
06:23 bonerx2k joined #git
06:24 woodruffw joined #git
06:24 drbean_ joined #git
06:25 woodruffw joined #git
06:25 Codfection joined #git
06:25 Mo thiago: p4 is originally not decentralized, there is nobody pulling from, everyone is watching the one central history.
06:25 thiago I know
06:25 watabou joined #git
06:26 Mo That git clone is the first decentral pulling from p4 now :)   Anyway, new P4 versions are going to decentral solutions, just like all the git, hg etc.
06:26 thiago but rewriting history means someone could sneak in a change
06:26 Mo Changes itself cannot be changed by p4 change -u
06:27 thiago you changed your change
06:27 thiago therefore, they can
06:27 Mo To be honest, p4 is so much different than git and hg I'm using for my own work. But otherwise, p4 is very powerful in large architectures.  I just did not manage to learn how to use p4 "offline" with the new sandbox features and pushing back to the server when back home, just like git.
06:28 drbean- joined #git
06:28 Darren_ joined #git
06:29 Mo And today, p4 can better deal with git itself, than the not well known git p4 . I used that some time ago, to have a git api to p4.
06:29 sergio1234 joined #git
06:30 apotry joined #git
06:31 djb-irc joined #git
06:32 reim joined #git
06:33 settermjd joined #git
06:34 theskillwithin joined #git
06:35 PaulCapestany joined #git
06:37 danslo joined #git
06:40 nuck joined #git
06:41 MikeIon joined #git
06:41 circ-user-pIZEP joined #git
06:42 drbean joined #git
06:45 TomyWork joined #git
06:46 ochorocho__ joined #git
06:48 dopesong joined #git
06:50 danslo joined #git
06:52 irco joined #git
06:52 mischat joined #git
06:52 aidalgol joined #git
06:58 dadada joined #git
06:59 ejnahc joined #git
06:59 tehtraveler2321 joined #git
07:02 Hounddog joined #git
07:02 watersoul joined #git
07:02 Softeisbieger joined #git
07:04 pneuma_ joined #git
07:05 texinwien joined #git
07:05 JeroenT joined #git
07:05 [Brain] joined #git
07:07 Alienpruts joined #git
07:08 encod3 joined #git
07:08 mwhooker joined #git
07:09 Layzie joined #git
07:09 z8z joined #git
07:12 drbean_ joined #git
07:12 [Brain] joined #git
07:13 mariuscc joined #git
07:13 orbitphreak joined #git
07:14 xall_ joined #git
07:16 dan2k3k4 joined #git
07:16 nobso joined #git
07:16 thoraxe joined #git
07:16 p4trix joined #git
07:18 pR0Ps joined #git
07:21 baxx joined #git
07:22 adac joined #git
07:23 danimal2 joined #git
07:23 adac how can I checkout a branch with the path: "remotes/origin/remove_login" shouldn't it be simply "git checkout remove_login"?
07:25 grawity normally, yes
07:25 grawity if it doesn't work, `git checkout -b remove_login origin/remove_login` should do it
07:26 kab joined #git
07:26 Balliad joined #git
07:26 _ikke_ Note that git checkout remove_login is an automagic(tm) feature that tried to guess that you meant to create a new branch based on a remote tracking branch only if there is one possible match
07:26 stantonk joined #git
07:28 drbean joined #git
07:30 tvw joined #git
07:33 GavinMagnus joined #git
07:33 ahmedelgabri joined #git
07:33 dan2k3k4 joined #git
07:36 adac grawity, thanks, I'll try that
07:36 kab joined #git
07:36 troulouliou_div2 joined #git
07:38 watabou joined #git
07:39 lindenle joined #git
07:39 cyphase joined #git
07:39 Lomex joined #git
07:41 drbean_ joined #git
07:42 mingrammer joined #git
07:42 Lvjasha joined #git
07:42 nnyk joined #git
07:42 mingramm_ joined #git
07:44 kab joined #git
07:44 txm joined #git
07:47 mischat joined #git
07:48 pneuma joined #git
07:49 money_bug joined #git
07:49 k3rn31 joined #git
07:49 mischat joined #git
07:51 multi_io joined #git
07:51 Arban joined #git
07:55 adac joined #git
07:55 PCatinean joined #git
07:55 troulouliou_div2 joined #git
07:56 LiohAu joined #git
07:56 troulouliou_divn joined #git
07:57 p4trix I want to cherry-pick-remove a commit... If that does make any sense
07:58 lugzer joined #git
07:58 p4trix Basically removing the changes entirely a commit in the middle of the history
07:58 rcollier joined #git
07:58 p4trix Basically removing the changes entirely a commit DOES in the middle of the history
07:58 selckin rebase -i
07:58 drbean joined #git
07:58 p4trix Thx
08:00 JeroenT joined #git
08:01 jungsubk joined #git
08:02 kab joined #git
08:03 nnyk joined #git
08:03 kurkale6ka joined #git
08:04 Alienpruts joined #git
08:04 Rish joined #git
08:05 pneuma joined #git
08:06 armyriad joined #git
08:06 DevAntoine joined #git
08:08 watabou joined #git
08:11 zeroed joined #git
08:12 lugzer joined #git
08:12 mwhooker joined #git
08:12 a_thakur joined #git
08:12 lugzer_ joined #git
08:13 kedare joined #git
08:15 bongjovi joined #git
08:16 lugzer_ joined #git
08:19 JeroenT joined #git
08:20 jceb joined #git
08:22 chll_ joined #git
08:23 GorillaApe joined #git
08:24 cbreak p4trix: git revert will do something like cherry pick to remove changes
08:24 singalaut joined #git
08:25 p4trix cbreak, yes thank you. I just used that myself.
08:25 p4trix Found it after some research. Thx though :D
08:26 GorillaApe left #git
08:26 Terens joined #git
08:26 Terens hello
08:26 Terens I did git merge my-branch and it did fast forward..
08:27 Terens Now I cant push that because "Everything up-to-date"
08:27 davisonio joined #git
08:28 osse Terens: sounds fine
08:28 hackal joined #git
08:28 Terens so how can i push merged stuff ?
08:28 a_thakur joined #git
08:28 osse there is nothing to push
08:28 Terens hm it seems that master got updated
08:29 osse the merge was a fast-forward meaning that you were behind
08:29 Lomex joined #git
08:30 satanist joined #git
08:30 hackal Hi, I have need git to ignore 1 file. So I used .gitignore and added /config.js to it. config.js is in the same directory as .gitignore, however when I make changes to config.js and do git status it says changes not staged and shows config.js file. is there a way to ignore the config.js?
08:30 ahmedelgabri joined #git
08:32 _ikke_ !ignore_untracked
08:32 gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
08:32 danimal2 joined #git
08:34 osse !config
08:34 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
08:34 hackal Ok, so what if I want to have empty config.js file in my repo and I want everyone to fill it in themselves, without commiting the changes to repo
08:35 Repox joined #git
08:36 osse if you mean literally empty then they might as well create it themselves. Otherwise see the info above
08:37 hackal not literally empty. https://gist.github.com/hackal/7ede0f3101fc2068279553adc6cce1f9
08:39 armyriad joined #git
08:39 lindenle joined #git
08:42 harish_ joined #git
08:42 JeroenT joined #git
08:44 FuzzySockets joined #git
08:47 ochorocho__ joined #git
08:48 raven-au joined #git
08:51 moei joined #git
08:52 adamm joined #git
08:53 danimal2 joined #git
08:55 King_Hual joined #git
08:56 yalu joined #git
08:56 clmsy joined #git
09:00 yalu Question about detached heads - it seems this is a situation to avoid. I just had a worrying message from Git: "Warning: you are leaving 7 commits behind, not connected to any of your branches". Now I noticed those left behind commits are not visible anymore in the output of "git log" even with "--all --graph"
09:00 selckin !reflog
09:00 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
09:01 Lomex joined #git
09:02 yalu see, this is what frustrates me in Git... I barely understand a word of what that bot says
09:03 cbreak yalu: it's quite simple if you understand it, as with everything
09:03 cbreak !detached
09:03 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
09:03 cbreak yalu: basically, each commit has a hash that identifies it.
09:03 cbreak branches point to such hashes
09:03 cbreak if you are on a detached HEAD, then no branch points to the commit, and you'd lose it if you switch away
09:04 cbreak of course, it's still stored in the reflog for a short time, but if you want to keep it, you should create a branch or tag that points to the commit
09:04 raven-au joined #git
09:05 lugzer joined #git
09:05 yalu so if you are in detached head and you switch away - checkout a branch with older commits - the commit you were on is actually in danger of being erased from the repository?
09:06 jast only if it's not reachable from any ref (branch/tag)
09:06 grawity yes, though only a few days/weeks later
09:06 jast meaning, it's okay to detach HEAD, but if you commit on top of a detached HEAD and then go somewhere else, your commit is in limbo
09:07 grawity well yeah, I guess if you check out an older commit, that's still "detached"
09:07 grawity but not eligible for gc
09:07 drewo joined #git
09:07 grawity only additional commits on top would be
09:08 jast as a rule of thumb, if neither 'git branch --contains' nor 'git tag --contains' outputs anything for your commit, don't expect it to stick around forever
09:08 DevAntoine joined #git
09:09 watabou joined #git
09:09 jast in your case, it looks like you committed while not on a branch
09:09 jast so those commits are not referenced
09:10 jast much like when you open a file in an editor, change and quit without saving. the only thing covering you in that situation is the editor's autosave feature.
09:11 jast in git one easy way to make sure your commits don't get lost is to create a new (more or less temporary) branch and put your commits in it
09:11 yalu basically (since I am not exactly an expert on Git as you can tell) I am not using any branches except master, so I guess I need to checkout the HEAD I was on 20 minutes ago (that works) and merge "master" in?
09:12 jast for instance: git branch mytempbranch <ID of 'previous HEAD position' according to message>
09:12 jast that will create mytempbranch and dump your commits in there
09:12 jast another option is to simply merge the same commits (git merge <same ID>)
09:12 yalu aha, ok
09:13 yalu so if you provide a pointer, the commits are safe
09:13 jast exactly
09:13 jast anything that is "referenced" is safe
09:13 jast more accurately, anything that is *reachable* (via parent relationships) from a reference is safe
09:13 mwhooker joined #git
09:13 yalu it's wtrange you even have to do that. I mean: commits also point to each other, so I would think no commit is ever entirely unreferenced
09:13 jast no, each commit only points to its parents
09:14 yalu not the other way around
09:14 jast there is no link in the other direction. why not? because commit IDs are based on their content. if you were to add a reference to a child, the commit ID would have to change
09:14 jast and then other references are broken
09:15 jast worse, much like in real life, a commit can get new children at any time, but new parents are rather rare ;)
09:15 jaguarmagenta joined #git
09:15 yalu that makes sense, from a technical point of view.
09:16 yalu can't take a peek into the future can you :)
09:16 jast it also allows us to use garbage collection to clean up if, for instance, you decide you no longer need a branch
09:16 yalu speakign of which: the commit would still be somewhere in there, as "unreferenced garbage"
09:16 jast exactly
09:17 jast though we actually have two levels of safety
09:17 yalu but since it points to its parent, git could tell you where it belongs
09:17 jast yes, which is why it's so easy to create a new branch from unreferenced stuff
09:18 jast anyway, the two safety levels: totally unreferenced objects are kept around for a specific amount of time (configurable). in addition, any operation you do in git (commit, merge, ...) creates a "reflog" entry. the reflog takes snapshots after each operation you perform, associated with the commit ID at the time, and you can look them up later
09:18 jast reflog have a separate expiration period, so as long as a commit of yours is still referenced in the reflog, it won't be expired by the first mechanism
09:19 kedare_ joined #git
09:19 jast if you want to have a look at the reflog for HEAD (any changes made to HEAD, which covers almost all operations in Git): git log -g
09:19 yalu ok.. I just found the command reflog --stale-fix
09:20 jast you should never need that one in versions of Git released in the last ~10 years
09:20 jast (the 10 is a very rough guess, though :))
09:21 jast it's more like 7, really
09:21 jast basically, early on, reflogs did not protect objects from being expired, but that changed quite some time ago
09:21 yalu this box is running 1.7.something
09:24 jast reflog protection was added in 1.5.0
09:25 gechr joined #git
09:25 jast released February 2007. how time flies...
09:26 ache1 joined #git
09:26 notebox joined #git
09:26 a_thakur_ joined #git
09:27 go1111111 joined #git
09:30 yalu thanks a bunch :) I'm slowly crawling out of the newbie cave here.
09:30 jast you may yet see the light! ;)
09:33 wethu joined #git
09:34 dsdeiz joined #git
09:34 dsdeiz joined #git
09:36 wrouesnel joined #git
09:37 Kev- joined #git
09:39 achadwick joined #git
09:43 lem-fr joined #git
09:45 satanist left #git
09:46 Darcidride_ joined #git
09:47 acetakwas joined #git
09:48 Darcidride joined #git
09:48 nnyk joined #git
09:49 danimal2 joined #git
09:49 skul joined #git
09:58 sneep left #git
10:01 drewo joined #git
10:01 settermjd joined #git
10:04 sdothum joined #git
10:07 mikecmpbll joined #git
10:08 jimi_ joined #git
10:09 TSS3000RO joined #git
10:10 intellix joined #git
10:12 watabou joined #git
10:14 drbean_ joined #git
10:15 mwhooker joined #git
10:16 k3dare joined #git
10:22 sbulage joined #git
10:23 sbulage left #git
10:24 nnyk joined #git
10:25 elsevero joined #git
10:26 JeroenT joined #git
10:26 xall_ joined #git
10:27 guardian hello, what's the rationale behind commit notes not being fetched and pushed by default? Asked yesterday but nobody seemed to know / have an opinion :)
10:27 drbean joined #git
10:28 lesshaste joined #git
10:33 ahmedelgabri joined #git
10:35 basiclaser joined #git
10:36 _ikke_ Trying to find the discussion about the implementation
10:38 bremner it's just a seperate ref space, like tags. not sure why that's hard
10:40 andlabs joined #git
10:41 texinwien_ joined #git
10:41 mehola joined #git
10:41 _ikke_ http://thread.gmane.org/gmane.comp.version-control.git/129770/focus=129768
10:42 k3rn31 joined #git
10:44 johnmilton joined #git
10:45 LeMike joined #git
10:47 mdw joined #git
10:47 lesshaste left #git
10:47 ochorocho__ joined #git
10:55 chachasmooth_ joined #git
10:55 drewo joined #git
10:55 jerv joined #git
10:57 drbean_ joined #git
10:57 dmto joined #git
10:58 jerv Is it possible to move all working copy files to some earlier revision's state without checking out that revision?
10:59 jeffreylevesque joined #git
10:59 a_thakur joined #git
10:59 grawity git checkout <that_revision> .
10:59 grawity i.e. specify a path to check out
11:00 danimal2 joined #git
11:01 LeeFly joined #git
11:01 jast the downside of that is that it doesn't remove files that weren't present in the other revision
11:01 jast also you could end up accidentally committing all those changes and end up with what's almost a revert
11:01 grawity I thought the latter is exactly what jerv wants
11:02 jast no idea :)
11:06 dstarh joined #git
11:06 HanClinto joined #git
11:10 Lomex joined #git
11:12 drbean joined #git
11:13 watabou joined #git
11:15 rnsanchez joined #git
11:16 jaguarmagenta joined #git
11:16 ojdo joined #git
11:16 mwhooker joined #git
11:18 livingstn joined #git
11:18 CheckDavid joined #git
11:18 danimal2 joined #git
11:18 guardian _ikke_: thanks for digging the thread up. I'll take some time to read it thoroughly and figure out why commit notes are not fetched/pushed by default
11:19 HoierM joined #git
11:22 settermjd joined #git
11:25 wrouesnel1 joined #git
11:25 jceb joined #git
11:25 a_thakur joined #git
11:26 drbean_ joined #git
11:26 usm4n joined #git
11:29 usm4n joined #git
11:32 a3Dman joined #git
11:39 stonerfish joined #git
11:40 nettoweb joined #git
11:40 danimal2 joined #git
11:43 drbean joined #git
11:44 azbarcea joined #git
11:47 WayToDoor joined #git
11:49 mischat_ joined #git
11:49 Impaloo joined #git
11:49 drewo joined #git
11:53 kukks joined #git
11:53 kukks joined #git
11:57 Heisenberg1276 joined #git
12:00 mastro joined #git
12:02 tomog999_ joined #git
12:03 Lomex joined #git
12:03 SourTrout joined #git
12:04 danimal2 joined #git
12:04 frogonwheels joined #git
12:05 eizua joined #git
12:06 g105b joined #git
12:07 shirty joined #git
12:08 TooLmaN joined #git
12:09 andlabs joined #git
12:09 ag4ve_ joined #git
12:09 Anticom joined #git
12:10 usm4n joined #git
12:10 Chiko joined #git
12:11 rgrinberg joined #git
12:13 drbean_ joined #git
12:14 dadada joined #git
12:14 dadada hi
12:14 jerv grawity: yep
12:15 watabou joined #git
12:15 dadada I pushed a git repository to a remote location and later noticed that email/name were not correct in all of the commits
12:16 synthroid joined #git
12:16 dadada can I delete the complete remote repository/master branch from the location I pushed to
12:16 dadada ?
12:16 SourTrout dadada: https://help.github.com/articles/changing-author-info/
12:17 sanketdg joined #git
12:18 mwhooker joined #git
12:18 jantje I've seen two occurences where a commit was accepted but post-receive was never ran.
12:19 jantje I suspect it wasn't even started because I log all pre/post-receive runs and the pre- is there, but the post- isnt. Seen with 2.5.x  and 2.8.x
12:19 Timvde joined #git
12:20 jantje so I have no idea what happened. :/
12:20 rwb joined #git
12:21 jantje but I do know that the user pressed ctrl-c on his end, early terminating the client, so likely hit a sigpipe. But I've just tested that and once the post-receive hooks are started they run nicely. (I trap sigpip)
12:21 jstimm joined #git
12:21 rgrinberg joined #git
12:22 angular_mike do you need to add execute permissions to a shared repository's directory for other people in its owner group to be able to use it?
12:22 livingstn joined #git
12:23 angular_mike is there any documentation on setting up ACLs for shared repository?
12:24 grawity just use gitolite
12:24 grawity as far as unixish systems are concerned, yes, you need +x in order to access anything inside the directory
12:24 grawity (+r only lets you list the filenames)
12:24 dadada SourTrout: ty, that helped a lot
12:25 grawity `git init --share=group` can set basic things up, but use gitolite anyway
12:25 SourTrout dadada: good to hear
12:25 RedShift joined #git
12:26 angular_mike grawity: not an option
12:26 angular_mike gitolite, that is
12:26 grawity why not?
12:26 angular_mike grawity: I no access outside the node on which the code is
12:26 angular_mike grawity: also not enough traction to install anything
12:27 angular_mike or touch networking
12:27 asti joined #git
12:27 angular_mike all I can do is set up a directory on the same FS where other users work
12:28 grawity ok, so `git init --share=group`
12:28 angular_mike grawity: does it take care of permissions?
12:28 grawity yes
12:29 angular_mike grawity: Even if permissions are managed with ACL?
12:29 grawity (umask 077; git init --share=group test.git) will make a group-only repo
12:29 grawity ACLs are fine, I guess
12:29 grawity as long as you don't forget to set inheritable ones as well
12:30 asti hello. I'm a little confused about what just happened (with git): I did a pull and Git told me that "local changes to the following files will be would be overwitten by a merge". But when I go to those files, I see no conflicts (no sections delimited by <<<< and >>>> and so on) and also when I do `git status` I see no files in a conflict state. So then why the original message?
12:30 danimal2 joined #git
12:30 jceb joined #git
12:30 angular_mike I think my user got permission denied when trying to clone it with just that
12:30 angular_mike grawity: no, I mean is `git init --share=group` enough if file permissions are managed on ACL level?
12:31 grawity it's probably not needed then
12:31 espindola joined #git
12:32 jast asti: you're not having a conflict. your situation is that you have uncommitted changes, and by adding conflict markers git would mess up those changes with no way to go back, so it refuses. you can stash your changes or commit them, afterwards pull will work.
12:32 MZAWeb joined #git
12:32 muthu joined #git
12:32 jast this happens whenever a merge has to update one of the files that have uncommitted changes
12:32 angular_mike grawity: are you saying that it will auto-magically allow the users to clone and push the repo without me even touching setfacl?
12:32 jast well if you do need POSIX ACLs, then obviously you do need them :)
12:33 muthu joined #git
12:33 jast btw group is the default for --shared
12:33 asti jast: so what I need to do is to `git stash` the conflicted files and then `git stash pop` the changes back right?
12:34 jast asti: sure, that's one way of doing it. and again, they're not conflicted. they *would* conflict with the merge because they're in the same place. :)
12:34 jast the advantage is that now you can pop the stash after finishing the merge, and even if you mess up conflict resolution you can just hard reset everything away and try again, because the stash is still there.
12:34 asti jast: thanks a lot ;)
12:34 drbean joined #git
12:35 jeffreylevesque joined #git
12:36 Lomex joined #git
12:37 rnsanchez joined #git
12:37 angular_mike now I'm confused
12:37 inflames joined #git
12:37 bongjovi joined #git
12:37 angular_mike do I need to set ACLs to allow recursively rwx to everything under repo dir for its owner group or not?
12:38 grawity yes
12:39 moritz gitolite is easier.
12:40 jast I don't recommend blindly setting rwx on everything. rwX is much smarter.
12:41 usm4n joined #git
12:42 grawity in setfacl "default ACLs", it's still rwx
12:42 grawity instead, it gets masked out at create time
12:42 jast sure
12:43 mehola joined #git
12:43 usm4n joined #git
12:43 Impaloo joined #git
12:43 drewo joined #git
12:44 MZAWeb_ joined #git
12:44 reactormonk left #git
12:46 stantonk joined #git
12:47 crose joined #git
12:47 cd-rum joined #git
12:48 ochorocho__ joined #git
12:51 inflames joined #git
12:52 cqi joined #git
12:53 LBV_User joined #git
12:57 troulouliou_div2 joined #git
13:00 Repox joined #git
13:01 liamonade joined #git
13:03 NeonSynth joined #git
13:03 Macaveli joined #git
13:03 tabrez joined #git
13:03 FunkyAss joined #git
13:03 fahadash joined #git
13:04 courrier joined #git
13:05 kadoban joined #git
13:06 xall_ joined #git
13:10 daniel_rose joined #git
13:11 synthroi_ joined #git
13:11 lugzer_ joined #git
13:12 synthro__ joined #git
13:13 Jeroen joined #git
13:14 fmcgeough joined #git
13:15 lugzer joined #git
13:16 watabou joined #git
13:17 jaguarmagenta joined #git
13:18 ekinmur joined #git
13:19 kab_ joined #git
13:19 mwhooker joined #git
13:21 baxx joined #git
13:23 JeroenT joined #git
13:24 troulouliou_div2 joined #git
13:25 ash_workz joined #git
13:25 GodGinrai joined #git
13:25 kab joined #git
13:26 snowkidind joined #git
13:28 ramsub07 joined #git
13:29 rnsanchez_ joined #git
13:29 leeN joined #git
13:30 rnsanchez_ joined #git
13:32 Repox joined #git
13:32 mostlybadfly joined #git
13:32 MZAWeb_ joined #git
13:34 notebox joined #git
13:36 vuoto joined #git
13:37 Jeroen joined #git
13:37 drewo joined #git
13:39 jaafar joined #git
13:40 BigWillie joined #git
13:42 mamParra left #git
13:43 AaronMT joined #git
13:44 ericsupreme joined #git
13:44 mischat joined #git
13:44 drbean_ joined #git
13:45 vuoto joined #git
13:45 vuoto joined #git
13:46 JeroenT joined #git
13:49 phaleth joined #git
13:49 howdoi joined #git
13:51 LeMike joined #git
13:53 NeverDie joined #git
13:53 dsdeiz joined #git
13:53 dsdeiz joined #git
13:55 NeverDie joined #git
13:55 catag87 joined #git
13:56 l4v2 joined #git
13:56 Jession_BO joined #git
13:57 Jession_BO left #git
13:58 catag87 joined #git
13:58 Darcidride_ joined #git
13:58 floatingpoint joined #git
14:01 ajf- joined #git
14:03 settermjd joined #git
14:05 qt-x joined #git
14:06 stantonk joined #git
14:07 des_consolado joined #git
14:07 marcelofr joined #git
14:07 des_consolado Hey I've got submodules in my repo and if I clone it with --recursive it grabs the repos' files but they're all in detached HEAD, even though I've specified the branch in .gitmodules
14:07 clemf joined #git
14:09 ResidentBiscuit joined #git
14:09 jast des_consolado: I believe that's partly because tracking a branch in a submodule was added as a bit of an afterthought, and is at odds with the basic concept of how submodules work
14:10 jast were you intending to do actual work (committing etc.) in those submodule directories?
14:12 catag87_ joined #git
14:12 phanimahesh joined #git
14:12 Jeroen joined #git
14:13 umbSublime joined #git
14:13 ahmedelgabri joined #git
14:13 des_consolado jast: Yeah
14:14 jast okay, one thing that might cause issues is that once you've got uncommitted changes in a submodule dir, a full recursive update can abort when getting to that submodule
14:15 jast that and related issues is the reason they always detach: to discourage actually working in there
14:15 dunpeal There's commit A, and branch foo that branched off it. Can I make it so that foo branched off B instead?
14:15 shinnya joined #git
14:15 dunpeal similar to rebase, but with branches instead.
14:16 dunpeal I suppose I can rebase the branch...
14:16 moritz that's exactly what rebase is, yes :-)
14:17 dunpeal yeah, I guess my mind is too used to think of "rebase" as "a way to keep history linear"
14:17 stantonk joined #git
14:18 watabou joined #git
14:18 Rish_ joined #git
14:19 ShekharReddy joined #git
14:20 stantonk joined #git
14:20 ccha5 left #git
14:20 cdown_ joined #git
14:21 vuoto joined #git
14:21 mwhooker joined #git
14:22 ORiON-- joined #git
14:26 livingstn joined #git
14:28 vuoto joined #git
14:28 phanimahesh joined #git
14:29 sangy joined #git
14:31 roknir_ joined #git
14:31 ekinmur joined #git
14:31 danemacmillan joined #git
14:32 JeroenT_ joined #git
14:32 drewo joined #git
14:32 naitsirhc joined #git
14:32 robogoat joined #git
14:32 des_consolado jast: uncommitted changes in the remote branch?
14:32 kanzure joined #git
14:32 pkiller joined #git
14:32 PioneerAxon_ joined #git
14:32 des_consolado Locally I'm just starting out with nothing and doing a clone --recursive
14:32 WayToDoor joined #git
14:32 danemacmillan joined #git
14:33 nezZario joined #git
14:33 D-Boy joined #git
14:33 johnny56_ joined #git
14:33 roknir_ joined #git
14:33 braderhart joined #git
14:33 ifsp joined #git
14:33 des_consolado and we don't work on the remote, the remote is just the remote repo, so that doesn't seem possible
14:33 Electrometro joined #git
14:33 braderhart joined #git
14:33 nezZario joined #git
14:33 dsdeiz joined #git
14:33 dsdeiz joined #git
14:33 jast no, uncommitted changes in your local submodule checkout
14:34 epic joined #git
14:34 _flow_ joined #git
14:35 bedouin joined #git
14:35 vuoto_ joined #git
14:35 prosody joined #git
14:35 SourTrou_ joined #git
14:35 yena joined #git
14:35 lolmac joined #git
14:36 D[4]ni joined #git
14:37 robogoat joined #git
14:37 dreamseeker joined #git
14:38 crose joined #git
14:38 ribasushi joined #git
14:39 nitrix joined #git
14:42 MissionCritical joined #git
14:43 mehola joined #git
14:44 solf1re joined #git
14:45 des_consolado jast: how can that happen when it's just being cloned?
14:45 catag87 joined #git
14:47 dmto joined #git
14:49 jeffreylevesque_ joined #git
14:49 Alienpruts joined #git
14:49 ochorocho__ joined #git
14:49 ormaaj joined #git
14:50 clemf joined #git
14:50 LvcasX1 joined #git
14:51 OnBrokenWings joined #git
14:51 gajus joined #git
14:51 gajus Is there a quick way to edit (rebase -i) a specific commit?
14:52 Gitzilla joined #git
14:52 daniel_rose joined #git
14:52 dmto joined #git
14:53 gajus Now I am doing `git rebase -i @~10` find the commit, change the letter to "e", proceed to edit the commit
14:53 phanimahesh joined #git
14:53 gajus is there a way to just `git rebase --edit commit-sha` or something?
14:53 _ikke_ gajus: You could use a combination of GIT_EDITOR='sed ...' git rebase -i
14:53 mischat joined #git
14:53 _ikke_ gajus: No, there isn't
14:53 gajus Understood
14:54 gajus How do I select a previous commit before a specific commit?
14:54 _ikke_ commit~1
14:54 gajus because when I do `git rebase -i 0cd2ab30bc13607c78f082b298459fa18f4a274f` it does not give me an option to edit this commit
14:54 gajus ah
14:54 gajus Thank you
14:55 dopesong joined #git
14:55 aguimaraes1986 joined #git
14:56 lordjancso_ joined #git
14:57 Doginal joined #git
14:57 Gianormagantrous joined #git
14:57 Gianormagantrous joined #git
14:58 morenoh149 joined #git
14:58 dopesong joined #git
14:58 chigang_ joined #git
14:59 dmto joined #git
14:59 LionsMane joined #git
15:00 subhojit777 joined #git
15:01 eka joined #git
15:02 Noldorin joined #git
15:03 _28_ria joined #git
15:05 clemf joined #git
15:05 le_melomane joined #git
15:06 azbarcea joined #git
15:06 ajf- joined #git
15:08 daniel_rose joined #git
15:09 a_thakur joined #git
15:09 stantonk joined #git
15:09 jast des_consolado: it can't. the idea is since it's not a good idea to work in the submodule checkout in the first place, detaching encourages the right to do and doesn't really make a difference anyway
15:09 jast *right thing
15:10 jstein_ joined #git
15:13 AaronMT_ joined #git
15:14 vuoto joined #git
15:15 a_thakur joined #git
15:15 dopesong joined #git
15:18 relipse joined #git
15:18 kaldoran joined #git
15:19 relipse I'm trying to rebase and i'm getting error: Failed to merge in the changes.it says a copy of my patch failed is found in .git/rebase-apply/patch  how do i resolve this problem?
15:19 watabou joined #git
15:20 thiago_ joined #git
15:20 _ikke_ It's basically a conflict
15:21 MZAWeb_ joined #git
15:22 tyreld joined #git
15:22 ToxicFrog relipse: it's a merge conflict. Follow the normal !conflict resolution steps and proceed as instructed in "git status"
15:22 mwhooker joined #git
15:22 gitinfo relipse: [!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
15:23 relipse ok, i followed the steps. modified the file taking out all the <<<<<<<<<<<<<< and stuff and making the file good. then i did git add and git commit  but now it says No changes - did you forget to use 'git add'?
15:24 relipse should I have not did a git commit ?
15:24 _ikke_ The fix might have caused the commit to be empty
15:25 nilg joined #git
15:25 relipse so then now I do a git rebase --skip ?
15:25 ToxicFrog relipse: IIRC, rebase expects you to fix things and then "git rebase --continue"
15:25 relipse ToxicFrog I did that
15:25 _ikke_ ToxicFrog: git commit is not wrong
15:26 _ikke_ Though, it might give this error when continuing
15:26 drewo joined #git
15:26 ToxicFrog _ikke_: right, that's what I mean -- it won't *break* things but rebase doesn't expect it and complains.
15:26 ToxicFrog relipse: which command is emitting the "no changes" error - commit, or rebase --continue?
15:26 relipse rebase --continue
15:27 KnightsOfNi joined #git
15:28 synthroid joined #git
15:29 lindenle joined #git
15:29 le_melomane joined #git
15:30 IWishIKnew joined #git
15:30 joki joined #git
15:33 singalaut joined #git
15:33 ochorocho__ joined #git
15:33 relipse so what do i do noow
15:33 relipse rebase --skip
15:34 relipse will the changes take effect
15:36 cdg joined #git
15:37 jast relipse: if you committed instead of running 'git rebase --continue', as far as git is concerned, the changes have already been applied
15:37 jast so your new commit is basically the new and shiny alternative to the commit you were trying to fix
15:37 jast if you run rebase --skip, it will continue with the next commit, and in the result the new commit you made will be in the place where the old commit was
15:37 JordiGH joined #git
15:38 jast alternatively you can undo your commit (git reset --soft HEAD~) and then rebase --continue
15:38 chachasmooth joined #git
15:38 jast that will make your history look more like it originally did
15:38 grill joined #git
15:38 JordiGH Anyone know why Junio Hamano changed his name from his original "Hamano Jun"? The order change is because of different naming customs, but why the "io"? Did he think it was more American?
15:39 grawity is that #git-related?
15:39 grawity email him directly if you're so curious
15:39 ramsub07 joined #git
15:39 jast I can only guess, and I don't even know Japanese
15:39 Dougie187 joined #git
15:39 jast alternative transliteration or something? :}
15:40 JordiGH Oh, you guys have a topic police in #git?
15:40 JordiGH Sorry.
15:40 jast we do, and it's very lax :}
15:40 jast sorry, misread. we do have a *policy* and it's very lax.
15:40 danimal2 joined #git
15:40 lem-fr left #git
15:41 jast in unrelated news, I'm currently implementing a quick edit feature for interactive rebase, like gajus mentioned
15:42 gajus inspired by me or coincidence?
15:42 gajus : )
15:44 relipse jast: ok perfect thank you
15:46 docnvk joined #git
15:46 JordiGH left #git
15:46 cyan__ joined #git
15:46 [Brain] joined #git
15:48 PabloR joined #git
15:49 drewo joined #git
15:50 ams__ joined #git
15:51 circ-user-Ffvs3 joined #git
15:52 PabloR I just started learning Git thru Git Pro book. In the terminal I can see all untracked and staged files but once they are committed where do they go? I no longer see them with git status.
15:53 Darcidride joined #git
15:54 kaldoran joined #git
15:54 Eugene PabloR - `git status` compares your working-tree against the last commit. Once you commit, it's in the commit, so the comparison is null
15:54 troulouliou_div2 joined #git
15:55 Eugene PabloR - you can view the commit history with `git log`. Assuming you're very new, also try adding things like --oneline --graph
15:56 AaronMT joined #git
15:57 JustinHitla joined #git
15:57 [Brain] joined #git
15:57 JustinHitla so github is a web service for sharing source code, what is git ?
15:57 JustinHitla software client for that web service ?
15:58 PabloR Eugene I guess there's no way to see the structure of my program the way I see it outside the terminal?
15:58 JeroenT joined #git
15:59 kadoban JustinHitla: git is a distributed version control system
15:59 JustinHitla so its like SVN ?
15:59 Eugene JustinHitla - git is 1) a version-control system(the `git` binary), 2) the object format used by that VCS(man gitrepository-layout), and 3) a wire-line protocol for exchanging those objects between repositories(git://)
15:59 gitinfo JustinHitla: the gitrepository-layout manpage is available at http://jk.gs/gitrepository-layout.html
15:59 aep-shoutlet joined #git
15:59 Eugene JustinHitla - github provides hosting for git repositories, plus other project-management goodies(Issues, Wikis, etc)
15:59 kadoban Yes, except the distributed part (svn is not distributed, it's based on a really old model of version control)
16:00 JustinHitla also SVN is commercial and GIT is open source and free ?
16:00 joki joined #git
16:00 Eugene PabloR - What do you want, a snapshot of a commit into a tarball? man git-archive
16:00 gitinfo PabloR: the git-archive manpage is available at http://jk.gs/git-archive.html
16:00 Eugene PabloR - git does not include a file explorer; your OS can provide that
16:01 Eugene svn is an Apache project; not commercial
16:01 EvilPeng1 joined #git
16:01 kadoban I don't think svn is commercial.
16:01 PabloR Eugene thanks. I'll check into this
16:01 Darren_ joined #git
16:02 lindenle joined #git
16:02 jast gajus: inspired by you and because I know it'll be convenient for me, too. hopefully it will inspire the maintainer, too. :)
16:04 gajus : )
16:05 StuartMI joined #git
16:05 stantonk joined #git
16:06 Topic for #git is now Welcome to #git, the place for git help and support groups | 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 | CVS Survivors Meetings are Tuesdays at 9
16:06 Eugene gitinfo needs to learn .joke
16:07 jast Eugene: patches welcome ;)
16:07 Eugene Indeed.
16:07 jast you can crib from .version
16:08 JustinHitla is it 9am or 9pm ?
16:08 jast both wrong! 6pm.
16:08 Eugene It's 9 somewhere in the world. Happens to be 9:08AM where I'm sitting
16:08 jhass it's always just morning and night
16:08 jhass http://www.total-knowledge.com/~ilya/mips/ugt.html
16:08 jast !ugt
16:08 gitinfo UGT (Universal Greeting Time): it is always morning when someone joins a channel, and always late night when they leave. http://www.total-knowledge.com/~ilya/mips/ugt.html
16:08 JustinHitla or its like "at 9 sign, at the corner of GitRebellions street"
16:08 jhass :D
16:09 ojacobson present day, present time
16:09 Eugene That one ^
16:09 jast there is no past. there is no future.
16:09 EduardoMartins joined #git
16:09 jast it follows that time of day has no meaning
16:09 grimdox joined #git
16:09 ojacobson lunchtime doubly so
16:09 diphtherial joined #git
16:10 JustinHitla its 2am here
16:11 diphtherial left #git
16:16 lindenle joined #git
16:18 nnyk joined #git
16:18 unbalancedparen joined #git
16:19 elqj joined #git
16:21 watabou joined #git
16:21 ddavidd joined #git
16:21 daniel_rose joined #git
16:21 ericho joined #git
16:22 romerocesar joined #git
16:23 ddavidd I'm trying to do an interactive rebase but it keeps opening a blank text editor. I close the editor and it says it successfully rebased. The editor shouldn't be blank, what might be wrong?
16:24 troulouliou_div2 joined #git
16:24 mwhooker joined #git
16:24 PabloR Eugene, how does the folders & files that I see in file explorer relates to git? For example when I'm working in a particular branch, or I merge branches, or go back to an older version of my app, does the file explorer changes according to the particular scenario?
16:25 Eugene Correct; git will change the files in the working-tree that you ask it to when switching branches or such
16:25 Eugene git stores all the branches inside of its object database(inside .git/)
16:25 Eugene What you see in Explorer("the working-tree copy") isn't 'in" git, it's checkout-ed by git for you to work with
16:26 Eugene This also means that until you add+commit, git doesn't store a copy of your changes
16:26 Darren_ joined #git
16:27 ddavidd Here's my rebase attempt. Perhaps I'm doing this wrong? https://img42.com/a5mQ0+
16:28 ddavidd Essentially, I want to edit one of the past commit messages. I was following along with this solution: http://stackoverflow.com/a/1186549
16:28 JanC joined #git
16:28 jast joined #git
16:29 gitinfo joined #git
16:30 PabloR Eugene, Thanks. Since I never did anything like it, I feel I may screw up if my files appear/disappear according to the scenario. But I guess it will be ok once I feel comfortable using git. :p
16:31 PabloR I meant from the working-tree
16:32 EvilPenguin joined #git
16:32 Eugene When in doubt, commit, or at least stash.
16:32 Eugene You can hide the !sausage later(bookmark it)
16:32 gitinfo [!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
16:33 PabloR haha, new to the term as well. Thanks
16:35 jast gajus: well, I've got a working implementation. will run it through the review gauntlet some time this week or next... with any luck it'll be added to a future release
16:35 jast basically you can do git rebase --quick-edit=abc123
16:36 kadoban That sounds cool
16:37 jast it was a fairly small change, too. I kind of expect a few additional sanity checks getting proposed during review.
16:37 clemf joined #git
16:37 akushner joined #git
16:38 Faylite joined #git
16:39 FuzzySockets joined #git
16:40 LeBlaaanc joined #git
16:41 kriskropd joined #git
16:41 durham joined #git
16:42 romerocesar_ joined #git
16:42 emPi joined #git
16:44 Rish joined #git
16:44 mehola joined #git
16:45 AaronMT joined #git
16:45 chachasmooth joined #git
16:46 orbitphreak joined #git
16:48 f3r70rr35f joined #git
16:49 daniel_rose joined #git
16:51 dopesong joined #git
16:53 zacts joined #git
16:53 e89c8c95a050 joined #git
16:54 stantonk joined #git
16:54 al-damiri joined #git
16:56 harrymoreno1 joined #git
16:56 sveinse joined #git
16:56 PabloR Is it possible to figure out branches the way it shows here http://imgur.com/a/IlUFO somehow just by looking into git log?
16:57 j416 PabloR: !lol
16:57 gitinfo PabloR: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
16:57 sveinse I have a hash which I need to locate in my tree, however I cant find it when I do git log (on a clone of a mirror). How can I find the hash I'm looking for?
16:57 grawity PabloR: use tig or --graph
16:57 PabloR ok, thanks
16:57 malesca joined #git
16:58 kadoban sveinse: Is it a commit hash? You can just checkout a commit hash if you want to view the state as of that commit.
17:00 SteffanW joined #git
17:01 shaggycat_ joined #git
17:02 osse sveinse: if it's not a commit the worst case scenario is looping git ls-tree -r and grepping it
17:03 malesca joined #git
17:03 WayToDoor joined #git
17:04 jast for blobs, git log --raw --abbrev=40 is more convenient
17:04 stantonk joined #git
17:05 osse nice
17:06 freimatz joined #git
17:08 docnvk joined #git
17:09 e89c8c95a050 joined #git
17:10 ddavidd There was nothing wrong with my rebase. It was an issue with VIM. Fixed.
17:11 jast what a relief :)
17:12 osse Issue with Vim?!!? Liar!
17:12 osse That's unpossible!
17:12 jaguarmagenta joined #git
17:13 drbean joined #git
17:13 thiago_ joined #git
17:13 jast I agree... ever since I patched emacs into vim to get the best of both worlds, all my earthly woes have ceased
17:13 daniel_rose joined #git
17:14 jaguarma_ joined #git
17:15 akushner The Git Merge 2015 conference videos were posted last May on Youtube. I haven’t seen the Git Merge 2016 videos yet. Anyone know if they are going to be posted for this year’s conference?
17:16 soerenb joined #git
17:17 grindhold joined #git
17:19 drewo joined #git
17:20 troulouliou_div2 joined #git
17:21 Codfection joined #git
17:21 zacts_pi joined #git
17:22 madewokherd joined #git
17:22 watabou joined #git
17:23 mostlybadfly joined #git
17:24 dreiss joined #git
17:24 ericsupreme joined #git
17:24 zacts_raincity joined #git
17:25 kab joined #git
17:26 baxx joined #git
17:27 zacts joined #git
17:28 kab joined #git
17:29 zacts_pi joined #git
17:30 rinwa joined #git
17:30 xall_ joined #git
17:31 kpease joined #git
17:32 hahuang61 joined #git
17:34 MrMojito joined #git
17:34 MrMojito joined #git
17:36 venmx joined #git
17:37 spudowiar joined #git
17:37 [exa] joined #git
17:38 Goplat joined #git
17:38 Codfection joined #git
17:39 Dyonisos joined #git
17:39 mischat joined #git
17:39 [exa] Hi everyone. I'm searching for a simple tool for listing migrations that would connect to git. E.g. an author writes something like "@migration you need to run this code XXXX" to the commit message, and an administor can see list of migrations that he needs to run when deploying a new version, say like git-list-migrations oldstable..newstable
17:39 SourTrout joined #git
17:40 [exa] bonus: it can be run automatically somehow.
17:40 HoierM joined #git
17:40 perlpilot [exa]: From here it sounds like something you could write  :)
17:40 osse [exa]: what you're asking for sounds like a convenient alias/wrapper for  git log --grep=@migrations oldstable..newstable
17:41 osse [exa]: --grep searches the commit message itself for the given pattern
17:41 lugzer joined #git
17:41 jeffreylevesque joined #git
17:41 osse combined with maybe some custom --pretty= format and some extra processing
17:43 usm4n joined #git
17:44 drbean_ joined #git
17:44 GavinMagnus left #git
17:45 jimi_ joined #git
17:45 azbarcea joined #git
17:45 incmdoutctrl joined #git
17:47 danslo_ joined #git
17:50 texinwien_ joined #git
17:50 bathtub_shark joined #git
17:51 docnvk joined #git
17:52 mwhooker joined #git
17:54 vdv joined #git
17:55 imdsm_ joined #git
17:55 davisonio joined #git
17:55 zeroed joined #git
17:55 livingstn joined #git
17:55 pothepanda joined #git
17:56 [exa] osse: that sounds fair enough, thanks!
17:56 [exa] perlpilot: yep, nothing complicated
17:56 [exa] I'll wrap log/grep in some tooling and see.
17:56 LeBlaaanc joined #git
17:57 zacts joined #git
17:58 incmdoutctrl joined #git
17:58 drbean joined #git
17:58 cyphase joined #git
18:01 drbean_ joined #git
18:03 chachasmooth joined #git
18:03 zacts joined #git
18:03 GenZai joined #git
18:03 cyan__ joined #git
18:04 ekinmur joined #git
18:06 Limes_ joined #git
18:08 livingstn joined #git
18:09 zacts joined #git
18:09 guardian _ikke_: either I didn't read correctly, either http://thread.gmane.org/gmane.comp.version-control.git/129770/focus=129768 doesn't ever address fetching and pushing commit notes by default
18:09 guardian _ikke_: so, maybe the rationale for not doing it is about being afraid of performance impacts?
18:10 guardian _ikke_: also, at some point GitHub would display commit notes but they don't do it anymore
18:10 JustinHitla left #git
18:12 sagerdearia joined #git
18:14 doebi joined #git
18:14 st0opkid joined #git
18:16 stantonk joined #git
18:22 ORiON-- joined #git
18:23 Arban joined #git
18:23 kfunk joined #git
18:26 zeroed joined #git
18:26 watabou joined #git
18:27 catag87 joined #git
18:27 eijk joined #git
18:28 liamonade joined #git
18:28 MattMaker joined #git
18:29 kpease joined #git
18:29 Sasazuka joined #git
18:29 clemf_ joined #git
18:30 incmdoutctrl joined #git
18:30 Doginal joined #git
18:31 Seveas guardian: they stopped doing that years ago
18:31 eijk_ joined #git
18:31 Seveas well, that's an exaggeration apparently. August 2014
18:31 sto0pkid joined #git
18:31 Seveas https://github.com/blog/707-git-notes-display
18:32 guardian Seveas: yeah I would love to know why
18:33 shymega joined #git
18:34 elisa87 how should I fix this error? https://dpaste.de/CCdm
18:34 Encrypt joined #git
18:34 Encrypt Hello there o/
18:35 APic Yo \o
18:35 Encrypt I recently found that if I git checkout to another branch when I have modified files, they will be merged to the branch I am switching to
18:35 Encrypt I haven't really understood on the internet what I can do to avoid this
18:36 lugzer joined #git
18:36 mdw joined #git
18:36 Encrypt But if I have understood, I should commit before switching to another branch?
18:36 clemf joined #git
18:36 Mikaela joined #git
18:36 mingrammer joined #git
18:38 cbreak Encrypt: nothing gets merged
18:38 cbreak the files will be left as they are
18:38 cbreak Encrypt: if you want changes to be on a branch, then you have to commit them. Before you commit, changes are not on a branch
18:38 Encrypt cbreak, I mean the changed are also applied to the branch I am switching to
18:38 cbreak no
18:38 Encrypt Ah
18:38 Encrypt It's in HEAD
18:38 elisa87 how should I fix fatal: Could not read from remote repository. ?
18:38 cbreak it's in the files
18:39 Encrypt Ok
18:39 Encrypt I hadn't understood that
18:39 cbreak elisa87: check if the remote url is correct
18:40 davisonio joined #git
18:40 xall_ joined #git
18:40 elisa87 cbreak is this wrong?  git remote add origin git@github.com:monajalal/compost_notebook.git
18:40 daniel_rose joined #git
18:41 cbreak check it
18:41 cbreak git ls-remote git@github.com:monajalal/compost_notebook.git
18:42 eijk_ joined #git
18:42 baxx joined #git
18:42 eijk joined #git
18:44 m0viefreak joined #git
18:44 drbean joined #git
18:45 Seveas it's an empty repo, but that stull shouldn't give 'fatal' things. pastebin the command that gave the error and its full output
18:45 mehola joined #git
18:46 RedShift joined #git
18:46 elisa87 cbreak: PS C:\Users\jalal\compost> git remote add origin https://github.com/monajalal/compost_notebook.git
18:46 elisa87 fatal: remote origin already exists.
18:47 elisa87 I am confused how to fix this
18:47 Seveas elisa87: so you already have an 'origin' remote
18:47 eijk_ joined #git
18:47 * spudowiar decrypts Encrypt
18:47 cbreak elisa87: remove origin, or use set-url
18:47 Seveas this will show you where it points: git remote  -v
18:48 Seveas spudowiar: careful. You don't know what he's hiding ;)
18:48 spudowiar left #git
18:48 spudowiar joined #git
18:48 mwhooker joined #git
18:49 afuentes joined #git
18:49 Encrypt spudowiar, :]
18:49 st0opkid joined #git
18:51 ddavidd left #git
18:51 lindenle joined #git
18:52 eijk_ joined #git
18:53 ynanm joined #git
18:53 elisa87 initializing centos everything iso fails in vbox with this error, do you know how I can fix it? https://dpaste.de/Fc2M
18:54 bremner elisa87: doesn't look related to git
18:58 reim joined #git
18:59 adac joined #git
19:00 stantonk joined #git
19:01 cyphase joined #git
19:04 orbitphreak joined #git
19:06 daniel_rose joined #git
19:07 nilg joined #git
19:09 oade joined #git
19:10 segment-fault joined #git
19:10 kossy_ joined #git
19:11 ajf- joined #git
19:13 leeN joined #git
19:13 stantonk joined #git
19:18 catag87 joined #git
19:18 drbean joined #git
19:19 catag87 joined #git
19:22 dsdeiz joined #git
19:23 kossy_ joined #git
19:23 sto0pkid joined #git
19:25 stantonk joined #git
19:27 elastix joined #git
19:28 nwkj86 joined #git
19:28 Gitzilla joined #git
19:28 fmcgeough joined #git
19:28 ekinmur joined #git
19:29 Goplat joined #git
19:29 watabou joined #git
19:30 lugzer joined #git
19:31 stantonk joined #git
19:31 mingrammer joined #git
19:32 ekinmur joined #git
19:33 xpk joined #git
19:37 King_Hual joined #git
19:37 King_Hual joined #git
19:38 nobso joined #git
19:39 xall_ joined #git
19:41 hashpuppy joined #git
19:42 kossy_ joined #git
19:45 jaguarmagenta joined #git
19:45 lindenle joined #git
19:46 drbean_ joined #git
19:46 MattMaker joined #git
19:47 st0opkid joined #git
19:49 danslo_ joined #git
19:50 kossy_ joined #git
19:51 p4trix joined #git
19:51 sto0pkid joined #git
19:54 robotroll joined #git
19:54 robotroll joined #git
19:55 ahmedelgabri joined #git
19:57 st0opkid joined #git
19:57 kossy_ joined #git
19:58 texinwien_ joined #git
20:02 lugzer joined #git
20:03 cyphase joined #git
20:06 kossy_ joined #git
20:06 thiago_ joined #git
20:06 vuoto joined #git
20:06 griffindy joined #git
20:08 usm4n joined #git
20:10 usm4n joined #git
20:10 troulouliou_div2 joined #git
20:11 kpease joined #git
20:13 drbean joined #git
20:15 mutex joined #git
20:16 paul424 joined #git
20:16 mikecmpbll joined #git
20:17 jaguarmagenta joined #git
20:18 lucasem joined #git
20:19 cyan__ joined #git
20:20 satifant joined #git
20:21 orbitphreak joined #git
20:22 usm4n joined #git
20:23 mwhooker joined #git
20:28 LtHummus joined #git
20:28 ajf- joined #git
20:29 izabera joined #git
20:30 aidalgol joined #git
20:30 stantonk joined #git
20:31 stantonk joined #git
20:31 LtHummus My team is using a git flow-ish model in development.  New features are made on topic branches and when they're ready to go to our test environment, they get merged in to master.  Once we're ready to push to production, we merge from master in to a release branch.  If I have release/HEAD checked out, I would like to list all the commits that happened on master since the last time we merged, but I can't
20:31 LtHummus quite figure out how to do that.  Any ideas?
20:31 watabou joined #git
20:32 nidr0x joined #git
20:33 perlpilot LtHummus: sounds like you want the difference between HEAD and the merge-base of the two branches
20:34 moritz LtHummus: I don't know offhand how to do it o the command line, but a gitk --all should make it rather obvious
20:34 LtHummus perlpilot: moritz: thanks, i'll go see what I can figure out
20:34 LtHummus i think i know what I want now, but just a little more playing around :D
20:34 nidr0x joined #git
20:35 ekinmur joined #git
20:35 jaguarmagenta joined #git
20:35 kadoban LtHummus: Isn't that something like 'git log master ^release' ?
20:36 fmcgeough joined #git
20:36 LtHummus OHHH i think i know what's going on here
20:36 LtHummus i am also an idiot
20:38 rbern joined #git
20:39 sgen joined #git
20:39 Seveas it's a common issue :)
20:39 LtHummus Seveas: yuuuuppppp especially with me :D
20:39 mangolisk joined #git
20:40 LtHummus `git log release^1..release` did it, for those that are curious.  thanks for the help all
20:41 moritz oh, just those introduced by the merge?
20:41 LtHummus yeah
20:42 LtHummus it's possible in my long rambling, i didn't get the message across.  it's my first day back from vacation, so I'm a little (more) scatterbrained than usual
20:42 chachasmooth joined #git
20:43 jstein_ joined #git
20:43 mingrammer joined #git
20:46 IWishIKnew joined #git
20:46 mehola joined #git
20:47 kossy_ joined #git
20:49 danslo_ joined #git
20:51 MattMaker joined #git
20:52 kossy_ joined #git
20:54 chachasmooth joined #git
20:54 clemf joined #git
20:54 segment-fault joined #git
20:54 adac joined #git
20:57 dopesong joined #git
20:57 lugzer joined #git
20:59 jaguarmagenta joined #git
20:59 mwhooker joined #git
21:01 dsantiago joined #git
21:01 Alienpruts joined #git
21:05 stantonk_ joined #git
21:05 dunpeal joined #git
21:06 thiago joined #git
21:07 spudowiar1 joined #git
21:07 nnyk joined #git
21:08 hagebake joined #git
21:09 hagebake I fixed conflicts in rebase, and instead of running git rebase --continue, I made a commit by mistake. How can I fix that so I can continue the rebase?
21:11 spudowiar2 joined #git
21:11 editshare-ericf joined #git
21:11 m0viefreak hagebake: undo the commit and then continue
21:11 m0viefreak git reset --soft HEAD~; git rebase --continue
21:11 m0viefreak should do the trick
21:12 stantonk joined #git
21:13 johnmilton joined #git
21:14 NeXTSUN joined #git
21:16 yoan joined #git
21:16 rahtgaz joined #git
21:17 sto0pkid joined #git
21:18 barteks2x joined #git
21:19 johnmilton joined #git
21:21 Dougie187 left #git
21:21 mingrammer joined #git
21:23 mwhooker joined #git
21:24 Limes_ joined #git
21:27 andlabs joined #git
21:29 boombatower joined #git
21:30 spudowiar joined #git
21:30 thiago joined #git
21:31 st0opkid joined #git
21:32 clemf joined #git
21:33 watabou joined #git
21:33 dunpeal joined #git
21:35 jaguarmagenta joined #git
21:37 NeverDie joined #git
21:38 nidr0x joined #git
21:39 sto0pkid joined #git
21:40 Puffball joined #git
21:40 HoierM joined #git
21:43 ikmaak joined #git
21:43 mellernoia joined #git
21:44 clemf joined #git
21:46 drbean_ joined #git
21:49 st0opkid joined #git
21:50 danslo joined #git
21:51 dopesong joined #git
21:53 lugzer joined #git
21:53 cd-rum joined #git
21:55 dopesong joined #git
21:55 cd-rum_ joined #git
21:58 dopesong joined #git
22:01 efdetonator joined #git
22:01 drbean joined #git
22:01 dopesong joined #git
22:04 dopesong joined #git
22:05 Sasazuka joined #git
22:05 joki joined #git
22:05 sto0pkid joined #git
22:07 cyphase joined #git
22:08 blackwind_123 joined #git
22:08 cd-rum joined #git
22:08 shinnya joined #git
22:09 NwS joined #git
22:11 raijin joined #git
22:15 mingrammer joined #git
22:17 st0opkid joined #git
22:18 dopesong joined #git
22:19 dopesong joined #git
22:22 sto0pkid joined #git
22:24 lugzer joined #git
22:27 ajf- joined #git
22:28 Noldorin joined #git
22:29 ochorocho__ joined #git
22:29 WaReZ joined #git
22:29 inflames joined #git
22:29 efdetonator joined #git
22:30 cuebix-wk joined #git
22:31 Goplat joined #git
22:31 troulouliou_div2 joined #git
22:31 p4trix joined #git
22:33 vaq joined #git
22:35 LeBlaaanc joined #git
22:35 watabou joined #git
22:36 st0opkid joined #git
22:37 netj joined #git
22:44 drbean_ joined #git
22:47 mehola joined #git
22:48 girishr joined #git
22:48 wethu joined #git
22:49 deltab_ joined #git
22:49 girishr Is it possible to create a new repo by dropping old commits but retaining the other commit ids?
22:50 girishr i.e i have a repo with A - B - C - D. i want to drop A,B and create a repo with just C,D (keeping the sha1s intact because I have tags and other things depending on them)
22:51 girishr i created a graft to a root commit for C. but unable to figure how to "push" this properly
22:51 deltab aiui, grafts have to be set up on each repo
22:53 girishr mm, that's not nice :-(
22:56 akiva joined #git
22:56 apotry joined #git
22:57 EvilPeng1 joined #git
22:58 sto0pkid joined #git
22:59 hoe` joined #git
23:00 hoe` I'm moving a large chunk of a file into a new file. I want to maintain the history of that chunk, and the history of the original file. Is there a way to do this in git?
23:00 drbean joined #git
23:01 mwhooker joined #git
23:01 fmcgeough joined #git
23:03 l4v2 joined #git
23:04 osse hoe`: no
23:05 osse hoe`: depending on the size of the chuck you might get lucky with git log --follow --find-renames=x
23:06 osse hoe`: ahh, git blame might do a good job with it's -L option
23:06 kadoban hoe`: git automatically searches for that kind of thing, heuristically, when you look at history, but there's no way to specifically record that.
23:06 dopesong joined #git
23:07 jcadduono joined #git
23:07 jcadduono can i make a git submodule always point to the head
23:07 jcadduono so when people run git submodule init && git submodule update, it grabs the submodule at latest history
23:11 zivester joined #git
23:11 osse jcadduono: yes, git submodule update --remote --branch blah
23:13 hoe` thanks for the responses guys.
23:13 hoe` What I used to do in hg was rename the file inside hg, then edit it down, causing them both to have the complete history.
23:14 jcadduono any way to make this default in .gitmodules ? its kind of crappy this way since it will always show "new commits" in status
23:15 mwhooker joined #git
23:15 drbean_ joined #git
23:16 osse hoe`: that should work here too
23:16 osse hoe`: in that respect i think git and hg are very similar
23:16 jcadduono its bound to drive us crazy having to commit ref updates to the parent branch every time a submodule gets updated :(
23:17 jcadduono or is there an alternative to submodules, like can i make git clean ignore a folder, and just make a bootstrap script to clone a location inside the parent git
23:17 stantonk joined #git
23:17 st0opkid joined #git
23:19 lindenle joined #git
23:19 bremner !subproject
23:19 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
23:19 lugzer joined #git
23:21 nitin joined #git
23:21 rahtgaz joined #git
23:22 ffabi joined #git
23:23 jcadduono ok yeah that does sound like the only real option
23:23 mischat joined #git
23:23 hoe` left #git
23:26 cdown joined #git
23:31 drbean joined #git
23:32 anuxivm joined #git
23:32 apotry joined #git
23:33 ailaG joined #git
23:35 ailaG Hi hi. On my remote git server there’s a dev branch and I’m working on my own feature branch. The dev branch advanced and I want their changes to be in my feature branch too. Will a simple “git rebase” do the trick?
23:35 ailaG My branch is kind of working in parallel and we’ll merge it into dev at some point
23:36 watabou joined #git
23:37 inflames joined #git
23:38 kadoban ailaG: A rebase is one option, sure. A merge is also an option, it depends what you want history to look like. (the rebase is likely more common in this case, especially if your code is not shared yet)
23:39 ailaG kadoban: TY… It won’t do anything to the dev branch, right? (I don’t think it will, just double checking :) )
23:39 kadoban ailaG: No, you can just modify your own (presumably unshared) branch.
23:39 ailaG I probably need history to be detailed because the project manager will see if my branch is okay then apply my changes to dev
23:39 ailaG Unshared?
23:40 kadoban ailaG: rebase modifies history, you shouldn't usually do this if you've already shared that history with other people, it's ... not pretty.
23:40 ailaG It’s all remote branches on the server that I’m checking out, pushing to and pulling from
23:40 ailaG kadoban: So should I merge? If I’m working on my own thing but want to keep up with the main dev branch
23:41 kadoban ailaG: Is "your own thing" already published somewhere, or shared with people?
23:41 ailaG kadoban: It’s committed to my own branch on the remote server
23:42 kadoban ailaG: Does anyone care if you change history of that branch? It depends what the protocol is for your group really.
23:43 kadoban If you're unsure, I'd probably recommend you ask, or if you don't want to maybe just do the merge to be safe.
23:44 ailaG kadoban: No, they just want my commits on top of their code (I’m editing some files to develop a new feature) . And they’re all asleep :)
23:45 kadoban Then rebase sounds fine I suppose.
23:45 stantonk joined #git
23:45 ailaG It’s 2:45am over here. We work from home and I’m a night owl. I worked on my branch and a few updates to the dev branch were missing, I wanted to work on top of them too. I’ll commit when I finish and the head dev will use that
23:49 ajf- joined #git
23:50 akiva joined #git
23:52 danslo joined #git
23:54 ochorocho__ joined #git
23:57 sto0pkid joined #git

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