Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-22

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

All times shown according to UTC.

Time Nick Message
00:03 KnownSyntax joined #git
00:07 thiago joined #git
00:07 lindenle joined #git
00:12 red__ joined #git
00:16 lindenle joined #git
00:17 ytl joined #git
00:18 dsdeiz joined #git
00:21 inflames joined #git
00:22 mathu is there such a thing as s git blob with no filesystem path? can a blob map to a particular inode or something weird like that?
00:23 avar A blob is only addressed by its SHA1, but there's no guarantee where you can fin dit.
00:23 eka joined #git
00:23 avar It can be an FS path, or a part of a packfile etc.
00:23 dreiss joined #git
00:23 timvisher joined #git
00:24 mathu okay
00:24 mathu i'm working with GitPython at the moment but i may switch to dulwich for a library i can be more confident in
00:25 lindenle joined #git
00:26 mathu gitpython gives all blobs a path attribute, and i'm not sure that will always be what i want
00:26 Remram[m] joined #git
00:26 Remram[m] joined #git
00:26 mathu like in cases where it may not haave a fs path
00:27 vassagus joined #git
00:29 Derperperd joined #git
00:29 mathu oh, hey, dulwich doesn't have rebase support. i don't think gitpython does either
00:34 lindenle joined #git
00:35 mathu what about rebase is hard other than the DAG of commits only pointing to parents?
00:35 mathu hard to implement*
00:36 mathu provided you can merge trees
00:37 fahadash joined #git
00:39 timvisher joined #git
00:43 cdown joined #git
00:43 lindenle joined #git
00:45 lindenle joined #git
00:47 bobdobbs joined #git
00:48 arescorpio joined #git
00:49 bobdobbs Hi. I moved from master into and older branch. Now I'm in "cherry pick mode". How can I just force the current branch to be over-written by master?
00:50 bobdobbs Or if that is too difficult, how can I get back to master and delete the older branch (so I can re-create it from master)?
00:52 ertes left #git
00:52 tesuji_ joined #git
00:53 rudi_s bobdobbs: git reset --hard master will move the branch to master. However it's simpler to just delete it with git branch -D branch-name.
00:53 rudi_s What exactly do you mean with "cherry pick mode"?
00:53 rudi_s (Note that reset --hard will also remove all changes from your working tree.)
00:53 bobdobbs hmmmm
00:55 bobdobbs I'm not sure what "cherry pick" mode is. When I opened the branch, my command line prompt displays 'master:cherry-pick' after the error message was printed.
00:59 Hello71 git status
00:59 ToBeCloud joined #git
01:00 marcm joined #git
01:00 rewt "the error message" is a bit vague... what command did you use exactly?  what was the response exactly?
01:01 ochorocho__ joined #git
01:01 _ADN_ joined #git
01:02 runlevl4 joined #git
01:03 ahr3n joined #git
01:04 linuxmint joined #git
01:05 deeeepsteep joined #git
01:05 Vampire0 joined #git
01:05 d^sh joined #git
01:07 safe joined #git
01:07 deeeepsteep joined #git
01:13 alansaul_ joined #git
01:13 cdown joined #git
01:16 Gsham joined #git
01:19 turqalx joined #git
01:20 LeBlaaanc joined #git
01:23 Gsham joined #git
01:24 bobdobbs The error message said: 'error: you need to resolve your current index first'
01:25 bobdobbs I did 'git merge master' and got this: http://paste.ubuntu.com/23077105/
01:25 bobdobbs so I did 'git merge master'
01:26 bobdobbs And now some of my files are full of git markers
01:26 nivag joined #git
01:26 bobdobbs I tried to retreat back to master, but it looks like master if full of the markers
01:27 bobdobbs it looks like I might have to roll back to a previous commit and redo my work from the last couple of hours
01:28 bobdobbs well, I've got a "known good" branch with my current work. But if I merge it into master, master retains the markers
01:29 bobdobbs I figured that I should be able to pull the unbroken branch into master, thereby making the code in master that same as in the unbroken branch.
01:29 liuzhen joined #git
01:29 bobdobbs So from master I do "git merge polish" (polish is the unbroken branch)
01:30 bobdobbs that command returns 'Already up to date'
01:30 bobdobbs but the content of some of the text files are not the same
01:30 bobdobbs So... how do make the content of master identical to the content of the good branch?
01:33 vassagus joined #git
01:34 Dreamer3 joined #git
01:35 eka joined #git
01:35 az__ joined #git
01:38 diprotic joined #git
01:40 cqi joined #git
01:41 snowkidind joined #git
01:46 Lyqyd_ joined #git
01:46 Gsham joined #git
01:46 turqalx left #git
01:46 dsdeiz joined #git
01:50 nivag joined #git
01:54 ahr3n joined #git
01:56 harish joined #git
01:58 Salander27 joined #git
01:59 JanC_ joined #git
02:00 mycyber joined #git
02:01 pks joined #git
02:03 SwiftMatt joined #git
02:04 d^sh joined #git
02:05 l4v2 joined #git
02:07 chachasmooth joined #git
02:08 LeBlaaanc joined #git
02:15 stonerfish joined #git
02:16 marcm joined #git
02:20 rchavik joined #git
02:21 rj1 joined #git
02:22 mmlb joined #git
02:23 LeBlaaanc joined #git
02:29 lagothri1 joined #git
02:30 hexagoxel joined #git
02:31 causasui joined #git
02:33 LeBlaaanc joined #git
02:38 vassagus joined #git
02:41 causasui joined #git
02:49 raatiniemi joined #git
02:54 fstd_ joined #git
02:54 deeeepsteep joined #git
03:02 quenode joined #git
03:03 ochorocho__ joined #git
03:04 aavrug joined #git
03:05 Dougie187 left #git
03:07 ASOLAr joined #git
03:12 cd-rum joined #git
03:16 boombatower joined #git
03:18 mycyber left #git
03:22 hahuang61 joined #git
03:34 rivarun joined #git
03:39 diogenese joined #git
03:43 raijin joined #git
03:43 vassagus joined #git
03:45 chrisshattuck joined #git
03:47 DJ_Spies joined #git
03:48 Peuc joined #git
03:49 yitz left #git
03:51 kpease joined #git
03:55 elementalest joined #git
03:56 beyertech joined #git
03:57 a_thakur joined #git
04:00 chrisshattuck joined #git
04:00 gfixler joined #git
04:01 thecomedian joined #git
04:01 crayon joined #git
04:04 ochorocho__ joined #git
04:09 cd-rum_ joined #git
04:12 rchavik joined #git
04:12 rchavik joined #git
04:16 Cabanossi joined #git
04:17 mingrammer joined #git
04:21 Sonderblade joined #git
04:21 ahr3n joined #git
04:23 vdv joined #git
04:23 lvns joined #git
04:26 hahuang65 joined #git
04:31 beyertech joined #git
04:32 beyertech joined #git
04:34 beyertech joined #git
04:35 beyertech joined #git
04:37 beyertech joined #git
04:37 moneylotion joined #git
04:41 Emperor_Earth joined #git
04:46 ffabi joined #git
04:47 vassagus joined #git
04:54 netj joined #git
04:54 holodoc joined #git
04:55 chid joined #git
04:55 phanimahesh joined #git
04:56 Manuel15 joined #git
04:56 Manuel15 joined #git
04:57 krillr joined #git
04:58 krillr is there a way to set a configuration variable for just one execution of a command? (for example, core.hoosPath
04:58 krillr ...core.hooksPath
04:59 subhojit777 joined #git
05:00 freimatz joined #git
05:01 moneylotion joined #git
05:01 qt-x joined #git
05:01 moneylotion joined #git
05:03 boombatower joined #git
05:03 emPi joined #git
05:04 ghostlight joined #git
05:04 ochorocho__ joined #git
05:04 Nano joined #git
05:06 deeeepsteep joined #git
05:07 guest6546 joined #git
05:08 Derperperd joined #git
05:09 beyertech joined #git
05:10 beyertech joined #git
05:11 mingrammer joined #git
05:12 _ikke_ krillr: git -c key=value <commit>
05:13 moneylotion joined #git
05:13 _ikke_ Note that it should go before the command
05:13 _ikke_ s/commit/command
05:13 guest6546 Trying to understand how to push my changes to my remote. I cloned the repo from my remote, changed a few lines in a file and commited that file. Now when I try "git push" I'm told I can't update checked out branch "master".
05:15 _ikke_ guest6546: what does git config --get-regex "^remote.*fetch" return?
05:17 guest6546 _ikke_: remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
05:18 jceb joined #git
05:18 krillr _ikke_~ perfect! thanks!
05:19 _ikke_ guest6546: and config --get-regex "^remote.*push" return?
05:19 _ikke_ wait
05:19 _ikke_ guest6546: and config --get-regex "^remote"
05:21 guest6546 _ikke_:  remote.origin.url ssh://user@server/home/user/git/project.git
05:21 guest6546 remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
05:22 moneylotion joined #git
05:22 _ikke_ guest6546: Ah
05:22 _ikke_ guest6546: !bare
05:22 gitinfo guest6546: A bare repository is used to push/fetch(useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
05:23 _ikke_ is project.git a bare repository?
05:23 ytl joined #git
05:23 _ikke_ on server
05:23 Andrew_K joined #git
05:23 LordSticky joined #git
05:24 nilg joined #git
05:24 guest6546 No it's not, so when I made it for the remote I need to use "git init --bare" so I can push changes to it?
05:24 _ikke_ yes
05:24 guest6546 Alright, I'll try that right now, thanks.
05:26 tanuki joined #git
05:28 djb-irc joined #git
05:29 a_thakur joined #git
05:30 moneylotion joined #git
05:32 hahuang65 joined #git
05:32 guest6546 Ok, that seems to have worked. I created a bare repo on the remote, cloned it and commited a file then pushed it. Says it pushed without error. How do I check which files the remote has now?
05:33 Junior joined #git
05:36 ThomasLocke joined #git
05:38 Raging_Hog joined #git
05:40 Derperperd joined #git
05:42 Junior joined #git
05:45 DJ_Spies joined #git
05:46 Rodya_ joined #git
05:50 ffabi joined #git
05:50 howdoi joined #git
05:53 vassagus joined #git
05:54 boombatower joined #git
05:57 a_thakur joined #git
06:00 justanotheruser joined #git
06:05 ochorocho__ joined #git
06:05 chimay joined #git
06:06 mingrammer joined #git
06:06 tristanp joined #git
06:07 lvns joined #git
06:08 beyertech joined #git
06:12 zacts joined #git
06:16 jknetl joined #git
06:18 mehola joined #git
06:19 ASOLAr joined #git
06:20 freimatz joined #git
06:21 krillr clone it? :P
06:22 tesuji joined #git
06:28 Mogget joined #git
06:30 ShekharReddy joined #git
06:36 arnas joined #git
06:36 arnas hello
06:36 dreiss joined #git
06:39 Freze joined #git
06:40 xaa joined #git
06:41 Freze question that I can't find a google answer to. Suppose I do git checkout -b "new branch"    on the current commit with msg "commit number 1", I have made all my changes an the new branch but I should have actually branched from the commit with message "commit number 0"
06:41 Eryn_1983_FL joined #git
06:41 Freze I tried running git rebase -i HEAD~2 and dropping the commit with msg "commit number 1"
06:42 Freze but it gives me an error that it could not apply it
06:45 JeroenT joined #git
06:45 mgedmin sounds like you need to resolve conflicts?
06:46 d0nn1e joined #git
06:47 Freze Yeah ...
06:49 Freze with the resolve conflicts the "Unmerged paths:" are the files I have to fix
06:51 a3Dman joined #git
06:51 holodoc joined #git
06:51 Rish joined #git
06:52 mariuscc joined #git
06:53 yuhlw_ joined #git
06:53 elect joined #git
06:54 Sceorem joined #git
06:55 ASOLAr joined #git
06:56 arnas Hello, I've done git pull on master branch and right now I'm trying to switch to another branch but there's a problem. When I do git checkout branch_name, it's trying to download a file through git lfs but then I get an error that this file doesn't exist. And for some reason when I type git status there are a lot of modified or deleted files and I can't switch to another branch. Even if I do git checkout -- . Any ideas? :(
06:57 dreiss joined #git
06:57 vassagus joined #git
06:57 cqi joined #git
06:58 ASOLAr joined #git
06:59 ASOLAr joined #git
07:00 konrados Morning :)
07:01 KeyWeeUsr joined #git
07:01 ASOLAr joined #git
07:01 konrados I added a file to .gitignore but it seems git ignores it. I.e. when I do git status --ignored there are some files but not this one. What should I do now?
07:01 submitnine joined #git
07:02 yuhlw_ joined #git
07:03 KeyWeeUsr hi there! Does anyone know how to include "[master ? +0 ~0 -0 ~]>" text into cmd.exe? It is available in powershell, but I think I saw it on someone else's pc, so I'd like to switch (some PS parts are extremely annoying ^^)
07:04 KeyWeeUsr the text is visible only if I'm in a repo(.git available), obviously
07:05 wget joined #git
07:05 wget joined #git
07:06 ochorocho__ joined #git
07:06 Freze Not possible without using powershell
07:06 Hounddog joined #git
07:06 Freze search posh-git
07:06 Freze KeyWeeUsr,
07:06 KeyWeeUsr ah, ok :(
07:07 KeyWeeUsr posh-git?
07:07 Freze that's the name of the module
07:07 Freze to install that feature
07:07 KeyWeeUsr oh, powershell module, right?
07:07 Freze yeah
07:07 satya4ever joined #git
07:07 KeyWeeUsr sad :/ I hoped I could switch to cmd fully
07:08 KeyWeeUsr but thanks for helping :)
07:08 Freze what's the point?
07:08 Freze you can use anything you use in cmd right in powershell
07:08 Freze if you don't like the powershell commands pretend they don't exist
07:09 KeyWeeUsr I do almost everything via cmd, I have paths set in batches and stuff, however if I'd want to work with PS, sometimes it requires to write "cmd /c ..." as prefix, otherwise I'm not able to access some things
07:10 mgedmin bash is also an option ;)
07:10 Freze that sounds odd
07:10 Freze you should be able to call anything in powershell just as in cmd
07:10 Freze for the most part, batch files, exe files and so on...
07:10 konrados What about my question, please... it stops me from working :(
07:10 KeyWeeUsr ikr, I thought it's only path thing, but... e.g. notepad++ won't go this way
07:11 KeyWeeUsr mgedmin: win10 is no-go for me yet and on linux I use bash :P
07:11 Darcidride joined #git
07:11 Freze you might have to prefix the commands  with a dot  i.e. ."exe_orsomething"
07:11 mgedmin git for windows comes with mingw's bash.exe
07:11 indistylo joined #git
07:12 osse correction: msys2's bash.exe \o/
07:12 TomyWork joined #git
07:13 KeyWeeUsr mmm, sounds like a (partial) solution, but it still gets me into a situation I'm in right now (two terminals)
07:13 leeN joined #git
07:14 KeyWeeUsr Freze: tried, but it still behaves like it isn't on the path
07:14 KeyWeeUsr echo $env:path has the path
07:14 shaggycat joined #git
07:14 osse KeyWeeUsr: do you have a hack to the command history in cmd ?
07:15 KeyWeeUsr osse: what?
07:16 * mgedmin googles the difference between mingw and msys2
07:16 osse KeyWeeUsr: i don't know how else to formulate the question
07:17 osse I mean you open a cmd, then can press the up key (eg.) to access previously used commands
07:17 KeyWeeUsr osse: but, I don't understand... what hack should I have?
07:17 circ-user-cmOBz joined #git
07:17 KeyWeeUsr yes, I can do that in cmd
07:17 osse how?
07:17 KeyWeeUsr and in powershell
07:17 KeyWeeUsr with up key
07:17 osse you ddin't have to enable it?
07:17 osse configure it somehow?
07:17 KeyWeeUsr no?
07:18 a_thakur joined #git
07:18 KeyWeeUsr it worked like that since 98
07:18 GavinMagnus joined #git
07:18 osse KeyWeeUsr: I mean you can close cmd, open a new one and still use the up key to access the old commands
07:19 quenode_ joined #git
07:19 KeyWeeUsr oh this, nope, that doesn't work afaik without some dirty stuff or a logfile
07:19 osse the "dirty stuff" is the hack I had in mind :P
07:20 KeyWeeUsr hehe, now I get what you meant
07:20 osse mgedmin: mingw = gcc toolchain. msys = userland to go with it.  roughly... I think...
07:20 KeyWeeUsr anyway, what is it for regarding my problem?
07:21 KeyWeeUsr userland, what a pleasant word :D
07:21 DevAntoine joined #git
07:21 deeeepsteep joined #git
07:21 osse I was just curious since you're probably better at cmd than me
07:21 osse userland is probably the wrong word
07:22 Raed|Laptop joined #git
07:22 KeyWeeUsr well, I can do stuff with it, but it's painful. I kind of hoped I'd finally have one terminal on windows, but well...
07:23 encod3 joined #git
07:24 qabwop joined #git
07:26 otiose joined #git
07:26 Balliad joined #git
07:29 osse !ignore_tr > konrados
07:29 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.
07:29 beyertech joined #git
07:30 fuchstronaut joined #git
07:30 canton7 (the syntax is `user: trugger`)
07:31 canton7 *trigger
07:31 beyertech joined #git
07:31 konrados osse - thanks!
07:31 osse I always forgte
07:32 docnvk joined #git
07:32 Meteorhead joined #git
07:33 hahuang65 joined #git
07:33 Rish joined #git
07:37 rj11 joined #git
07:37 encod3 joined #git
07:38 Sceorem_ joined #git
07:39 KeyWeeUsr left #git
07:40 Sceorem__ joined #git
07:42 weckl joined #git
07:44 lordjancso joined #git
07:44 smithbone joined #git
07:45 fahadash joined #git
07:48 bauruine joined #git
07:49 docnvk joined #git
07:51 encod3_ joined #git
07:54 mingrammer joined #git
07:57 ahmedelgabri joined #git
07:57 JeroenT joined #git
07:58 otiose I'd like to rebase, but only keep the changes that happen within a certain directory
07:59 otiose I don't want that directory to be the only thing remaining, so filter-branch with a subdirectory-filter isn't what I want
07:59 selckin how many commits
07:59 GavinMagnus joined #git
07:59 otiose I've tried rebasing with exec functions after every commit, but that doesn't work either, because it happen _after_ the commit, in which there are often conflicts in the files i'm trying to ignore
07:59 netcarver joined #git
07:59 otiose too many
07:59 otiose like 100 or something
08:00 selckin you can run scripts with filter-branch
08:01 kurkale6ka joined #git
08:02 otiose I read the manpage on that, but I'm a little unclear on how that would work
08:02 nwkj86 joined #git
08:03 vassagus joined #git
08:03 otiose I was trying it with --index-filter 'git checkout -- IgnoredDirectory'
08:03 otiose i'm not sure if that's how its supposed to work though
08:04 tsia joined #git
08:04 ochorocho__ joined #git
08:04 selckin yeah try that or rm --cached --ignore-unmatch
08:06 otiose I'm not trying to remove the files though, just ignore the changes
08:06 selckin so make a backup of your worktree and remove anyway
08:06 selckin divide and conquer
08:06 otiose oh
08:07 LucaTM joined #git
08:07 konrados selckin, I've just done something similar - rm --cached file_name and it remove the file on disk too, not only in repository, is this how it is supposed to work?
08:07 cyan__ joined #git
08:07 otiose i see, because then i'd have a new branch with only the changes (after the first commit that remvoed everything else)
08:08 otiose and then i could just move that branch onto my oritinal branch, and it only affects the files i want it to
08:08 LucaTM joined #git
08:08 t0by joined #git
08:08 LucaTM joined #git
08:08 mikecmpbll joined #git
08:09 selckin something similar could be anything
08:09 LucaTM joined #git
08:09 beyertech_ joined #git
08:10 p4trix joined #git
08:11 beyertech joined #git
08:12 p4trix joined #git
08:13 marcogmonteiro joined #git
08:14 osse otiose: maybe this (untested): after each pick in rebase -i, add 'exec git checkout HEAD~ -- .' 'exec git checkout HEAD -- chosendir' 'exec git commit --amend'
08:14 ToBeCloud joined #git
08:14 Kicer86 joined #git
08:15 a_thakur joined #git
08:16 _ADN_ joined #git
08:18 ome joined #git
08:22 Juzzika joined #git
08:22 lb joined #git
08:23 tinajohnson___ joined #git
08:23 Anthaas joined #git
08:23 lb1a joined #git
08:24 encod3 joined #git
08:24 Guest70482 Hm i cannot change my nickname since i'm banned on channel ?!
08:25 lb1c ah. no voice that was the problem
08:25 lb1c strange error message nevertheless
08:25 fees joined #git
08:26 maxorator joined #git
08:28 ahmadassaf joined #git
08:31 shaggycat joined #git
08:33 jack_thompson joined #git
08:33 jack_thompson how do i make git follow symlinks?
08:34 mohabaks joined #git
08:35 wrouesnel joined #git
08:37 FunkyAss joined #git
08:39 konrados Hello again. I again have problems with ignoring files. About an hour ago I succeed now I fail. I added a file to the repo (locally, by git add), then git svn dcommit, then I untracked the file ( by this trick: http://stackoverflow.com/question​s/6964297/untrack-files-from-git - git update index ) Now I want to add it to ignored files, and I did add this file to .gitignore but the "git status --ignored" doesn't show it. And it also is not on the "Untracked
08:39 konrados files:" list, so what should I do now?
08:41 tobiasvl eeeeh, I wouldn't really use --assume-unchanged
08:41 tobiasvl but perhaps git-svn uses it as part of the workflow
08:43 konrados but tobiasvl, this file is not modified
08:43 stasmakarov joined #git
08:43 osse !assume-unchanged
08:43 osse !assume_unchanged
08:43 gitinfo git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
08:44 konrados But why is it happening osse & tobiasvl?
08:44 cdown joined #git
08:45 konrados This file is NOT modified, so why do I have to enter this "git update-index --assume-unchanged"?
08:45 osse i don't know what the problem is
08:45 osse git status --ignored will never show it
08:47 ifra201 joined #git
08:47 konrados osse - thanks, I did it, and indeed status --ignored doesn't show me this.
08:47 jack_thompson how do i make git follow symlinks?
08:48 konrados Anyway - thank you osse & tobiasvl!
08:48 osse jack_thompson: you cannot
08:48 osse konrados: ignored files are always untracked. your file is tracked
08:48 mingrammer joined #git
08:51 konrados osse - but git status gives me this: https://gist.github.com/konrados/​7b1e2157a02997d0c40b25461963eac5
08:52 indistylo I am getting an error  ; Now What I did, I merged my branch to master which have no merge conflicts, You can see my local here https://gist.github.com/arunsingh​/20f9b35fe8a2bf1546cde115497c118d, After merging I accidentally clicked "revert" & when I did "git pull" it shows my branch name as "revert-1180-unic_wrk_prs" which was name by me in local system as "unic_wrk_prs" , By clicking it shows my branched is merged successfully,I am ok to me
08:52 indistylo rge this branch & want to ignore that "revert" click, Till here all is fine, Now QUESTION: When i want to deploy this on one of my servers then it throws this error:https://gist.github.com/arunsingh​/f0c00ba4fde3445beaebf833d5ceccfc, Ques is how to fix this. I tried Git stash & some other commands.
08:52 osse konrados: so what?
08:52 indistylo Announcing : Crossposting
08:53 konrados Doesn't it mean it is NOT tracked? There is no config_inc.php file on the list, and I'm talking about this specific file, osse
08:53 osse konrados: why would it mean that?
08:54 JeroenT joined #git
08:54 osse if config_inc.php is not listed there then it means it's tracked and has no uncommitted changes
08:54 sin3t joined #git
08:54 konrados Ahhh, OK, I think I'm starting to understand, thank you osse!
08:55 konrados Still I don't understand why it isn't listed on the "ignored files" section.
08:55 osse konrados: why should it be?
08:56 konrados Because it's in the .gitignore file ...
08:56 konrados osse, ^
08:56 osse !ignore_tr
08:56 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:56 osse read that carefully
08:56 bittin joined #git
08:58 chll_ joined #git
08:58 auzty joined #git
08:59 konrados osse - I already did that. I also did "untrack" files following this: http://stackoverflow.com/question​s/6964297/untrack-files-from-git so know, after "git status" this file is.. nowhere. Is not on the list of "untracked" files, or the list of "ignored files". I now modified it, and it's still nowhere, is it normal?
08:59 jack_thompson osse thanks.. guess ill have to write a fuse filesystem then that hides symbolic links from it.. -_-
08:59 konrados so now, after...
08:59 jack_thompson left #git
08:59 osse konrados: that is not untracking. git rm untracks
09:03 davisonio joined #git
09:03 Learath2 joined #git
09:03 konrados osse google doesn't help me with "git rm untracks" didn't you mean "clean"? But I don't want to delete this file. Tell me - is this normal, that I modified the file, added to the .gitignore file but it's nowhere? git status --ignored should show me it? Or should it be on the "untracked files" list?
09:04 JeroenT joined #git
09:07 Ezzy joined #git
09:07 vassagus joined #git
09:08 Learath2 joined #git
09:11 Manuel15 joined #git
09:11 Manuel15 joined #git
09:14 dodobrain joined #git
09:15 tobiasvl konrados: to be clear – only untracked files that are listed in .gitignore, are ignored. to untrack a tracked file in order to ignore it, you run "git rm". you have not untracked the file.
09:16 tobiasvl so the file is neither untracked nor ignored, and will not be showed in the list of untracked files or git status --ignored.
09:17 ahmedelgabri joined #git
09:17 osse konrados: no it is not normal that it's not listed when you modified it. but that's the point of the --assume-unchanged
09:17 DarsVaeda joined #git
09:17 konrados sec... I'm lost a bit...
09:18 DarsVaeda how do I switch to a branch?
09:18 konrados osse, tobiasvl - why did I have to do --assume-unchanged ?
09:18 osse DarsVaeda: git checkout branchname
09:18 osse konrados: I don't know. Why did it because you read something on stack overflow
09:18 osse *You did it
09:18 DarsVaeda okay I feel a bit stupid today...I did that but files are still the wrong version?
09:18 osse You didn't have to
09:19 osse DarsVaeda: if git doesn't have to chagne files then it won't do it. if you have changes you want to get rid of gitstatus tells you how to do it
09:19 scarface joined #git
09:20 DarsVaeda I didn't change anything, I cloned a github repo and now want to switch to the branch
09:20 konrados But all of this started from this: tracked file, ignoring didn't help, I found out (here) that only untracked files can be ignored, so "untracked" it, and still ignoring didn't help..., osse so I indeed followed some stack answer.
09:20 osse konrados: You didn't untrack it!!
09:21 osse DarsVaeda: what does git status say=
09:21 konrados Hmmm, OK, thanks. So... so what's the current status of the file?
09:21 konrados osse, ^
09:22 DarsVaeda osse: it says it is on the branch but it isn't if looking at the files
09:22 konrados "neither untracked nor ignored" as tobiasvl said, osse ?
09:22 osse konrados: to undo the silly stack overflow thing, do git update-index --no-assume-unchanged thefile
09:22 tabrez joined #git
09:22 osse konrados: now things will be back to normal
09:22 boombatower joined #git
09:22 konrados ok, sec...
09:22 DarsVaeda maybe I'm missing some command? do I have to explicitly pull or something to replace the files with the branch files?
09:22 osse DarsVaeda: does it say "working directory clean" ?
09:23 DarsVaeda yes
09:23 osse then all the files are as they should be
09:23 DarsVaeda but they aren't :/
09:23 osse you and git disagree.
09:23 osse git is usually right
09:23 circ-user-cmOBz joined #git
09:24 DarsVaeda not this time unfortunately
09:24 DarsVaeda I'm definitely missing files if I compare with github
09:24 Pulp joined #git
09:24 DarsVaeda actually none of the files are changed
09:25 osse did you checkout the correct branch? maybe you just created a branch by the same name that's differetn?
09:25 ferr joined #git
09:25 alansaul joined #git
09:25 konrados osse - OK, so now I have it under "Changes not staged for commit" "modified". What do I have to do, if I want this file on my local machine, but I don't want it to be commited?
09:26 osse konrados: never commit it
09:26 mrkake joined #git
09:26 JeroenT joined #git
09:26 konrados But how? I commit the entire project, I want remember to not commit this one file, especially that I have more files to ignore, osse
09:26 osse konrados:
09:27 osse konrados: !config
09:27 gitinfo konrados: [!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
09:27 mikecmpbll joined #git
09:27 osse konrados: there is no way to do it except the assume-unchanged thing. but you didn't like that either
09:27 osse implement one of the solutions in that link. much better
09:28 konrados osse, I've already seen this, even more, I've implemented  it myself in one of the projects. Why can't I just ignore this one file? The rest of ignored files are ignored without any issues.
09:28 osse konrados: the other files either aren't tracked or have no changes
09:28 a3Dman joined #git
09:29 osse konrados: git cannot do what you want. it's a simple as that.
09:29 konrados I have tried on on a tracked, not modified file. It didn't work either, osse :(
09:30 osse what didn't work?
09:30 konrados It still isn't on the "git status --ignored" list
09:30 osse jeeeesus
09:30 konrados What?
09:30 osse if they are tracked they will NEVER be on that List
09:30 osse a file is NEVER tracked AND ignored at the same time
09:31 DarsVaeda I indeed missed some commands, I just cloned the master not the branch, I thought it does that for you
09:31 konrados But they weren't tracked at the second attempt, at first it was, but not on the second try, osse
09:31 mingrammer joined #git
09:31 konrados Unless I don't know how to check if a file is tracked....
09:32 konrados I'm missing something and I don't know what it is.
09:32 konrados osse, how to "untrack" a file, but still keep it in repo?
09:34 a3Dman joined #git
09:35 hahuang65 joined #git
09:35 tobiasvl you cannot.
09:35 lb1c konrados that's a contradiction
09:35 lb1c tracked = in repo , untracked = not in repo
09:35 nivag joined #git
09:36 ArchNoob joined #git
09:36 bathtub_shark joined #git
09:36 konrados sec... what about this, tobiasvl lb1c : http://source.kohlerville.com/​2009/02/untrack-files-in-git/
09:37 lb1c konrados "in repo" is not the same as "an untracked file inside the folder in which my repo resides"
09:37 nivag joined #git
09:38 lb1c konrados your question should have been, "how can i untrack a file but keep it in my working directory"
09:38 lb1c konrados in which case "git rm --cached <file>" would be the correct answer
09:38 konrados Sec...
09:39 nivag joined #git
09:42 Jellyg00se joined #git
09:44 deepy Can I get git-diff to only show the latest change? Like if I line was added I don't want to see the removal of it and vice-versa
09:45 Grievre latest change between what and what
09:45 konrados Well, actually I wanted to keep it in both places, local machine and the repo, and then ignore it and then modify it on my local machine, but it seems that it's indeed impossible with Git...
09:45 konrados lb1c ^
09:45 Grievre deepy: You can see the diff between unstaged changes and staged, between staged and committed, or for a given commit
09:45 Grievre any finer grained than that, and git can't help you
09:45 lb1c konrados use a template file for your use case
09:47 konrados lb1c but there are more files to "ignore", I don't understand why so basic functionality doesn't exist...
09:47 lb1c konrados then read about the concepts of git, if you really care about the why.
09:48 lb1c man gitignore
09:48 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
09:48 konrados Yes I do care. Thanks for the link, lb1c
09:50 deepy I'm diffing two branches, I'm not so interested in what was modified, but more what was removed or added
09:51 deepy So seeing a - assertNull; + Assert.assertNull(.. is kinda superflous to me, I just want to see the + in that case
09:53 tobiasvl konrados: I think someone else linked this to you already, but it's the most relevant for your case: !config
09:53 gitinfo konrados: [!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
09:53 robotroll joined #git
09:54 g105b joined #git
09:55 konrados tobiasvl, yes I have already seen this, thanks. But there are more files to ignore, so I thought I have to learn how to do this the most easy way.
09:57 satya4ever joined #git
10:01 netj joined #git
10:01 otiose joined #git
10:02 otiose left #git
10:02 Derperperd joined #git
10:06 mingrammer joined #git
10:06 p4trix joined #git
10:06 AndroIRCScreens joined #git
10:09 AndroIRCScreens joined #git
10:09 tvw joined #git
10:10 osse konrados: this is the easiest way
10:10 osse --assume-unchanged has many problems
10:10 ASOLAr joined #git
10:10 SimonNa joined #git
10:13 mgedmin left #git
10:14 JyZyXEL joined #git
10:17 AndroIRCScreens joined #git
10:22 fuchstronaut joined #git
10:25 dreamyspell_ joined #git
10:28 AndroIRCScreens joined #git
10:31 AndroIRCScreens joined #git
10:32 r3c0d3x joined #git
10:33 jtprog joined #git
10:34 stamina joined #git
10:34 Magesh joined #git
10:34 AndroIRCScreens joined #git
10:34 skylite joined #git
10:35 ljc joined #git
10:38 Oebele joined #git
10:40 BlackPanx joined #git
10:42 chandu20 joined #git
10:43 Derperperd joined #git
10:46 ffledgli1g joined #git
10:47 mrkat joined #git
10:49 AndroIRCScreens joined #git
10:52 pigeon joined #git
10:52 AndroIRCScreens joined #git
10:53 fuchstronaut joined #git
10:55 kennon joined #git
10:55 FritzLakritz joined #git
10:55 Derperperd joined #git
10:55 JeroenT joined #git
10:56 AndroIRCScreens joined #git
10:57 alcohol so you want to store files under version control but you dont want to version control them
10:57 alcohol :<
10:58 alcohol thats like using zip to zip a file without compressing it
10:58 alcohol :D
10:59 mingrammer joined #git
11:01 Bizkit joined #git
11:02 rafalcpp joined #git
11:04 osse Seveas: I just sent in a v2 on my own accord. I made the test_config change
11:04 zeroed joined #git
11:06 PioneerAxon joined #git
11:07 ewet joined #git
11:07 rnsanchez joined #git
11:09 JeroenT joined #git
11:15 romerocesar joined #git
11:17 legumbre joined #git
11:17 vassagus joined #git
11:18 moop joined #git
11:18 tang joined #git
11:19 spriz joined #git
11:20 mwleeds joined #git
11:23 atomicb0mb joined #git
11:25 ghostlight joined #git
11:26 ghostlight joined #git
11:26 HoierM joined #git
11:26 ghostlight joined #git
11:28 rahtgaz joined #git
11:28 rahtgaz joined #git
11:28 glebihan joined #git
11:30 Celelibi joined #git
11:31 uidzer0 joined #git
11:31 fahadash joined #git
11:35 glebihan joined #git
11:35 hahuang65 joined #git
11:36 indistylo joined #git
11:39 qpdb joined #git
11:40 ToBeCloud joined #git
11:42 alansaul joined #git
11:42 lordjancso joined #git
11:46 theskillwithin joined #git
11:48 encod3 joined #git
11:48 circ-user-cmOBz joined #git
11:49 fmcgeough joined #git
11:49 CheckDavid joined #git
11:52 interrobangd joined #git
11:56 tomog999 joined #git
11:57 ProbabilityMoon joined #git
11:57 JeroenT joined #git
11:57 ProbabilityMoon joined #git
12:00 Sceorem__ joined #git
12:02 jaafar joined #git
12:03 Darcidride_ joined #git
12:03 ahmed_elgabri joined #git
12:05 PioneerAxon joined #git
12:05 ShekharReddy joined #git
12:07 mohabaks joined #git
12:08 leeN joined #git
12:09 sdothum joined #git
12:13 merpnderp left #git
12:14 johnmilton joined #git
12:15 sdothum joined #git
12:15 JeroenT joined #git
12:18 anticom joined #git
12:19 Rodya_ joined #git
12:20 johnmilton joined #git
12:21 TooLmaN joined #git
12:21 Hink joined #git
12:23 vassagus joined #git
12:25 rominronin joined #git
12:25 a_thakur joined #git
12:26 Endarked joined #git
12:29 wrouesnel2 joined #git
12:30 daniel_rose joined #git
12:30 f0rblaze joined #git
12:33 JeroenT joined #git
12:36 tsia joined #git
12:36 rgrinberg joined #git
12:38 Manuel15 joined #git
12:38 Manuel15 joined #git
12:40 rgrinberg joined #git
12:45 courrier joined #git
12:45 BlackPanx joined #git
12:46 mikeBr joined #git
12:48 sanketdg joined #git
12:48 mikeBr left #git
12:49 jceb joined #git
12:51 Rodya_ joined #git
12:53 inflames joined #git
12:54 dsdeiz joined #git
12:54 dsdeiz joined #git
12:55 perlpilot joined #git
12:57 thecomedian joined #git
12:57 kadoban joined #git
12:58 GodGinrai joined #git
12:58 jost_ joined #git
12:58 HanClinto joined #git
12:59 fmcgeough_ joined #git
13:00 jimi_ joined #git
13:02 EduardoMartins joined #git
13:03 thecomedian joined #git
13:04 ExoUNX joined #git
13:06 kr joined #git
13:07 thecomedian joined #git
13:09 synthroid joined #git
13:09 cdg joined #git
13:11 robotroll joined #git
13:12 Kake_Fisk joined #git
13:13 Kake_Fisk I have a remote origin, but nothing happens when I fetch a repository. I suspect I might not have configured where on my computer I want it downloaded. Any ideas?
13:13 canton7 Kake_Fisk, !repro
13:13 gitinfo Kake_Fisk: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
13:16 robotroll joined #git
13:19 Gamecubic joined #git
13:20 Kake_Fisk https://vomitb.in/BDEehVAR5P
13:22 kr joined #git
13:24 kr hi. smartgit - windows: im unable to push from a user account (admin), but able to push from another (guest). cmd works just fine. what's wrong with the permissions? im getting a bad line length: Acti from smartgit right now
13:24 rj1 joined #git
13:25 ams__ joined #git
13:25 naw joined #git
13:26 fuchstronaut_ joined #git
13:26 sagerdearia joined #git
13:26 jtprog joined #git
13:28 vassagus joined #git
13:29 JeroenT_ joined #git
13:30 JeroenT joined #git
13:30 rasto joined #git
13:31 Cata|Work joined #git
13:32 Didac joined #git
13:36 kr anyone?
13:36 hahuang65 joined #git
13:38 monoprotic joined #git
13:39 albel727 joined #git
13:39 circ-user-cmOBz joined #git
13:40 rnsanchez joined #git
13:40 anuxivm joined #git
13:43 altendky joined #git
13:43 kr !wlmjjffer+9
13:43 canton7 Kake_Fisk, and what's the probleme? It did fetch branches, as you cna see on line 31
13:44 mgedmin joined #git
13:44 canton7 Kake_Fisk, remember what you need to use 'git branch -a' or 'git branch -r' to view remote branches
13:44 mgedmin left #git
13:45 osse kr: https or ssh ?
13:45 osse the push urls
13:46 kr osse: ssh
13:46 osse kr: maybe cmd uses openssh and smartgit uses plink
13:46 osse or the other way around
13:47 robotrolll joined #git
13:47 kr osse: ok, but how can a guest account use smartgit push but admin account can not ?
13:47 compeman_ joined #git
13:47 btborg joined #git
13:47 compeman_ left #git
13:47 btborg hi
13:47 gitinfo btborg: 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.
13:48 btborg Why is my local .gitignore file being... ignored?
13:48 cjohnson Maybe this is a #zsh question, but I have a few shell commands which are just wrappers for git commands. I want to get completion of branches for my created shell scripts, anybody know how I might do this?
13:48 osse btborg: wild guess, !ignore_tr
13:48 gitinfo btborg: [!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.
13:48 robotrolll joined #git
13:49 jon-mac joined #git
13:49 btborg Oh wow, my question is common enough to warrant an automated response :O
13:49 btborg Anyways thanks
13:49 osse if I had a penny...
13:50 osse I'd have a couple of pennies
13:50 vassagus joined #git
13:51 AaronMT joined #git
13:51 jceb joined #git
13:51 AaronMT joined #git
13:52 kr osse: ?
13:52 osse kr: i don't know
13:52 kr osse: ok..
13:52 kaldoran joined #git
13:52 osse kr: differences in environment variables fore xample
13:52 kr none :/
13:53 osse kr: maybe smartgit has per-user config?
13:56 cjohnson Oh that was easy enough, compdef _git alias=git-$CMD
13:56 cjohnson neat
13:56 kr osse: just deleted user data, reinstalled and configured both the same way
13:56 Freze joined #git
13:57 bartosz_ joined #git
13:58 am55 joined #git
13:59 osse I have no clue then
14:03 cjohnson left #git
14:04 phaleth joined #git
14:04 stonerfish joined #git
14:06 kr osse: any hint about protoool error: bad line length: Acti ? Acti ??
14:07 Endarked_ joined #git
14:08 JeroenT_ joined #git
14:08 FunkyAss joined #git
14:09 vuoto joined #git
14:09 osse no
14:09 daniel_rose joined #git
14:10 JeroenT joined #git
14:10 zino_ joined #git
14:10 vuoto joined #git
14:13 StuartMI joined #git
14:15 kyan joined #git
14:16 kyan joined #git
14:16 PioneerAxon joined #git
14:17 kyan joined #git
14:17 tsia joined #git
14:17 ASOLAr joined #git
14:18 l4v2 joined #git
14:19 ResidentBiscuit joined #git
14:21 ahmed_elgabri joined #git
14:22 JyZyXEL joined #git
14:25 morenoh149 joined #git
14:26 tsia joined #git
14:27 cspotcode joined #git
14:28 Dougie187 joined #git
14:31 aubreypwd joined #git
14:31 vuoto joined #git
14:32 Kronuz joined #git
14:33 gargola joined #git
14:34 vuoto joined #git
14:35 vuoto joined #git
14:37 SwiftMatt joined #git
14:38 daniel_rose joined #git
14:38 snowkidind joined #git
14:39 jooni joined #git
14:39 GavinMagnus left #git
14:41 bartosz__ joined #git
14:42 goTAN joined #git
14:43 rivarun joined #git
14:43 raijin joined #git
14:44 kr no one ? :/
14:44 Gsham joined #git
14:44 _ikke_ Looks like a server problem
14:44 _ikke_ server / network
14:48 stuh84 joined #git
14:48 chandu20 joined #git
14:48 diogenese joined #git
14:48 circ-user-cmOBz joined #git
14:52 blackwell joined #git
14:55 le_melomane joined #git
14:55 tkbsnn joined #git
14:55 eroussel joined #git
14:56 johnmilton joined #git
14:56 romerocesar joined #git
14:57 kyan joined #git
14:58 daniel_rose joined #git
14:58 Rish_ joined #git
14:58 al-damiri joined #git
14:59 thiago joined #git
14:59 p3m joined #git
15:00 tang joined #git
15:01 thejoecarroll joined #git
15:02 Gitzilla joined #git
15:02 shaggycat joined #git
15:04 subhojit777 joined #git
15:06 ahmed_elgabri joined #git
15:07 ack_inc joined #git
15:08 eivarv joined #git
15:08 Kake_Fisk joined #git
15:09 stamina joined #git
15:10 sfoxorthy joined #git
15:10 alansaul joined #git
15:11 comps hmm, what would be the rebase equivalent of applying patches onto my branch? .. say I have this remote branch which shares a common ancestor with mine and I want to cherry-pick all its commits above the ancestor onto my branch
15:12 ToxicFrog comps: isn't that just cherry-pick?
15:12 comps I know I should be able to do this with bash scripting or probably via git-merge-base and some magic, but was wondering if there's something easier
15:12 dreiss joined #git
15:12 sfoxorthy joined #git
15:12 comps ToxicFrog: yes, but over many commits
15:12 kr anyone to help me out with smartgit access is denied on windows?
15:13 osse comps: rebase --onto
15:13 jtprog_ joined #git
15:13 ToxicFrog comps: yes. Cherry-pick supports commit ranges.
15:13 ToxicFrog E.g. git cherry-pick ancestor..remote-branch
15:13 comps osse: I'm aware of that one, but it always seems to detach my branch for some reason :)
15:13 osse comps: git rebase --onto=mybranch ancestor remotebranch
15:13 osse ah yes, because of the remote thign
15:13 Kake_Fisk If I want to "download" my remote repository using git, would I want to fetch, pull or clone?
15:14 osse go with cherry-pick
15:14 osse Kake_Fisk: clone. the others assume you have already done so earlier
15:14 comps ToxicFrog: yeah, as I said - I could automate it with git-merge-base which would find the ancestor for the range spec, but was wondering if there's something as easy as git merge --squash
15:14 Kake_Fisk So clone doesn't make a new repository on my remote server?
15:14 alansaul joined #git
15:15 osse all it does is make a new repository wher eyou run the command
15:15 osse ie on your local computer
15:15 Kake_Fisk And when I commit to the clone and push, it will update the remote repository?
15:15 osse yes
15:15 Kake_Fisk Ah, okay. I'll try that. thanks :)
15:16 phanimahesh joined #git
15:19 Infamous joined #git
15:20 alansaul joined #git
15:20 rubie joined #git
15:20 subhojit_ joined #git
15:22 kenansulayman joined #git
15:22 hahuang65 joined #git
15:23 Heisenberg1276 joined #git
15:24 Guest26216 joined #git
15:26 EvilPeng1 joined #git
15:26 Derperperd joined #git
15:27 Thorn joined #git
15:28 aaaaa joined #git
15:29 Darcidride__ joined #git
15:31 dmto joined #git
15:33 subhojit777 joined #git
15:33 ssssss joined #git
15:35 rofl__ joined #git
15:35 rofl__ left #git
15:36 norotartagen joined #git
15:36 ssssss joined #git
15:36 leftriver01 joined #git
15:39 norotartagen test
15:40 norotartagen hey, i've got that problem where my submodules won't update
15:40 vuoto joined #git
15:40 zino_ joined #git
15:41 norotartagen "git submodule update --recursive" does nothing, but gitmodules and the old subproject are both committed to my repo
15:42 vuoto joined #git
15:45 Dougie187 norotartagen: Are they initialized?
15:46 norotartagen yes
15:46 norotartagen where can I see which commit is specified in the superproject?  i believe it's a newer one but would like to verify...
15:47 Dougie187 It's in your .gitmodules file
15:47 Emperor_Earth_ joined #git
15:47 Dougie187 Oh wait, not it's not. :P
15:47 norotartagen my .gitmodules file only specifies the repository, not a specific commit
15:47 Dougie187 I forget, let me look.
15:47 cjohnson joined #git
15:48 cjohnson I'm having a hard time grasping how to rebase from master. I made a totally new branch from master last thursday and patched my changes in from there, to be totally sure I wouldn't bring over any of my own conflicted history and mess. I edited filea and fileb. I came in this morning and updated my branches and tried to `git rebase master` from my new branch
15:49 cjohnson It gave me a huge list of conflicts in filec filed filee filef etc
15:49 osse omg it's the sjohnson lookalike
15:49 cjohnson :P
15:49 osse take a look at !lol
15:49 osse hmm
15:49 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:49 osse there we go
15:49 ahmedelgabri joined #git
15:50 cjohnson https://i.imgur.com/NEwN5G5.png   none of these files are modified in my branch
15:50 cjohnson and when I pulled my own master from origin it iddn't conflict so it's not like somebody rewrote history
15:51 osse "feature/migration" is the branch you made last thursday?
15:51 cjohnson yeah
15:51 cjohnson and the only changes are free from history, I patched them in using diff to be sure I wouldn't bring in old crap
15:51 osse cjohnson: git log 55cd90a..feature/migration
15:52 cjohnson that shows several commits from another developer which do change the files in question, plus my 2 patched commits
15:52 osse those are the commits git will attempt to rebase
15:53 osse are you the victim of someone elses force push, maybe?
15:53 cjohnson No there's only one other dev and he hasn't done anything like that
15:54 jstein_ joined #git
15:54 osse that he knows of...
15:54 osse I can't think of any other reason, except if you have done something
15:55 synthroid joined #git
15:55 cjohnson alright then
15:55 osse cjohnson: did YOU work on master in the mean time?
15:55 daniel_rose joined #git
15:56 osse cjohnson: anyway, git rebase --abort; git rebase --onto=master HEAD~2
15:56 norotartagen Also: the output of "git status" in the sumbodule directory contains "Your branch is behind 'origin/master' by 16 commits".
15:56 osse that should do the trick (ie. move the two top commits to on top of master and forget the rest)
15:56 cjohnson I made on additional branch from master which changed still a third set of files and merged that into master  ut otherwise no
15:56 Dougie187 cjohnson: you could try `git rebase -i master` to see what is really going on.
15:56 alansaul joined #git
15:56 Rodya_ joined #git
15:57 mwleeds joined #git
15:57 norotartagen (not that that matters if the superproject is referencing the old commit)
15:57 cjohnson Ok I will take a look at those commands
15:58 cjohnson Am I wrong to think I should be rebasing my features from master occasionally to keep an up to date codebase?
15:58 osse no
15:58 Dougie187 It's up to you. :P
15:58 cjohnson I can probably make do without but then sometimes you'll get the scenario where it's time to push live and I have a ton of conflicts to resolve
15:59 chrisshattuck joined #git
15:59 cjohnson I'd rather take care as they happen, via rebase
15:59 osse cjohnson: if you are 100% you created this branch from master and you are 100% sure you rebase onto master then at least one of these MUST be true: 1) master's history was rewritten, 2) your branch's history was rewritten in such a way that it also rewrote parts of the common history
15:59 Dougie187 norotartagen: I can't find the info. :/
16:00 cjohnson hrm
16:01 Dougie187 norotartagen: I think you just do `git submodule status` and it'll tell you though
16:01 Dougie187 cjohnson: I agree with osse. Basically the rebase has to be bringing in a commit you're not expecting.
16:01 Dougie187 That's why I said to do `git rebase -i master` so you see everything git is thinking it should migrate.
16:02 cebor joined #git
16:02 Dougie187 Or, you have changes you're not aware of in your commits. :P
16:02 cjohnson that lists a gigantic list of commits
16:02 osse cjohnson: under the hood what rebase does is cherry-pick whatever commits your branch has that master doesn't, and put then on top. that list of commits is longer than you expect
16:02 Rish joined #git
16:02 Dougie187 cjohnson: It should be 2, right?
16:02 FilipNortic__ joined #git
16:02 osse that list should be identical to the one you saw with git log 55cd90a..features/migration
16:03 airdisa joined #git
16:03 nitric joined #git
16:04 cjohnson I think it is, that had a huge list as well. not just my 2 commits
16:04 berndj-blackout joined #git
16:04 holdsworth_ joined #git
16:04 Dougie187 Well, then it's trying to rebase commits you're not expecting, which means you didn't branch off of what is currently master.
16:05 sLite joined #git
16:05 kloeri joined #git
16:05 tabakhase joined #git
16:05 beyertech joined #git
16:05 ilogger2 joined #git
16:05 xai joined #git
16:05 phroa joined #git
16:05 subhojit777 joined #git
16:06 osse Speaking to the whole channel: See what happens when you force-push? cjohnson is losing his hair and getting an ulcer.
16:06 osse Kids, don't force push.
16:06 phanimah1sh joined #git
16:06 HanClinto_ joined #git
16:06 cjohnson there was no force push, I asked him, he's sure
16:06 niax joined #git
16:06 cjohnson I think I merged a branch instead of diff+patch
16:06 cjohnson and that's why
16:06 cjohnson and that branch was already mucked up
16:06 norotartagen ahhhhh it was a bad merge o_O
16:06 osse do my two-step clean-up procedure. Your happiness or your money back!
16:07 Gsham joined #git
16:07 cjohnson just ran, still conflicts
16:07 cjohnson I want my money back!
16:07 osse boool sheeeeeet
16:07 norotartagen the superproject WAS referencing the old commit
16:07 cjohnson question: I deleted a branch, is there some way I can recover it? I don't recall the last commit id in it
16:07 berndj-blackout left #git
16:07 Freze_ joined #git
16:07 thiago_ joined #git
16:08 cjohnson osse: https://i.imgur.com/bimlois.png
16:08 osse cjohnson: git log features/migration~2..features/migration shows your two wanted commits right?
16:08 Oebele joined #git
16:08 berndj joined #git
16:08 cjohnson lists the huge list of commits
16:09 Emperor_Earth joined #git
16:09 osse ok
16:09 osse so you merged or something
16:09 CustosLimen joined #git
16:09 Freze joined #git
16:09 cjohnson mustve
16:09 leeN joined #git
16:10 cjohnson Damn you git, one day I will understand you
16:10 osse ok, here's what I'd do: git rebase --abort; g log master..features/migration; note down the SHA1s of your desired commits; git reset --hard master; git cherry-pick {those SHA1s here}
16:10 mattcen joined #git
16:10 LeBlaaanc joined #git
16:10 cjohnson good call
16:10 osse erryting be good after dat, mon
16:10 Dougie187 Post the graph.
16:10 cjohnson I don't want you to judge me Dougie187
16:10 Dougie187 :P
16:10 cjohnson hahaha
16:11 Dougie187 Isn't this a judgement free room?
16:11 cjohnson no I think I'm going to assume I screwed this one up and just cherry pick to solve
16:11 ghostlight joined #git
16:11 cjohnson and ENSURE I don't do weird merges going forward
16:11 Dougie187 Hah
16:11 Dougie187 well, it's good to know what happened.
16:11 Dougie187 So you can think about it next time!
16:11 osse this is far from a judgement free room since I am here
16:11 cjohnson I think I merged soemthing wrongly
16:11 osse I will LAY DOWN DA LAWWWW
16:12 ghostlight joined #git
16:12 Dougie187 Comon, I wanna see the graph now... :P
16:12 belak joined #git
16:12 ghostlight joined #git
16:13 ghostlight joined #git
16:13 ghostlight joined #git
16:13 t0by joined #git
16:13 cworth joined #git
16:14 tabakhase joined #git
16:14 ghostlight joined #git
16:14 spudowiar joined #git
16:14 vassagus joined #git
16:14 ghostlight joined #git
16:15 ghostlight joined #git
16:15 Anthaas joined #git
16:15 lucz joined #git
16:15 byteflame joined #git
16:15 ghostlight joined #git
16:15 beyertech joined #git
16:16 ghostlight joined #git
16:16 Freze_ joined #git
16:16 iskander joined #git
16:16 ghostlight joined #git
16:16 mohabaks joined #git
16:17 ghostlight joined #git
16:18 foist joined #git
16:19 JamesBaxter joined #git
16:21 Fr0Master left #git
16:21 cjohnson I just rewound master to HEAD~10, formed a new branch, applied all my changes via patch only, and now I can rebase fine. so yeah I did screw up my branch
16:21 cjohnson even after updating master
16:21 FroMaster joined #git
16:22 Dougie187 No graph? :(
16:23 Torrone joined #git
16:23 daniel_rose joined #git
16:24 Torrone hello, I was trying to undo a wrong commit by running git revert HEAD --no-edit and most of my files were deleted, what happened? do I need to soucide myself?
16:24 osse Dougie187: maybe if you offer sign an NDA
16:24 madewokherd joined #git
16:24 durham joined #git
16:24 Dougie187 Hah, sure, I'm down with that.
16:25 Torrone how do I get my files back?
16:25 Dougie187 Torrone: Are these uncommitted files?
16:25 Torrone Dougie187, I commited them locally
16:26 osse Torrone: you committed it, then wanted to undo the same commit ?
16:26 Torrone yes, I've noticed that some files should have been ignored
16:27 Torrone I tried to run git reset HEAD~ but it wouldn't work
16:27 osse Torrone: ok, let's be careful. what does git status say now?
16:28 le_melomane joined #git
16:28 grazfather left #git
16:28 Torrone osse, lots of addictions
16:28 Torrone new files
16:28 osse woahhh... like heroin and .. oh
16:28 Dougie187 lol
16:29 osse Torrone: well, this is a messy situation. are those files you want to keep?
16:30 Torrone I think so, most of them shoud be deleted but I need some, most of all I need those that have been deleted
16:30 Torrone which aren't on the list
16:31 osse Torrone: you'll get them back as long as you committed them as you said
16:31 osse for now, add those files you want to keep and make a new commit
16:32 Torrone osse, you mean git add? those files aren't there anymore T_T
16:32 chrisshattuck joined #git
16:32 osse Torrone: I mean add and commit those you want to keep
16:32 osse that you see in the list now
16:33 hashpuppy joined #git
16:33 Torrone but how can I commit them if they're not in the folder?
16:33 Torrone they are already comited
16:34 Torrone git log shows the commit in which they were added
16:34 osse gaaah
16:34 osse you said there were files listed by git status you wanted to keep, right?!
16:34 Derperperd joined #git
16:34 osse not the ones that are missing, but other files you still want to keep
16:35 osse right!?
16:35 Torrone yeah...
16:35 Dougie187 osse: You're going to need multiple addictions after you finish helping everyone
16:35 osse add and committ them
16:37 polyzen joined #git
16:37 LionsMane joined #git
16:38 Torrone osse, ok
16:38 Torrone done
16:39 osse Torrone: do git log --oneline HEAD~3..HEAD. It should list three commits: the one you just now created, the revert, and the commit you wanted to undo in the first place.
16:39 noctux joined #git
16:39 osse is that correct?
16:39 Torrone fatal: ambiguous argument 'HEAD~3..HEAD'
16:40 osse ehh... git log --oneline -3  then
16:40 Torrone osse, git log without args lists them anyway
16:40 Torrone ok
16:40 Torrone got them
16:41 osse so the files you're missing are present in the third commit (the earliest one)
16:41 osse do  git checkout {thatcommit} -- {files}
16:41 osse apparently HEAD~2 doesn't work for some reason
16:41 osse so use the SHA1
16:41 ack_inc_php joined #git
16:42 WeeDyMeeDy joined #git
16:43 Torrone osse, theyr back!
16:43 Torrone thank you osse now I don't suiside myself
16:43 daniel_rose joined #git
16:44 osse now you can decide whether you want to forget all of this ever happened
16:44 osse or if you want to keep this noise in the git history
16:44 Torrone I'd rather forget osse
16:44 Torrone memory is too painful
16:44 ash_workz joined #git
16:44 osse Torrone: ok, first commit these files you brought back to life
16:44 orbitphreak joined #git
16:46 Torrone ok
16:47 eroussel joined #git
16:48 orbitphreak joined #git
16:48 sns joined #git
16:49 Torrone osse, done
16:49 osse Torrone: what does git status say now?
16:49 Torrone HEAD detached from 069f7e9
16:50 romerocesar joined #git
16:50 Torrone nothing to commit, working directory clean
16:50 osse fuck
16:50 Torrone fuck
16:50 osse ok then. step 1, making a branch:  git checkout -b something
16:50 Torrone done
16:50 circ-user-cmOBz joined #git
16:52 daynaskully joined #git
16:52 osse Torrone: ok. what branch should you have been on ?
16:53 Torrone master
16:53 HoierM joined #git
16:53 osse Torrone: do this: ''git log --oneline --graph --decorate something master''
16:53 osse can you pastebin the 10 first lines?
16:54 mingrammer joined #git
16:55 Torrone osse, it's 5 lines actually http://pastebin.com/e8LjRp0T
16:55 osse oh it's a brand new repo?
16:56 jeffreylevesque joined #git
16:56 Torrone osse, kind of :P
16:56 osse well it looks like the commit you did badly and wanted to revert is the first one
16:56 Torrone yes
16:57 osse in which case we could have saved a lot of time by doing rm -rf .git
16:57 retroj joined #git
16:57 Torrone osse, yes but what about all my deleted file?
16:57 osse hmm, true
16:58 osse good thing we didn't do that
16:58 osse ok, so what we want here is to be left with only one commit
16:59 osse and that one commit has the exact same files as the current one
16:59 osse sounds good ?
16:59 mrlowskill joined #git
16:59 retroj a patch that adds a new file to a repo, produces the following error: $ git apply --stat ~/foo.patch # -> fatal: new file gnu/packages/ola.scm depends on old contents.  what does this mean?
16:59 Torrone osse, yup
17:00 ash_workz joined #git
17:00 durham_ joined #git
17:00 osse Torrone: git branch -D master && git checkout --orphan master && git commit -m 'Initial commit' && git branch -D notmaster
17:01 Rish joined #git
17:01 LionsMane joined #git
17:02 garethdaine joined #git
17:02 Sasazuka joined #git
17:02 Torrone osse, thamk you :)
17:02 Torrone *thank
17:07 blackwell joined #git
17:07 subhojit_ joined #git
17:07 shinnya joined #git
17:07 aard_ joined #git
17:07 Rish joined #git
17:08 subhojit_ joined #git
17:08 Heisenberg1276 joined #git
17:08 chachasmooth joined #git
17:09 abyx joined #git
17:09 Rish_ joined #git
17:09 phanimahesh joined #git
17:09 ech0s7 joined #git
17:10 skylite joined #git
17:10 abyx Okay so uhm... hoping i didn't just screw something up. I had changes to a file  (that i wanted to keep) but I just mindlessly did a `git checkout` on that file... is there anyway to undo that operation?
17:10 ech0s7 i'm trying to revert a file to a specific revision in this way: git checkout <rev> <file_name>
17:10 ech0s7 but why the file content doesn't change ^
17:10 ech0s7 ?
17:10 osse abyx: did you ever run 'git add' on it?
17:11 _ikke_ retroj: That's apparently reallo old code (from 2005)
17:11 _ikke_ retroj: Trying to understand what the code does
17:12 abyx osse, i previous stashed the changes if that helps....
17:12 abyx previously*
17:12 abyx previously*
17:12 osse abyx: did you stash pop successfully ?
17:12 osse so the stash itself doesn't exist currently?
17:12 abyx i ran a `git stash apply` then like an idiot ran git checkout on a file by accident
17:13 osse THANK JESUS
17:13 osse since you used "apply" instead of "pop" that means the stash still exists
17:13 osse git checkout refs/stash -- file && echo WOOHOO
17:16 sythe2 joined #git
17:16 Freze_ joined #git
17:16 sythe2 "error: Pull is not possible because you have unmerged files."
17:16 vdv joined #git
17:16 beyertech joined #git
17:16 _ikke_ resolve the conflict then
17:17 _ikke_ (git status)
17:17 osse ech0s7: what does ''git diff <rev> HEAD -- <file_name>'' say ?
17:17 subhojit777 joined #git
17:17 sythe2 So I'd merge with "git merge -s recursive -X theirs master"?
17:18 retroj _ikke_: thanks.. i manually resolved the problem
17:18 osse abyx: are you there? how did it go? I need to know
17:18 beyertech joined #git
17:18 osse for make benefit glorious nation of osseland
17:18 inflames joined #git
17:18 _ikke_ retroj: can you still produce it?
17:18 _ikke_ retroj: Wouldn't be bad to clarify that error
17:19 abyx osse, I got the changes back ;D
17:20 sythe2 Ok, so I have newer changes that I've made to an older version of master; there's been a commit since then, but my new changes are more important/more significant - what would I enter to force push them OR merge and push them?
17:20 retroj _ikke_: what do you suggest?  i can reproduce it, but i don't have a minimal test case for it
17:20 osse abyx: praise gaben
17:20 beyertech joined #git
17:20 anuxivm joined #git
17:21 Rish joined #git
17:22 _ikke_ Understanding why this error happens would already help a lot
17:23 _ikke_ retroj: https://github.com/gitster/git/commit/3​0996652e752d5fdf18f6978a70905747d1fdabc
17:23 _ikke_ This is the patch
17:23 hahuang65 joined #git
17:24 choki joined #git
17:24 mikecmpbll joined #git
17:24 dviola joined #git
17:25 retroj _ikke_: the problem has been fixed in this patch, but the patch has not been merged in official git?  or simply that i am using an out of date git?
17:25 retroj i guess i don't understand
17:27 vdv joined #git
17:27 _ikke_ retroj: Just trying to find out why this has been introduced
17:28 _ikke_ retroj: It's still in the latest version https://github.com/gitster/git/b​lob/master/builtin/apply.c#L1743
17:28 retroj _ikke_: ah
17:28 durham joined #git
17:28 SteffanW joined #git
17:31 _ikke_ https://github.com/gitster/git/b​lob/master/builtin/apply.c#L1790
17:31 Rudes joined #git
17:32 Rudes hello, i need to make a git hook that causes a windows server to pull the latest release when i push a tag, does anyone know if causing a windows server to pull is possible from a git hook?
17:32 Rudes like maybe calling a powershell script in a git hook
17:32 atomicb0mb joined #git
17:32 piling joined #git
17:32 _ikke_ Rudes: You can execute any code from a hook
17:33 osse _ikke_: can you please check if you see my PATCH v2 ? I sent it this morning
17:33 Rudes so it's jsut a matter of causing the origin server to execute the code somehow then
17:33 _ikke_ osse: alright
17:33 _ikke_ Rudes: Yes
17:33 Rudes alright, thanks
17:33 kbs joined #git
17:33 _ikke_ osse: Need to clean up my patches folder, contains 16K mails
17:33 cdown joined #git
17:34 Rudes _ikke_: poor guy
17:34 InfoTest joined #git
17:34 osse _ikke_: i think it didn't got sent because I Didn't get a copy myself
17:34 _ikke_ osse: No, I cannot find it
17:35 _ikke_ public-inbox doesn't have it either
17:35 abyx does `git reset HEAD^` default to using --hard? I just wanted to undo a local commit and keep the changes
17:35 _ikke_ abyx: it defaults to --mixed
17:35 osse _ikke_: there we go.
17:35 ghoti joined #git
17:36 _ikke_ Now I have it
17:36 retroj _ikke_: i have applied patches in the past that have added files.  i don't understand what makes my current patch different
17:38 cdown_ joined #git
17:39 fuchstronaut joined #git
17:41 dreiss joined #git
17:42 ech0s7 joined #git
17:44 Marbug joined #git
17:45 skift joined #git
17:45 fahadash joined #git
17:45 xaa joined #git
17:46 le_melomane joined #git
17:47 hahuang65 joined #git
17:47 yoan joined #git
17:47 _ikke_ retroj: Me neither, but it's hard to tell without the patch
17:47 skift general question. Reading about some of these companies like google, who have large monolithic repos with their entire codebase in it. How would they handle when one part of that code would be open sourced into its own git repository. I am curious as we are toying with a similar thing here. we want to put all of our related code into a single repository as
17:47 skift it will make some things easier. but how do we handle that case when we want to open source part of it.
17:48 skift would we just use a git submodule? usually when ive tried that, its a pain in the rear
17:50 ilbot3 joined #git
17:50 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
17:50 skift we could have A `/libs` dir or something for stuff like that. such as anything that gets installed as a python pip package locally or whatnot.
17:50 retroj _ikke_: thank you
17:50 le_melomane joined #git
17:51 cdown joined #git
17:52 mikecmpbll joined #git
17:53 multi_io joined #git
17:56 corpix joined #git
17:56 jimi_ joined #git
17:56 blackwell joined #git
17:57 abyx Why do i see changes with `git diff` that aren't reflected in my actual files?
17:58 _ikke_ abyx: what kind of changes?
17:59 abyx i see the changes that i want to commit with git diff, but when i open the files the changes are not actually applied
18:01 abyx I made changes, git added them, committed to the wrong branch by accident, then did a `git reset HEAD^`, git stash, git checkout branch-i-want, git stash apply.... Now i see the changes i want to commit with git diff but the changes don't show up in the actual files for some reason..... quite strange
18:02 davidosomething joined #git
18:02 zacts joined #git
18:02 Anoia abyx: sure you're not seeing an inverse patch?
18:02 blackwell joined #git
18:03 Anoia also note the difference between diff and diff --cached
18:03 abyx Anoia, I'm not sure
18:03 orbitphr_ joined #git
18:03 dcpc007 joined #git
18:03 WeeDyMeeDy left #git
18:03 fold4 joined #git
18:04 l4v2 joined #git
18:04 abyx git diff shows "diff --git a/foo.bar b/foo.bar" if that says anything about the diff order
18:05 rnsanchez joined #git
18:06 Anoia it doesn;t, the +/- will show which way it is
18:07 abyx oh, then those make sense for the operations that i want.... i see the new lines with +, and old replaced lines with -
18:08 _ikke_ abyx: Well, isn't that correct then?
18:09 _ikke_ The + lines show what's current in your working tree
18:09 abyx the issue is git diff is showing the desired changes, but my working directory isn't reflecting those changes
18:10 osse abyx: a plain 'git diff' ?
18:10 dcpc007 joined #git
18:11 abyx well i've committed now, so git diff HEAD~1 now
18:11 brandonw joined #git
18:11 freimatz joined #git
18:12 Anoia abyx: oh, so a plain git diff should show the inverse?
18:12 Anoia (or diff --cached)
18:13 abyx both `git diff` and `git diff --cached` show no output now
18:13 osse we're gonna have to see some proof
18:13 rnsanchez joined #git
18:15 abyx is it possible to just apply a git diff output to my working directory?
18:16 skunkz joined #git
18:16 Anoia feed it into patch?
18:16 Rish_ joined #git
18:17 satifant joined #git
18:17 Raed joined #git
18:17 kyan joined #git
18:17 _ikke_ or into git apply
18:18 Derperperd joined #git
18:18 jgornick joined #git
18:18 nitric joined #git
18:19 ack_inc joined #git
18:20 Rish joined #git
18:21 jimi_ joined #git
18:21 vassagus_ joined #git
18:24 abyx Okay, that was very strange. I just patched with the `git diff HEAD~1` to recover the changes i wanted.... No idea how i managed to muck up the working directory states or whatever it was that happened :|
18:25 _ikke_ How so
18:25 _ikke_ ?
18:26 dmpeters63 joined #git
18:27 Lope joined #git
18:27 Lope how can I check out a previous commit on my current branch?
18:28 osse Lope: git checkout sha1
18:28 Lope I've already committed my current working copy. Now I want to restore the working copy from a previous commit
18:28 osse or git checkout HEAD~5 etc.
18:28 Lope okay, then when I'm done can I just checkout the latest commit?
18:28 _ikke_ Check out the branch again
18:29 Lope it's just to view my application in the previous state, not make changes.
18:29 ArchNoob joined #git
18:29 _ikke_ right
18:29 _ikke_ That's perfectly okay
18:31 ahmedelgabri joined #git
18:33 jaequery joined #git
18:34 kulelu88 joined #git
18:34 vuoto joined #git
18:34 charlespl joined #git
18:34 zacts joined #git
18:35 tgunr left #git
18:36 charlespl Hello. I got question to you guys. Provided I want to make a branch with specific SHA. I always tend to do it like that. git branch <myname> <sha> . But what I want to achieve is to checkout to this branch immidiately. Is there something like git checkout -b <myname> <mySHA>?
18:37 _ikke_ yes, exactly that
18:38 leeN joined #git
18:38 charlespl aaa ok thanks
18:38 charlespl :D
18:39 jikz joined #git
18:41 cagedwisdom joined #git
18:41 cagedwisdom left #git
18:41 fuchstronaut joined #git
18:41 iamdevnul joined #git
18:41 ertes joined #git
18:43 Gsham joined #git
18:43 ertes hi…  in an unpublished branch if i squash all commits into a single commit and then push the branch, the receiver cannot see the history that led to the commit, correct?
18:44 osse correct
18:44 _ikke_ ertes: Not the squashed commits, no
18:44 _ikke_ use git log to veriy
18:44 _ikke_ verify
18:44 ertes generally only stuff i see in git log is pushed…  in particular the reflog is completely local, right?
18:44 Xizor joined #git
18:45 grawity yes
18:45 ertes ok, thank you!
18:45 mikecmpbll joined #git
18:47 Balliad joined #git
18:47 dviola someone rewrote the history in the remote develop branch, how do I fix this locally?
18:47 dviola do I remove my local develop branch and fetch/checkout?
18:47 _ikke_ dviola: Do or did you have that history locally
18:47 dviola I have the history locally
18:47 _ikke_ And what do you want the end result to be?
18:48 dviola the same as in the remote
18:48 _ikke_ ah ok
18:48 _ikke_ Do you have commits locally that you want to keep?
18:48 Munt joined #git
18:48 dviola not really
18:49 _ikke_ easiest is just git pull --rebase
18:49 dviola thanks
18:49 ertes is this the right place for magit (emacs) questions, too?
18:50 _ikke_ Sure, but I know nothing about it
18:50 _ikke_ (but others might)
18:53 Jon28__ joined #git
18:53 Es0teric joined #git
18:53 GenZai joined #git
18:53 Es0teric if i have two different origin urls, how do i program the user logins for each different origin?
18:54 Es0teric or two remotes
18:54 grawity depends on how the URLs determine the logins
18:54 ASOLAr joined #git
18:54 grawity are they github-like with "git@"?
18:54 axelitus joined #git
18:54 grawity usually the syntax is "login@domain", like es0teric@myserver.com:/path/to/repo or https://es0@whatever.com/
18:55 grawity if the username is already git@ for both, you'll need some ~/.ssh/config
18:55 Es0teric grawity well one of the origins is to github but both contain different passwords
18:56 grawity github over https://?
18:57 Groscheri joined #git
18:58 vassagus joined #git
18:58 gajus How to set git username and password using command line?
18:58 davisonio joined #git
18:58 gajus this is supposed to be simple to Google, but I am failing miserably
18:58 charlespl Guys what is a difference between git reset and git rebase?
18:59 _ikke_ charlespl: git reset moves the commit a branch (ref) points to
18:59 _ikke_ rebase reapplies commits
18:59 gajus specifically, using github token
19:00 charlespl gajus: git config --globa user.name <yournamehere>
19:00 charlespl gajus: git config --global user.name <yournamehere>*
19:00 gajus thats name, what about github token?
19:00 charlespl https://help.github.com/articles/​git-automation-with-oauth-tokens/
19:01 gajus charlespl I saw this. How would I provide these credentials in bash?
19:01 Es0teric grawity yes over https
19:01 Griwes joined #git
19:01 grawity Es0teric: https://username@github.com
19:01 Griwes left #git
19:01 gajus Then only way I have found is: git clone https://{token}:github.com/username/repo.git
19:01 gajus but this would print the token to the stdout
19:01 Es0teric grawity i know that.. but if i try to push lets say `git push github` its not letting me
19:01 gajus which would expose it in a public CI build log
19:02 Es0teric i also have the bitbucket origin
19:02 _ikke_ gajus: https://help.github.com/articles/​git-automation-with-oauth-tokens/
19:02 gajus (context: making travis release script)
19:02 _ikke_ gajus: use token as the password
19:02 gajus _ikke_ I read that... again How would provide that using shell script without printing to the stdout
19:03 _ikke_ Ah, like that
19:03 _ikke_ gajus: I guess looking into credential providers might help
19:04 laidback_01 joined #git
19:04 cyan__ joined #git
19:05 gajus https://iamstarkov.com/dep​loy-gh-pages-from-travis/
19:05 gajus I don't get it
19:05 moneylotion joined #git
19:05 gajus all these 'tutorials' are exposing the gh token
19:06 Es0teric actually, grawity i solved it.. `git push github -f` worked
19:06 Es0teric i mean it was an empty repo on github.com so -f was a good choice
19:06 laidback_01 hello.  I'm trying to determine the name of what I'd like to accomplish.  I have two machines, one is running a server that auto-restarts on changes, and my desktop.  I'd like to make changes on my desktop, commit them, and have the server automatically pull.  I think there's a built in git way of doing this - but... not sure.  I know I can login, perform a git pull, or use cron  to do it, but it seems more effecient to have the server do that when the repo
19:06 laidback_01 is updated.  I have a gitolite 'repo'
19:07 Balliad joined #git
19:07 dmpeters63 joined #git
19:09 retroj left #git
19:09 ssssss left #git
19:10 pijiu joined #git
19:10 nwkj86 joined #git
19:11 d5sx43 joined #git
19:11 ASOLAr joined #git
19:11 vassagus joined #git
19:11 LeBlaaanc joined #git
19:12 surfnturf_ joined #git
19:13 GhettoJava joined #git
19:13 surfnturf_ i'm trying to clone my own private repo. git isn't accepting my login and password
19:13 eijk joined #git
19:13 rivarun joined #git
19:14 _ikke_ Is it repo password day?
19:14 cjohnson laidback_01: make a command on your local machine that runs a "deploy" command on your server which just issues a git pull
19:14 cjohnson trigger the deploy command however you like
19:14 GhettoJava probably dumb git question/issue:  I have a fork. I made changes, did a pull request, accepted , all good
19:14 LeBlaaanc joined #git
19:14 GhettoJava but I seem to have an empty commit on my fork that is just a comment about the pull request
19:14 GhettoJava [3:09]
19:14 GhettoJava it seems kinda dumb to open a new pull request to push back my “merging pull request” comment
19:14 GhettoJava [3:09]
19:14 GhettoJava anyone else encounter that ?
19:15 GhettoJava sorry for the timestamps
19:16 moneylotion joined #git
19:16 _ikke_ GhettoJava: That 'empty' commit is a merge commit
19:17 elementalest joined #git
19:19 GhettoJava that merge commit puts my fork 1 commit ahead of the base fork
19:19 GhettoJava how can I be in sync ?
19:20 _ikke_ Did you merge the pull request in your fork?
19:20 lextt joined #git
19:20 _ikke_ or in the upstream project?
19:20 GhettoJava I probably didn't (since I can't remember doing that :) )
19:21 LeBlaaanc joined #git
19:22 laidback_01 cjohnson, yeah, I was looking at various choices, and they are all rather complex to deal with, just using a git pull on a minute run
19:23 Geminizer joined #git
19:24 Geminizer Hello everyone.  When doing a 'git clone user@host....' what protocol does that use?  https / ssh / git ?
19:24 _ikke_ ssh
19:24 tHEMtZ joined #git
19:25 _ikke_ Somehow it's git remote / credential / protocol day
19:25 Geminizer :)
19:25 _ikke_ Did I miss a memo?
19:25 rgrinberg joined #git
19:26 elementalest joined #git
19:27 elementalest joined #git
19:28 LeBlaaanc joined #git
19:31 Freze_ joined #git
19:31 Freze_ any snidey joke I put in a commit that fixes indentation
19:32 Freze_ since we have people who go crazy about it
19:32 _ikke_ http://whatthecommit.com/
19:32 _ikke_ or !jokes
19:32 gitinfo A complete listing of the git-jokes used in the /topic can be found at https://madeitwor.se/git-jokes (patches welcome)
19:33 errr joined #git
19:34 jknetl joined #git
19:34 jtprog_ joined #git
19:34 p3m joined #git
19:34 LordSticky joined #git
19:35 Freze_ gr8
19:36 iskander joined #git
19:36 raijin joined #git
19:36 Geminizer clear
19:36 koro_ left #git
19:36 koro joined #git
19:37 Mobutils joined #git
19:37 hAZE joined #git
19:38 surfnturf_ left #git
19:41 blackwind_123 joined #git
19:42 fuchstronaut joined #git
19:42 zacts joined #git
19:42 Macaveli joined #git
19:43 d5sx43 joined #git
19:44 nydel07 joined #git
19:44 __uli__ joined #git
19:45 jmd joined #git
19:45 jmd How do I pgp sign my commit?
19:45 jmd s/commit/commits
19:45 grawity git config [--global] commit.gpgSign true
19:45 davisonio joined #git
19:45 _ikke_ jmd: git commit -S
19:46 f0rblaze joined #git
19:48 hahuang65 joined #git
19:48 romerocesar joined #git
19:49 jmd _ikke_: Thanks
19:52 abyx joined #git
19:53 ash_workz joined #git
19:55 Finnoloid joined #git
19:56 jstein__ joined #git
19:59 LordSticky left #git
19:59 GodGinrai joined #git
19:59 alansaul joined #git
20:01 eroussel joined #git
20:01 rwb joined #git
20:01 siprbaum joined #git
20:02 j416 joined #git
20:03 siprbaum joined #git
20:03 m0viefreak joined #git
20:04 tinanoo1 joined #git
20:04 hahuang65 joined #git
20:05 LionsMane joined #git
20:06 jmd joined #git
20:06 dodobrain joined #git
20:08 troyt joined #git
20:09 kyan joined #git
20:12 atomicb0mb joined #git
20:12 ash_workz joined #git
20:14 jaafar joined #git
20:14 badloop joined #git
20:15 p4trix joined #git
20:15 badloop is it possible to create an eclipse project in a git repo without having the stupid project folder in there?
20:15 jmd left #git
20:15 danimal2 joined #git
20:16 grawity you could always .gitignore the project folder
20:16 badloop but the eclipse project folder is what holds all of the code for the project
20:16 badloop :-/
20:16 grawity wat
20:16 badloop Example: Projects/Scripts/stuff.sh
20:17 grawity hmm maybe you need to create the project a bit higher
20:17 badloop in the git repo you would see Scripts/stuff.sh
20:17 badloop but i just want to see stuff.sh
20:17 _ikke_ create the repo in Scripts?
20:18 badloop _ikke_: i ... but.....  one sec.....
20:18 badloop you may have just blown my mind
20:18 badloop i've been doing things backwards this whole time i think
20:18 _ikke_ lol
20:18 rpd just make a git directory in your eclipse project
20:18 rpd not the other way around
20:19 badloop right
20:19 badloop trying now
20:19 _ikke_ :-)
20:20 rwb joined #git
20:29 moneylotion joined #git
20:29 blr joined #git
20:29 durham_ joined #git
20:30 satbyy_ joined #git
20:30 tvw joined #git
20:31 durham__ joined #git
20:32 stamina joined #git
20:32 badloop hmmm.... kinda sorta worked
20:32 badloop repo locally is fine but i think it will take some doing to get eclipse to like it
20:32 benaiah` left #git
20:32 abyx joined #git
20:38 LionsMane joined #git
20:38 crelix joined #git
20:40 crelix joined #git
20:41 d0nn1e joined #git
20:42 aidalgol joined #git
20:43 fuchstronaut joined #git
20:44 jimi_ joined #git
20:45 Hjld joined #git
20:45 Munt joined #git
20:48 diogenese joined #git
20:49 hahuang61 joined #git
20:50 Samual joined #git
20:51 jeffreylevesque joined #git
20:53 Macaveli joined #git
20:54 chrisshattuck joined #git
20:56 chrisshattuck joined #git
20:57 inflames joined #git
20:57 Endarked_ joined #git
20:57 chrisshattuck joined #git
20:59 Es0teric joined #git
20:59 Rodya_ joined #git
21:00 sdothum joined #git
21:01 neanderslob joined #git
21:02 Silenced joined #git
21:02 Silenced joined #git
21:03 morenoh149 joined #git
21:03 Spec-Chum joined #git
21:12 justanotheruser joined #git
21:15 PaulCapestany joined #git
21:17 LionsMane joined #git
21:17 LionsMane1 joined #git
21:17 cdg joined #git
21:18 d4rklit3 joined #git
21:20 harleyyyyymayes joined #git
21:21 kbs joined #git
21:23 johnmilton joined #git
21:23 johnmilton joined #git
21:24 Rodya_ joined #git
21:24 boombatower joined #git
21:27 VladGh joined #git
21:27 Silenced joined #git
21:28 Shentino joined #git
21:29 shirty joined #git
21:29 mattcen joined #git
21:33 griffindy joined #git
21:34 plasticle joined #git
21:42 durham joined #git
21:42 sfoxorthy left #git
21:42 jimi_ joined #git
21:43 nidr0x joined #git
21:43 fuchstronaut joined #git
21:45 fus joined #git
21:45 sangy joined #git
21:47 atomicb0mb joined #git
21:48 romerocesar joined #git
21:49 raijin joined #git
21:52 _ADN_ joined #git
21:57 KnownSyntax joined #git
22:04 HoierM joined #git
22:05 p3m joined #git
22:05 blackwind_123 joined #git
22:07 neanderslob joined #git
22:09 alansaul joined #git
22:11 t0by joined #git
22:13 boombatower joined #git
22:13 spudowiar joined #git
22:15 Gsham joined #git
22:22 Dougie187 left #git
22:26 madewokherd joined #git
22:37 MattMaker joined #git
22:44 unreal joined #git
22:44 fuchstronaut joined #git
22:49 jaequery joined #git
22:51 hahuang61 joined #git
22:57 harleyyyyymayes joined #git
22:58 bulletmark joined #git
23:01 abyx joined #git
23:02 Darcidride joined #git
23:03 vassagus joined #git
23:05 SpecChum joined #git
23:09 Oebele joined #git
23:12 a3Dman joined #git
23:14 johntramp joined #git
23:14 tvw joined #git
23:15 abyx joined #git
23:15 ljc joined #git
23:17 Kaisyu joined #git
23:17 sleepee joined #git
23:21 jorj joined #git
23:23 jaequery joined #git
23:24 Freze joined #git
23:24 kbs joined #git
23:27 Freze__ joined #git
23:28 HanClinto joined #git
23:28 jaequery joined #git
23:29 kab joined #git
23:30 nitric_ joined #git
23:30 jaequery joined #git
23:36 user083 joined #git
23:39 moei joined #git
23:42 dsdeiz joined #git
23:48 ToBeCloud joined #git
23:48 ASOLAr joined #git
23:49 kpease joined #git
23:51 hahuang61 joined #git
23:52 Freze joined #git
23:52 Freze joined #git

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