IRCloggy #git 2013-12-26

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2013-12-26

← DrShoggoth left00:00
→ thalisson_ joined00:00
← kriks left00:00
→ el3ctron_ joined00:00
← Kayra left00:01
← pen left00:01
→ mitz joined00:03
← w0ng left00:04
← pheaver left00:05
→ Kayra joined00:05
← coolcusty|2 left00:06
→ hellopat joined00:08
→ recycle joined00:08
→ danishkhan joined00:08
← mdiers left00:09
← Kayra left00:09
→ treaki__ joined00:10
→ w0ng joined00:11
← Noldorin left00:11
← carlsednaoui left00:12
← hellopat left00:12
→ Noldorin joined00:13
← treaki_ left00:13
← Mars`_ left00:14
→ DrShoggoth joined00:14
→ danishkh_ joined00:16
→ PeterBooker joined00:17
→ JanC_ joined00:17
← danishkhan left00:17
→ joaoh82 joined00:19
← dragon3_ left00:19
← JanC left00:20
← danishkh_ left00:20
→ mizu_no_oto joined00:21
← kaiza left00:21
dekiss2 oh thanks all now I saw00:21
← PeterBooker left00:22
→ Kayra joined00:23
→ ehmatthes joined00:24
← joaoh82 left00:24
→ MattMaker joined00:25
← DrShoggoth left00:26
→ akiva joined00:27
← ngladitz left00:28
← pastime left00:29
→ Nizumzen joined00:29
→ dyng joined00:29
← VictorCL left00:29
→ Tommy[D] joined00:33
← thalisson_ left00:33
← dyng left00:36
← mizu_no_oto left00:36
→ dyng joined00:37
← hwrd|work left00:37
→ DrShoggoth joined00:37
→ dyng_ joined00:37
← dyng left00:37
← oriba left00:39
→ oriba_ joined00:39
← dyng_ left00:40
→ dyng joined00:40
→ mizu_no_oto joined00:41
← m8 left00:43
→ cesc joined00:44
← dyng left00:45
→ dyng joined00:45
→ tmcmahon joined00:48
→ lamont joined00:49
→ dragon3_ joined00:49
← mizu_no_oto left00:50
← cesc left00:51
← mitz left00:51
→ mitz joined00:51
← mitz left00:52
→ mizu_no_oto joined00:52
← oriba_ left00:54
→ mitz joined00:57
→ cesc joined00:58
← n8chur left00:58
← yshh left00:58
← Stalkr_ left00:58
← valgrind left00:58
← jizanthapus left00:59
→ n8chur joined01:01
← tmcmahon left01:01
→ Mars` joined01:02
← mitz left01:04
→ mitz joined01:04
→ nilg joined01:04
→ greggroth joined01:05
→ Mars`_ joined01:07
← Mars`_ left01:09
← greggroth left01:09
← Mars` left01:11
← mizu_no_oto left01:16
→ pastime joined01:16
→ yshh joined01:18
→ carbon2 joined01:18
← carbon2 left01:18
→ ewnd9 joined01:19
→ joaoh82 joined01:20
→ BSaboia joined01:21
← Noldorin left01:25
← joaoh82 left01:25
→ mizu_no_oto joined01:25
→ dreiss joined01:25
→ schemanic joined01:25
← devoldmx left01:26
→ kukks joined01:27
→ dyng_ joined01:28
← pengunix left01:28
← dyng left01:31
→ dyng joined01:32
← dyng_ left01:32
→ dyng_ joined01:33
→ wrouesnel joined01:34
← rafaqueque left01:35
→ dyng__ joined01:36
→ hwrd|work joined01:36
← dyng left01:36
← RoryHughes left01:37
→ devoldmx joined01:37
→ rafaqueque joined01:37
← maestrojed left01:37
← dyng_ left01:39
← arand left01:41
→ marhaban joined01:41
→ rchavik joined01:44
← BSaboia left01:44
→ mribeirodantas joined01:45
← mribeirodantas left01:45
← ewnd9 left01:46
← marhaban left01:47
← Nizumzen left01:48
← vurma left01:49
← threesome left01:50
← cesc left01:52
→ zivester joined01:53
→ kba joined01:54
kba I have pulled the branch https://github.com/laravel/laravel/tree/3.0. Now there is this commit https://github.com/laravel/laravel/commit/e04d3268c70b3450ec1074fb05a8f8adc562dfb4 which wasn't accepted. How would I pull that and apply it to my local version anyway?01:55
→ hellopat joined01:56
kba Or just download the commit and everything alone01:56
I guess https://github.com/laravel/laravel/tree/e04d3268c70b3450ec1074fb05a8f8adc562dfb4 is the tree I want01:57
I thought I could do something like git clone -b e04d3268c7 https://github.com/laravel/laravel.git .02:00
← flippo left02:00
← tobias__ left02:00
kba but then I get fatal: Remote branch e04d3268c7 not found in upstream origin02:00
← hellopat left02:00
→ luc_ joined02:01
← mizu_no_oto left02:01
cbreak kba: you're new to git it seems02:04
kba: first, get the repository for yourself, by git clone02:04
you probably already did that02:04
then check out the branch you want to be on02:05
git branch -a lists branches02:05
git checkout checks them out02:05
what do you mean with commit was not accepted?02:05
dekiss2 what is template compiling?02:05
ups wrong chns sry02:05
← mindriot101 left02:06
→ rjhunter joined02:06
← eletuchy left02:07
→ eletuchy joined02:08
kba cbreak: I'm not really new, I've just never used anything besides adding, removing, pulling, pushing and merging... but that's besides the point02:09
cbreak: I want the branch https://github.com/laravel/laravel/tree/e04d3268c70b3450ec1074fb05a8f8adc562dfb402:09
I can do git clone -b 3.0 https://github.com/laravel/laravel.git to get https://github.com/laravel/laravel/tree/3.002:09
so I just don't understand why I can't do the same with e04d3268c70b3450ec1074fb05a8f8adc562dfb4, i.e.02:10
git clone -b e04d3268c70b3450ec1074fb05a8f8adc562dfb4 https://github.com/laravel/laravel.git to get https://github.com/laravel/laravel/tree/e04d3268c70b3450ec1074fb05a8f8adc562dfb402:10
← dreiss left02:10
→ mizu_no_oto joined02:10
m0viefreak because e04d326 is not a branch02:10
kba what is it then?02:10
m0viefreak a commit02:10
git clone https://github.com/laravel/laravel.git && cd lavarel && git checkout e04d3268c70b3450ec1074fb05a8f8adc562dfb402:11
kba okay, right, that's what I initially assumed, but why does the url scheme look the same for both a branch and a commi?02:11
cbreak kba: that's not a branch02:11
→ Philocraft joined02:11
m0viefreak why sould it look different?02:11
kba okay, but https://github.com/laravel/laravel/tree/3.0 is a branch, right, so why isn't https://github.com/laravel/laravel/tree/e04d3268c70b3450ec1074fb05a8f8adc562dfb4 ?02:11
cbreak kba: just git clone the repository02:11
m0viefreak also: it actually does: note the ".git" part02:11
kba or is that just an ambigiuous url scheme?02:11
cbreak kba: do you have the repository cloned?02:12
→ Noldorin joined02:12
cbreak just git clone url02:12
no -b or other bulshit02:12
kba cbreak: I actually solved the problem using the "download ZIP" now, I'm really just asking to understand it now02:12
I'll just try in another folder02:12
I guess02:12
cbreak download zip? That's worthless.02:12
m0viefreak kba: that is just a github URL. what it does has nothing to do with git02:12
← eletuchy left02:12
cbreak it won't give you any history to merge02:13
kba: once you have the repository, cd into it, then type git branch -a02:13
kba: what do you see?02:13
kba cbreak: I didn't really need that, I just wanted the version of Laravel 3 with that commit applied, since it isn't accepted into the Laravel 3 branch02:13
← looper left02:13
← pastime left02:13
m0viefreak well, it must be somewhere02:14
kba I did git clone -b 3.0 https://github.com/laravel/laravel.git .02:14
→ looper joined02:14
cbreak kba: ...02:15
kba: no -b02:15
just git clone the damn thing02:15
kba but I need it from the 3.0 branch02:15
I need the patch applied to the 3.0 branch, not the master branch02:15
cbreak kba: I do NOT CARE02:15
kba okay02:15
m0viefreak also: using a 6 month old version of something just because you like a commit from that time sounds like a bad idea02:15
use the newest version and cherry-pick that particular commit, if you must02:16
kba m0viefreak: it turns out using Laravel to begin with was a bad idea, so this is just a temporary hotfix anyway02:16
the newest version is Laravel 4, I spent 6 hours trying to upgrade from 3 to 4 already, but to no avail. It's horrible02:16
Anyway, I digress02:17
cbreak: I cloned the normal one now, I get the same lines as before02:17
when I do git branch -a02:17
cbreak kba: yes...02:17
you should see a master branch02:17
and then a bunch of remote tracking branches, origin/...02:17
kba yup02:17
cbreak you can check out any of those locally, without pulling anything02:18
just with git checkout02:18
for example, if you want to go back to the ancient 3.0 branch, git checkout 3.0 will do02:18
kba what will that actually mean when I do "checkout"?02:18
← Kayra left02:19
kba that I tell my local git I'm working on that branch? but how can I do that without the source for it?02:19
cbreak it means "check that branch out into the working dir"02:19
← hahuang65 left02:19
cbreak kba: you have the sources for it02:19
→ Mars` joined02:19
cbreak you have the sources for every commit in history02:19
kba so what did you mean by "without pylling anything"?02:19
oh02:19
cbreak kba: I mean you do NOT have to pull02:19
pull is a fetch and a merge02:19
you don't need to fetch because you have all the data02:20
→ hellopat joined02:20
cbreak and you don't need to merge... because that'd be dumb.02:20
now, the commit you want.02:20
is it on an other branch?02:20
or is it tagged?02:20
kba I... I have no idea02:20
m0viefreak $ git branch --contains e04d3268c70b3450ec1074fb05a8f8adc562dfb402:20
error: no such commit e04d3268c70b3450ec1074fb05a8f8adc562dfb402:20
kba I know this is the commit I want https://github.com/laravel/laravel/commit/e04d3268c70b3450ec1074fb05a8f8adc562dfb402:20
→ lithiumjake joined02:20
m0viefreak it doesnt seem to be there at all02:20
kba No, it was never accepted02:21
cbreak kba: if it's not there, then you can't use it. type git ls-remote origin and pastebin it please02:21
kba https://github.com/laravel/laravel/commit/e04d3268c70b3450ec1074fb05a8f8adc562dfb402:21
There02:21
m0viefreak ..02:21
kba I'm sorry, I don't get the question, then.02:21
cbreak kba: if it's not there, then you can't use it. type git ls-remote origin and pastebin it please02:22
→ abelsiqueira joined02:22
→ obert_ joined02:22
→ dragon3__ joined02:23
kba of course I can use it, I can see the source code on https://github.com/laravel/laravel/commit/e04d3268c70b3450ec1074fb05a8f8adc562dfb4 so I could just make the changes manually02:23
I really just want git to do it for me02:23
→ sirkha joined02:23
kba http://paste.debian.net/72574/ there it is02:23
← Zarthus left02:24
→ damccull_ joined02:24
cbreak kba: You don't even know where it is02:24
→ yomi joined02:25
← hellopat left02:25
yomi → Guest5871602:25
cbreak but thanks to git, we know02:25
kba I assumed when I see it on https://github.com/laravel/laravel/commit/e04d3268c70b3450ec1074fb05a8f8adc562dfb4 that it's in the laravel repo02:25
cbreak it's refs/pull/2157/head02:25
bremner I guess pull requests are (in) seperate repos on github?02:25
→ geomyidae__ joined02:25
cbreak kba: now, think a bit02:25
it's the pull request 215702:25
→ lithiumjake_ joined02:25
bremner oic.02:25
→ sgambino_ joined02:25
→ hellektor joined02:25
→ r0bby_ joined02:25
cbreak kba: you can do git fetch origin refs/pull/2157/head02:25
kba ah, right, so I could just have done a git ls-remote origin |grep e04d3268c70b3450ec1074fb05a8f8adc562dfb402:25
cbreak then git cherry-pick FETCH_HEAD02:25
← Mars` left02:26
→ bede_ joined02:26
→ w00y joined02:26
→ saorge joined02:26
cbreak kba: yes... or think about the pull request ID first02:26
→ hypera1r joined02:26
← hypera1r left02:26
→ hypera1r joined02:26
← hyperair left02:26
→ ska-fan_ joined02:26
cbreak kba: https://github.com/laravel/laravel/pull/2157, this is the important part02:26
→ maxb_ joined02:26
kba cbreak: yes, that's where I found the link02:26
→ jds_ joined02:26
cbreak kba: as you can see, that pull request contains two commit02:27
→ igalic_ joined02:27
→ d1b_ joined02:27
cbreak kba: the link you gave us before is fairly worthless02:27
THIS one would have been useful02:27
→ mehwork_ joined02:27
→ biomind_ joined02:27
→ nicedice_ joined02:27
cbreak anyway, since it is two commits, you might want to use merge and not cherry-pick02:27
→ luxgeek1 joined02:27
← mizu_no_oto left02:27
→ unreal_ joined02:27
kba I only want one of them.02:27
It's two different solutions to the same problem02:28
I only want the last one02:28
the one I linke02:28
→ d8bhatta joined02:28
→ lov_ joined02:28
← nilg left02:28
→ dfarler_ joined02:28
→ Soliton_ joined02:28
cbreak then cherry pick02:28
Soliton_ → Soliton02:28
m0viefreak the last one needs the one before that to work, tho02:28
← lithiumjake_ left02:29
kba ah, right, yes02:29
silly way they did that02:29
→ lithiumjake_ joined02:29
m0viefreak the whole thing looks silly02:29
→ Naoe-Kanno joined02:29
m0viefreak ;o02:29
← rjhunter left02:29
kba well, it is02:29
but I just want my stuff to work right now ;)02:29
Soliton:and havint my site down until I find time to rewrite everything to laravel 4 isn't feasible -- mostly because it's not going to happen, never touching that framework again ;-)02:30
wow, what happened with the typos there02:30
→ Derander_ joined02:30
→ edwardly_ joined02:30
kba but anyway, thanks for the help02:30
← Ragnor left02:31
→ nilg joined02:31
→ sonOfRa_ joined02:31
→ Bucciarati_ joined02:31
→ milian_ joined02:32
→ kenperkins_ joined02:32
→ sohail_ joined02:32
← lithiumjake left02:32
→ pilif_ joined02:32
→ schlumpi_ joined02:32
← Eduard_Munteanu left02:32
→ kaendfinger[BNC] joined02:32
→ russ__ joined02:32
→ reaverb joined02:33
→ jave_ joined02:33
← Vivekananda left02:33
→ mattcen_ joined02:33
→ nanashiReii joined02:33
← bewest left02:33
← kukks left02:33
← dragon3_ left02:33
← JanC_ left02:33
← luxgeek left02:33
← starkhalo left02:33
← SHyx0rmZ left02:33
← aleng left02:33
← nicedice left02:33
← obert left02:33
← DoniRS left02:33
← robbyoconnor left02:33
← saorge_ left02:33
← Guest33042 left02:33
← kaendfinger left02:33
← unreal left02:33
← bede left02:33
← Bucciarati left02:33
← cian1500ww left02:33
← majoh left02:33
← Orginator left02:33
← mehwork left02:33
← Derander left02:33
← edwardly left02:33
← sgambino left02:33
← nfroidure left02:33
← mattcen left02:33
← d1b left02:33
← damccull left02:33
← nanashiRei left02:33
← r00tWearsRedHats left02:33
← ValicekB left02:33
← adaptr left02:33
← igalic left02:33
← dfarler left02:33
← russ_ left02:33
← wooy left02:33
← lov left02:33
← milian left02:33
← schlumpi left02:33
dfarler_ → dfarler02:33
pilif_ → pilif02:33
nanashiReii → nanashiRei02:34
sgambino_ → sgambino02:34
← nanashiRei left02:34
→ nanashiRei joined02:34
lithiumjake_ Hello. I'm a new git user. Should I use "git pull" when I want to update my pre-existing local project to the changes made on the repo?02:34
→ Orginator_ joined02:34
milian_ → milian02:34
mattcen_ → mattcen02:34
→ ValicekB_ joined02:34
← sohail left02:34
→ aep joined02:34
→ Vivekananda joined02:34
← sohail_ left02:34
→ Rix joined02:34
← geomyidae__ left02:34
jds_ → jds02:34
→ alexwhitman joined02:34
→ ToothlessGear_ joined02:35
→ geomyidae joined02:35
← kba left02:35
→ bewest joined02:35
→ pepper_chico joined02:36
→ Ragnor joined02:36
← lithiumjake_ left02:36
→ gregorg joined02:37
← gregorg left02:37
→ gregorg joined02:37
← h0rrorvacui left02:38
→ raniere joined02:38
→ odigity joined02:38
→ r00tWearsRedHats joined02:38
→ kukks joined02:38
→ eletuchy joined02:38
→ Entomo joined02:38
→ cian1500ww joined02:38
→ felher joined02:38
→ nfroidure joined02:38
→ Spyro joined02:38
← Spyro left02:38
→ Spyro joined02:38
→ majoh joined02:39
→ DoniRS joined02:39
→ JanC_ joined02:40
← bewest left02:40
← redrocket left02:40
ValicekB_ → ValicekB02:40
→ Fissure joined02:40
← nilg left02:41
→ mizu_no_oto joined02:41
→ michael_lee joined02:41
→ relipse joined02:42
← thiago left02:42
→ dytrivedi joined02:42
→ adaptr joined02:43
← michael_lee left02:43
← mizu_no_oto left02:44
→ weiyang joined02:45
← CheckDavid left02:45
← pepper_chico left02:46
← weiyang left02:46
→ michael_lee joined02:46
← abelsiqueira left02:47
→ mizu_no_oto joined02:50
← MattMaker left02:50
← devoldmx left02:51
← mizu_no_oto left02:52
← psyl0n left02:54
→ DolphinDream joined02:55
← rchavik left02:55
→ z8z joined02:57
← z8z left02:59
→ hellopat joined03:05
← savr left03:06
→ jaseemabid joined03:06
solrize can i have separate origins for pull and push?03:07
→ psyl0n joined03:07
cbreak solrize: man git-config03:07
gitinfo solrize: the git-config manpage is available at http://jk.gs/git-config.html03:07
solrize thanks03:08
looking03:08
Vivekananda hello everyone . hi cbreak03:08
→ weiyang joined03:08
cbreak solrize: look for remote.<name>push and so on03:08
← weiyang left03:08
cbreak there's .url and .pushurl too03:08
Vivekananda so I left in the middle but was discussing how to manage storing config files in back up of www/ files of a server.03:08
cbreak not a git problem.03:09
← recycle left03:09
← FerreusR left03:09
Vivekananda what would be a simple and good way of doing it. The paths are different in the config files on the server and on my dev environment. If I include the config as part of git repo then will have to change it everytime . If I dont and servers are changed then that file is lost coz it wont be there on a new repo clone03:10
cbreak Vivekananda: a proper backup program.03:10
→ weiyang joined03:10
cbreak git is not for backing up stuff.03:11
you should not store config files in git.03:11
at most, store a template.03:11
(with a different name, if your program is too dumb to be able to handle templates itself)03:11
← refried_ left03:12
Vivekananda okay but if I am developing and collaborating esp server side code then still should I use a backup program ?03:14
← kim_plausible left03:18
→ pastime joined03:24
← digiv left03:27
→ BSaboia joined03:27
← dougsland_ left03:32
← dyng__ left03:33
→ dyng joined03:34
← psyl0n left03:36
← dyng left03:38
→ maqr joined03:38
→ fire joined03:38
← levity_island left03:40
→ rjhunter joined03:40
← BSaboia left03:41
← rjhunter left03:45
→ thinkdevcode joined03:46
← DrShoggoth left03:46
→ zacts joined03:46
← kukks left03:46
← bwreilly left03:47
→ hahuang65 joined03:47
→ DrShoggoth joined03:48
← thinkdevcode left03:49
→ psyl0n joined03:50
← pastime left03:50
← jstein1 left03:54
← DrShoggoth left03:54
→ kukks joined03:56
→ DrShoggoth joined03:57
→ abelsiqueira joined03:57
→ Mars` joined04:01
← hahuang65 left04:02
→ pastime joined04:03
solrize git-daemon is no longer in git-core on debian? i guess the docs are wrong04:05
← DrShoggoth left04:05
solrize is git-daemon still the easiest way to serve a repo publicly?04:06
SamB solrize: it's in the "git" package04:07
→ hahuang65 joined04:08
← r0bby_ left04:08
solrize hmm i have that installed, and there's no git-daemon04:08
→ r0bby_ joined04:08
SamB git: /usr/lib/git-core/git-daemon04:09
solrize oh i see, i have to add that to $PATH04:09
thanks04:09
SamB er, I don't think that's what you want to do04:09
try "git daemon"04:09
solrize oh ok thanks04:10
→ rchavik joined04:11
→ hellopat_ joined04:12
← conan left04:12
SamB that package only installs four commands starting with "git-" into $PATH04:12
solrize i got it working, i had to put the git-daemon-export-ok into the .git subdir instead of into the main dir, but no biggie04:13
thanks04:13
→ vipzrx1 joined04:13
← hellopat left04:15
→ conan_ joined04:15
← hahuang65 left04:15
← kukks left04:15
→ kiraank joined04:16
← vipzrx1 left04:16
→ DrShoggoth joined04:19
→ sguselnikov joined04:22
← reaverb left04:22
← sguselnikov left04:23
← yacks left04:24
← jcvfen left04:27
← Mars` left04:29
→ Mars` joined04:29
→ vipzrx1 joined04:32
→ arietis joined04:33
→ bwreilly joined04:33
→ Devastator joined04:34
← hwrd|work left04:35
← Mars` left04:35
← DrShoggoth left04:36
← Noldorin left04:36
→ hwrd|work joined04:36
← Devastator left04:40
→ Devastator joined04:40
→ CodeShar_ joined04:42
→ dyng joined04:43
← john2x left04:47
→ preflex_ joined04:51
→ DrShoggoth joined04:51
← preflex left04:52
preflex_ → preflex04:52
← PaulCapestany left04:53
→ NaStY joined04:54
→ Mars` joined04:54
hellektor → starkhalo04:55
← DrShoggoth left04:56
→ DrShoggoth joined04:56
→ oldSaab joined04:57
NaStY → NaStYdoG04:57
→ causasui joined05:01
← abelsiqueira left05:03
← Goplat left05:06
solrize how do i push a new branch to a remote repo? it doesn't seem to push stuff in the new branch unless the branch is already there in the remote side. i tried git remote set-branches --add to add the new branch but it didn't help05:06
← rafaqueque left05:09
← oldSaab left05:10
← Gamecubic left05:10
→ Acidnerd1 joined05:11
← warthog9 left05:12
← arietis left05:14
→ sealion joined05:15
→ john2x joined05:16
solrize git push -u didn't help either05:16
→ savr joined05:18
→ arietis joined05:18
solrize HEAD is now at ccb1852... panic on invalid algor selection, and add comments05:18
oh that's not a git error05:19
oh i think it did push the new branch, i just had to say gitk --all to see the new branch without first checking it out05:23
→ saurabh joined05:24
saurabh → Guest9902905:24
SamB solrize: or "git log origin/[mumble]"05:24
→ Goplat joined05:25
solrize hmm ok05:25
← CodeShar_ left05:28
← psyl0n left05:28
→ CodeShark joined05:28
→ diegoviola joined05:31
← Naoe-Kanno left05:31
← edwardly_ left05:31
→ edwardly joined05:32
→ h0bbit_ joined05:32
← kcj left05:32
→ smw joined05:32
solrize "git help" seems to ignore the GIT_PAGER variable and the --no-pager cmd line option05:33
oh it uses PAGER too05:33
smw hi all, I am writing a pre-commit script, how can I find the root of the git repo being committed?05:33
← mattcen left05:35
→ tchan joined05:35
SamB smw: I suggest reporting a bug about the conditions under which hooks are called being insufficiently documented in man githooks05:37
gitinfo smw: the githooks manpage is available at http://jk.gs/githooks.html05:37
SamB er, that is, the environment, working dir, etc.05:37
smw: I think your script is PROBABLY called with $PWD as the repo root, though05:38
smw SamB, I will read the git man page. I only read http://git-scm.com/book/ca/Customizing-Git-Git-Hooks and the sample05:38
SamB, ah, it really isn't documented in the man page either :-\05:39
thanks05:39
→ mattcen joined05:39
SamB why do you think I suggested reporting a bug rather than just reading it05:39
smw SamB, truthfully, this is IRC. I assumed it was a rtfm response ;-)05:40
SamB, I mean no disrespect of course :-)05:40
SamB, you are right, it is PWD05:41
SamB yes, of course, "rtfm" can be quite helpful, if accompanied by a clue as to the manual (and perhaps section) in question :-)05:41
→ tjbiddle joined05:41
smw SamB, yes, I assumed you were pointing me there. And gitinfo was kind enough to link me when you said it :-)05:42
SamB smw: the reason for my suspicion is that I know that virtually every git command changes to that directory eary on05:42
this is not a reasonable thing to expect mere users to know05:42
→ MisterGiga joined05:46
MisterGiga salom05:46
→ maleknet joined05:47
→ phao joined05:48
← MisterGiga left05:50
solrize if i have origin=(central github repo of this program) then when i say "git fetch git://myrepo.com/myrepo" it doesn't seem to get my new branch, even though i uploaded it and can clone from it05:51
git fetch --all doesn't allow specifying a repo05:51
→ dekiss joined05:52
← dekiss2 left05:52
← h0bbit_ left05:53
← preflex left05:54
→ asido joined05:54
→ preflex joined05:56
→ refried_ joined05:56
← daivyk left05:57
← Tommy[D] left05:57
← phao left05:58
solrize oh it looks like i have to use git remote add on the client side. bummer.05:59
→ dhilipsiva joined06:01
→ quazimodo joined06:02
← nicedice_ left06:02
← matanya left06:06
← Goplat left06:08
← Philocraft left06:08
→ Tommy[D] joined06:09
→ dguitarbite joined06:10
→ dguitarbite_ joined06:11
← arietis left06:12
← the_cybersphinx left06:16
← hellopat_ left06:21
→ kcj joined06:30
← tjbiddle left06:34
← Watabou left06:34
→ ezekielnoob joined06:35
← luxgeek1 left06:37
→ devoldmx joined06:38
← devoldmx left06:38
→ Watabou joined06:40
← pastime left06:41
→ longbeach joined06:41
→ arietis joined06:42
→ maestrojed joined06:43
→ ningu joined06:43
ningu I've noticed that when I commit to a local repo and try to push to origin master it fails if the local repo is behind the remote. makes sense. so then typically I do 'git pull' and that produces a merge commit, then I can push.06:44
however on github and such I rarely see such merge commits. so how do people avoid them?06:45
always pull before committing?06:45
← jaseemabid left06:45
← starkhalo left06:45
pekster ningu: That, or rebase your local changes onto the upstream tip first06:47
ningu I've never learned rebase... maybe now is the time :P06:47
is it enough to just do 'git rebase'?06:48
pekster Personally, I like working on a 'local' branch for those kinds of projects, then when I'm ready to push I'll first do a pull (or usually a fetch + `git merge --ff-only` as it avoids ugly conflicts if I'm not ready for them) and then I'll merge my own changes in06:48
← yshh left06:49
ningu does rebase do a fetch on the upstream first?06:50
pekster rebase does nothing upstream, no06:50
→ redrocket joined06:50
SamB ningu: maybe you want "git pull --rebase" for your case ...06:50
pekster It just "re-arranges" your commits locally06:50
→ [1]asido joined06:51
ningu SamB: ah, good idea06:51
otherwise I could do git fetch && git rebase06:51
&& git merge... something like that06:51
pekster The easiest way to use reabse to put your changes "on top" of upstream's (if that's what you want, and you've already done a pull from upstream) is to find the parent commit before your histories diverged and do `git rebase -i abcdef` on that commitish06:52
But of course, it's best to come up with a workflow that makes that unnecessary ;)06:52
And yea, pull --rebase might help if you really want to use that workflow anyway06:52
pekster tries to avoid that and forgets about that feature06:53
ningu well, these are small changes to a repo where I am the main committer and commit from several locations06:53
so it's just a question of ordering the commits to not produce the extra 'merge' commit06:53
← asido left06:53
pekster Take a look at the --ff-only option to the merge command -- it explicitly won't do a merge when you can't fast-forward it06:53
ningu yeah, that also sounds really useful.06:54
pekster I use that option frequently as a hint to me that I need to rebase my local (never rebase history you've pushed as that's re-writing it) and then I play around locally until I have what I want06:54
SamB yeah, that's how I usually pull lately, since unfortunately I can't set that in my .git/config and then override it on the command line ...06:54
→ jaseemabid joined07:00
← bwreilly left07:00
→ bwreilly joined07:01
← ItSANgo__ left07:05
→ kerrick joined07:09
← featheredtoast left07:11
→ MattMaker joined07:11
→ ItSANgo_ joined07:12
← quazimodo left07:13
← diegoviola left07:15
← ezekielnoob left07:15
→ Guest579 joined07:16
← Guest579 left07:17
→ Guest579 joined07:17
Guest579 → diegoviola07:17
→ johnkevinmbasco joined07:18
→ marthinal joined07:20
← sealion left07:22
→ featheredtoast joined07:23
← weiyang left07:25
← dhilipsiva left07:26
→ dhilipsiva joined07:27
→ alezost joined07:28
← featheredtoast left07:29
← MattMaker left07:30
→ featheredtoast joined07:30
→ a-l-e joined07:33
→ thrakcattack joined07:34
← ningu left07:36
← bwreilly left07:39
← jaseemabid left07:41
→ lng joined07:41
← dyng left07:44
→ dyng joined07:44
← maestrojed left07:45
← mitz left07:46
→ hahuang65 joined07:46
← dyng left07:47
→ dyng joined07:48
→ rouf joined07:48
← hahuang65 left07:50
→ bvi joined07:51
→ mitz joined07:51
→ hellopat joined07:52
← edwardly left07:53
→ edwardly joined07:53
→ jleclanche joined07:54
← jleclanche left07:54
← edwardly left07:55
→ shauna joined07:55
→ edwardly joined07:55
← edwardly left07:56
← Mars` left07:56
← hellopat left07:57
← tango_ left07:57
→ edwardly joined07:58
→ tango_ joined07:58
← tango_ left07:59
→ tango_ joined07:59
→ Mars` joined08:00
→ m0ltar joined08:03
← dekiss left08:05
← Kabaka left08:06
→ m-o-s_ joined08:06
← m-o-s_ left08:06
→ dekiss joined08:07
→ z8z joined08:07
← refried_ left08:07
← m0ltar left08:07
← z8z left08:08
→ Kicer86 joined08:08
→ z8z joined08:08
→ m0ltar joined08:09
→ jizanthapus joined08:10
← z8z left08:10
→ z8z joined08:10
← Norm__ left08:12
→ jaseemabid joined08:12
→ refried_ joined08:13
← refried_ left08:13
← Mars` left08:14
← dhilipsiva left08:16
← dyng left08:17
→ Zarthus joined08:17
← jizanthapus left08:21
→ jizanthapus joined08:21
→ gua_ould joined08:23
← kermit left08:30
← Devastator left08:34
← hal left08:36
← d8bhatta left08:36
→ Mars` joined08:38
← bvi left08:39
→ pastime joined08:41
← KK4MGV left08:43
← Mars` left08:43
→ KK4MGV joined08:44
← pastime left08:46
→ asido joined08:48
→ Timmy joined08:48
← michael_lee left08:49
← [1]asido left08:49
→ matanya joined08:50
→ Mars` joined08:50
← m0ltar left08:51
→ arvind_khadri joined08:51
→ ezekielnoob joined08:51
→ m0ltar joined08:53
→ ambodi joined08:53
→ dguit957 joined08:55
→ dyng joined08:55
← jimmyeatworld left08:58
← johnkevinmbasco left08:59
→ nilg joined09:00
← Mars` left09:01
← solrize left09:01
→ ngladitz joined09:02
→ michael_lee joined09:03
← smw left09:04
→ mishok13 joined09:04
← dragon3__ left09:04
→ h0bbit_ joined09:05
→ jimmyeatworld joined09:06
← nilg left09:07
← wrouesnel left09:08
→ weiyang joined09:10
→ eijk joined09:11
← Timmy left09:11
← eijk left09:13
← ambodi left09:13
→ maroloccio joined09:14
→ ambodi joined09:15
← weiyang left09:18
→ Mars` joined09:18
→ RoryHughes joined09:19
← eletuchy left09:20
→ eletuchy joined09:20
jenny-cy join # jenkins09:20
← dekiss left09:21
← el3ctron_ left09:22
→ robarelli joined09:22
→ jleclanche joined09:23
← jleclanche left09:23
→ jleclanche joined09:23
← rchavik left09:24
← Mars` left09:25
← jleclanche left09:28
← z8z left09:28
→ jleclanche joined09:28
→ z8z joined09:29
→ Norm_ joined09:30
← z8z left09:30
→ m8 joined09:30
→ d8bhatta joined09:32
→ liuzhoou joined09:32
→ Asenar joined09:33
→ ZujkisNx joined09:34
← Norm_ left09:35
← scorphus left09:36
→ balestrino joined09:36
→ scorphus joined09:36
← _Qman left09:37
← scorphus left09:37
→ scorphus joined09:37
→ dodobrain joined09:37
→ khmarbaise joined09:38
→ weiyang joined09:39
→ arand joined09:41
→ hellopat joined09:41
← robarelli left09:43
← maleknet left09:43
→ Silmarilion joined09:44
→ rendar joined09:45
← hellopat left09:46
← arand left09:46
→ hs366 joined09:46
→ threesome joined09:47
→ arand joined09:47
→ rethus joined09:48
→ gelardi_ joined09:48
→ vurma joined09:50
← dguitarbite left09:52
← dguit957 left09:52
← dguitarbite_ left09:52
← kiraank left09:52
→ marhaban joined09:58
→ Anony987 joined09:58
← farmanimal left10:00
→ farmanimal joined10:01
← RoryHughes left10:02
→ bodom joined10:03
← khmarbaise left10:04
← rethus left10:04
← glen left10:04
→ maleknet joined10:04
→ RoryHughes joined10:05
→ mindriot101 joined10:06
← weiyang left10:06
← hwrd|work left10:07
← arand left10:07
→ Thra11 joined10:08
→ arand joined10:08
← balestrino left10:12
→ shruggar joined10:12
charon SamB: btw !hooks is also frequently useful10:12
gitinfo SamB: [!hook_pitfalls] Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).10:12
← dyng left10:12
→ dyng joined10:13
→ dguitarbite joined10:14
← dyng left10:17
→ grilix joined10:20
→ hwrd|work joined10:20
← a-l-e left10:20
sonOfRa_ → sonOfRa10:21
← asido left10:21
← dguitarbite left10:22
← w00y left10:24
→ asido joined10:24
→ thevishy joined10:26
→ Brando753 joined10:26
← thevishy left10:26
→ dguitarbite joined10:26
→ thevishy joined10:27
→ felipe joined10:27
→ wooy joined10:29
← Brando753 left10:30
→ Brando753 joined10:30
→ sq-one joined10:31
← marhaban left10:31
→ harobed_ joined10:33
← dguitarbite left10:34
← ambodi left10:34
→ Mars` joined10:35
→ ambodi joined10:35
← Brando753 left10:36
← vurma left10:37
← luc_ left10:38
→ luxgeek joined10:39
← Mars` left10:40
→ Brando753 joined10:41
← RoryHughes left10:41
→ vurma joined10:41
→ pastime joined10:42
← sq-one left10:43
← luxgeek left10:43
→ rethus joined10:47
← pastime left10:47
← grilix left10:47
← ambodi left10:48
→ grilix joined10:48
→ ambodi joined10:48
← deanrock left10:50
→ RoryHughes joined10:50
→ grilix_ joined10:50
→ abelsiqueira joined10:51
→ Guest49989 joined10:52
← grilix left10:52
← ambodi left10:53
← maroloccio left10:53
→ carbon2 joined10:54
← dodobrain left10:55
← grilix_ left10:55
→ cesc joined10:55
→ BSaboia joined10:58
→ giusef joined10:58
← jaseemabid left10:58
← arietis left10:59
← carbon2 left11:00
← RoryHughes left11:01
→ marhaban joined11:02
← vurma left11:03
→ arietis joined11:03
→ vurma joined11:04
← hwrd|work left11:04
→ hafeez3000 joined11:05
→ jackneill joined11:06
← jackneill left11:06
→ jackneill joined11:06
← hypera1r left11:07
← hafeez3000 left11:07
← HicksD_ left11:07
→ hwrd|work joined11:07
→ RoryHughes joined11:11
→ HicksD joined11:11
→ bitkid joined11:11
→ danicampa901 joined11:19
← RoryHughes left11:21
→ jaseemabid joined11:27
→ psyl0n joined11:29
→ hellopat joined11:29
→ RoryHughes joined11:30
→ aspiers joined11:30
→ the_cybersphinx joined11:31
← hellopat left11:34
← edwardly left11:35
→ edwardly joined11:36
← savr left11:36
← mitz left11:38
→ Guest90190 joined11:38
← jaseemabid left11:39
→ xxtjaxx joined11:39
← xxtjaxx left11:39
→ xxtjaxx joined11:39
→ VictorCL joined11:39
conan_ → conan11:40
← gua_ould left11:40
← diegoviola left11:41
← Guest90190 left11:41
→ Guest90190 joined11:41
Guest90190 → diegoviola11:41
→ daanavitch joined11:42
→ mizu_no_oto joined11:44
← conan left11:45
→ mitz joined11:46
← bodom left11:53
← marhaban left11:53
→ marhaban joined11:53
→ coolcusty|2 joined11:56
→ valgrind joined11:56
← valgrind left11:56
← _Vi left11:57
← sirkha left11:57
→ valgrind joined11:59
→ gua_ould joined11:59
← marhaban left11:59
→ watermel0n joined12:02
← watermel0n left12:02
→ watermel0n joined12:03
← gelardi_ left12:04
← RoryHughes left12:04
→ khmarbaise joined12:05
→ GT4066 joined12:05
→ RoryHughes joined12:09
← RoryHughes left12:09
→ BeerSerc joined12:10
→ RoryHughes joined12:13
← RoryHughes left12:14
→ RoryHughes joined12:15
→ joaoh82 joined12:15
← m0ltar left12:15
← khmarbaise left12:16
→ jimmy_lo joined12:16
← joaoh82 left12:20
→ glebihan joined12:20
→ RoryHugh_ joined12:21
→ ewet joined12:22
← RoryHughes left12:22
← BSaboia left12:23
← lng left12:23
← RoryHugh_ left12:25
→ St_Marx joined12:25
→ Devastator joined12:26
← mizu_no_oto left12:28
→ RoryHughes joined12:28
→ thiago joined12:28
→ ewnd9 joined12:30
← h0bbit_ left12:32
← maleknet left12:32
→ solrize joined12:33
← vipzrx1 left12:33
← DoniRS left12:34
← coolcusty|2 left12:35
→ vipzrx1 joined12:35
← vipzrx1 left12:35
← ezekielnoob left12:37
← kcj left12:38
→ johnkevinmbasco joined12:38
→ ezekielnoob joined12:38
→ gasbakid joined12:40
→ Gavrisimo joined12:41
→ Pullphinger joined12:41
← matanya left12:42
→ pastime joined12:43
← valgrind left12:43
→ koda joined12:43
→ matanya joined12:44
→ FerreusR joined12:45
← mindriot101 left12:45
→ khmarbaise joined12:46
← ezekielnoob left12:47
→ Stalkr_ joined12:48
→ smashwilson joined12:48
← pastime left12:48
← SamB left12:49
→ _Vi joined12:49
→ Kayra joined12:51
→ nicoulaj joined12:52
→ vipzrx1 joined12:53
→ tma996 joined12:53
→ dougsland_ joined12:53
← calcifea left12:53
← vipzrx1 left12:55
← RoryHughes left12:55
→ SamB joined12:56
← jason237 left12:56
← VictorCL left12:56
→ Vortex35 joined12:57
→ calcifea joined12:57
→ vipzrx1 joined12:58
← vipzrx1 left12:58
← Vortex34 left13:00
→ shinnya joined13:02
→ ezekielnoob joined13:03
→ tobias__ joined13:04
→ kcj joined13:04
← ezekielnoob left13:05
← tobias__ left13:05
← Watabou left13:05
→ tobias__ joined13:06
→ marhaban joined13:06
← rouf left13:06
→ freestyl3r joined13:06
→ calcifea_ joined13:06
→ rouf joined13:08
← satiricon left13:08
← calcifea left13:08
→ breakingthings joined13:10
← Vivekananda left13:10
→ mizu_no_oto joined13:10
→ zhost joined13:10
→ hyperair joined13:11
← the_cybersphinx left13:11
← hyperair left13:11
→ hyperair joined13:11
→ calcifea joined13:11
→ the_cybersphinx joined13:12
→ diego1 joined13:14
← calcifea_ left13:14
← diego1 left13:15
→ diego1 joined13:15
← diegoviola left13:15
diego1 → diegoviola13:16
→ joaoh82 joined13:16
→ VictorCL joined13:17
← arietis left13:18
→ jnavila joined13:18
→ hellopat joined13:18
→ lordkefir joined13:19
← rouf left13:19
→ phryk joined13:19
→ earny joined13:19
→ grep0r joined13:19
→ jan1337z joined13:19
→ sebastianmarkow joined13:19
→ joaoh82_ joined13:20
← Stalkr_ left13:20
← aspiers left13:21
← joaoh82 left13:21
→ rouf joined13:21
← marhaban left13:23
← hellopat left13:23
→ vipzrx1 joined13:23
← vipzrx1 left13:23
← Pullphinger left13:23
→ dhilipsiva joined13:24
← harobed_ left13:24
→ chimay joined13:25
← VictorCL left13:25
→ dsdeiz joined13:26
→ ambodi joined13:27
→ dermoth_ joined13:27
← eletuchy left13:28
→ eletuchy joined13:28
→ pengunix joined13:28
→ ciampix joined13:29
→ lacrymology joined13:30
← Kayra left13:30
→ drbean joined13:30
← dermoth__ left13:30
lacrymology I've renamed a remote by changing it's entry in .git/config, but it's still present in .git/refs/remotes/ Is it safe to delete it?13:31
→ kaiza joined13:32
← eletuchy left13:33
→ joar joined13:33
→ aspiers joined13:34
_ikke_ lacrymology: yes, but you can better use git commands instead of poking inside the .git directory yourself13:35
lacrymology _ikke_: how would I make the repo forget the remote?13:35
← \Freeman\ left13:36
_ikke_ git remote prune should do it13:36
→ Freeman42 joined13:37
→ Stalkr_ joined13:37
lacrymology _ikke_: but it doesn't work now that I've removed it from .git/config, does it?13:37
joar I'm looking for python git bindings/libraries compatible with python 3, but I can't find any.13:37
Are there none?13:37
niax joar: the python bindings to libgit2 have python 3 support by the looks13:38
← sgambino left13:39
joar using 2to3 on GitPython has been a nightmare so far.13:40
niax: I will take a look, thank you.13:40
niax Will mean some deps on a compiled library though - although libgit2 is supposed to be fairly portable13:40
← Freeman42 left13:41
joar I get some compile errors when installing the bindings13:42
_ikke_ lacrymology: not sure13:42
→ Freeman42 joined13:42
_ikke_ lacrymology: Aparently, it doesn't indeed13:42
← Guest99029 left13:43
_ikke_ lacrymology: well, if you only changed the url, and not the name, it should still work13:43
← thrakcattack left13:44
→ Kayra joined13:44
niax joar: what kind of errors?13:44
← Freeman42 left13:44
joar niax: https://gist.github.com/joar/9a40046d28c5ce60925213:44
→ Freeman42 joined13:44
← thiago left13:45
→ thrakcattack joined13:45
niax joar: have you got libgit2 installed?13:45
→ stodan joined13:46
joar niax: I installed the libgit2-dev package before I got that output. Before I installed the libgit2-dev package I got an error on #include <git2.h>13:46
niax hmm, that's a bit odd13:46
No idea I'm afraid - don't use the python bindings myself13:47
joar niax: the libgit2-0 package version is 0.19.x and the python package is 0.20.113:48
might be that.13:48
niax Perhaps try the release for your version of libgit2: https://github.com/libgit2/pygit2/releases/tag/v0.19.013:50
→ drbean_ joined13:50
→ facundor joined13:50
← Stalkr_ left13:51
← Gavrisimo left13:51
→ luxgeek joined13:51
← drbean left13:52
drbean_ → drbean13:52
→ RoryHughes joined13:52
→ arietis joined13:53
← johnflux_ left13:54
→ johnflux_ joined13:54
mr_red1 → mr_red13:55
→ Timmy joined13:55
← DrShoggoth left13:55
← liuzhoou left13:56
→ guns joined13:56
→ vipzrx1 joined13:56
← drbean left13:56
← echo-area left13:57
→ marhaban joined13:57
→ dragon3_ joined13:58
→ jimi_ joined13:59
→ drbean joined13:59
→ eletuchy joined13:59
→ DrShoggoth joined13:59
→ Landshark753 joined14:00
← Landshark753 left14:00
→ Gavrisimo joined14:01
← Timmy left14:01
→ Landshark753 joined14:01
→ PaulCapestany joined14:01
→ Timmy joined14:01
← joaoh82_ left14:03
← vipzrx1 left14:03
→ pastime joined14:03
← rethus left14:04
→ SHyx0rmZ joined14:04
→ mbroeker joined14:05
→ BSaboia joined14:05
breakingthings Git keeps telling me that CRLF will be replaced with LF but will keep it's original line endings. 1, I know this, and don't want to see this message anymore; can I suppress it somehow? 2, Can I make it not keep it's original line endings?14:05
← mbroeker left14:06
← DrShoggoth left14:06
← pastime left14:06
← kaiza left14:06
→ kaiza joined14:07
← dsdeiz left14:07
→ Stalkr_ joined14:07
→ dsdeiz joined14:09
← lacrymology left14:09
→ jnavila_ joined14:09
← jnavila left14:09
jnavila_ → jnavila14:09
jimi_ is -1 compression 0 compression?14:10
→ DrShoggoth joined14:10
← nicoulaj left14:11
← pengunix left14:15
→ ezekielnoob joined14:16
→ gasbakid_ joined14:17
→ menace joined14:19
← gasbakid_ left14:19
← gasbakid left14:19
→ jcvfen joined14:20
→ conan joined14:21
← stodan left14:21
→ gasbakid_ joined14:21
← Stalkr_ left14:22
→ stodan joined14:22
→ Stalkr_ joined14:22
← DrShoggoth left14:23
→ dguitarbite joined14:24
menace how can avoid, that, when i fetch/pull from remote origin an update, that my local history is altered?14:25
→ sgambino joined14:26
charon menace: use fetch instead of !pull?14:26
gitinfo menace: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/14:26
→ Noldorin joined14:26
charon fetch does not change local history14:26
← facundor left14:26
charon it changes the "copies" of remote history that reside in remotes/$remote/$branch, but not your local branches14:26
← rurufufuss left14:28
→ sirkha joined14:28
← dguitarbite left14:28
→ dguitarbite joined14:29
menace hrm. and how can i access that stuff, if i only fetch it then?14:29
*headscratch*14:29
→ calcifea_ joined14:29
charon by saying things like 'git log origin/master'14:29
menace ah14:30
but, when i fetch the data again, the local origin/master could be altered again from remote origin/master. Is there any way to avoid that?14:31
moritz when you fetch the data again, your local origin/master is updated from the remote master14:32
jimi_ When I pull from my repo, it shows like 200mb, compresses... then pulls in about 1-3 minutes... my team in India is doing the same, and it pulls in like HOURS....14:32
moritz so it's not changed14:32
← calcifea left14:32
moritz jimi_: maybe their internet connection is slower?14:32
menace but suppose, that remote master changed its history, then my local history copy of the remote master will be overwritten too after fetching14:33
→ DAB2IIW joined14:33
← bandroidx left14:34
jimi_ moritz, ya... is there anything they can do differently that would help, besides changing internet? they frequently get errors about frequent early EOFS14:34
moritz menace: if you don't want your local copy of origin/master to change, don't run git fetch14:35
← Devastator left14:35
moritz jimi_: sounds like a lossy connection; mabe some kind of tunnel would help?14:36
jimi_: which protocol are they using?14:36
jimi_ moritz, https to bitbucket14:36
← Kayra left14:36
← arietis left14:37
moritz jimi_: they could try ssh, maybe that's more reliable14:37
→ WaReZ joined14:37
← arvind_khadri left14:37
→ Kayra joined14:37
→ DrShoggoth joined14:37
→ VRubezhny joined14:38
← dragon3_ left14:38
→ faBimon joined14:38
→ bandroidx joined14:39
menace moritz: but i want the data. i just don't want to have the already existing data overwritten. Is that possible or not?14:39
← ezekielnoob left14:39
← RoryHughes left14:40
→ Kayra_ joined14:40
moritz menace: yes, see man git-fetch, option --force14:40
→ ezekielnoob joined14:40
← Kayra left14:41
moritz it looks like if you call it remote:local, it will only accept fast-forward merges14:41
← m0viefreak left14:41
→ jaseemabid joined14:41
gitinfo menace: the git-fetch manpage is available at http://jk.gs/git-fetch.html14:44
→ RoryHughes joined14:45
→ vipzrx1 joined14:45
← vipzrx1 left14:45
moritz gitinfo has a slow day, it seems :-)14:47
→ maroloccio joined14:48
→ vipzrx1 joined14:49
← vipzrx1 left14:49
← giusef left14:51
← mizu_no_oto left14:52
→ mbroeker joined14:52
← Stalkr_ left14:52
← RoryHughes left14:52
→ Stalkr_ joined14:53
→ noecc joined14:54
→ arietis joined14:55
← schemanic left14:56
→ angasulino joined14:59
← daanavitch left15:00
← PaulCapestany left15:01
← Timmy left15:02
→ dragon3_ joined15:03
→ joaoh82 joined15:03
← kcj left15:04
← bandroidx left15:04
→ bandroidx joined15:04
← ambodi left15:05
→ ambodi joined15:05
→ m0ltar joined15:06
→ hellopat joined15:06
← joaoh82 left15:08
→ acharlieh joined15:09
← hellopat left15:09
← YoungFrog left15:10
→ YoungFrog joined15:10
← ambodi left15:11
→ grilix joined15:11
← dguitarbite left15:11
← dragon3_ left15:11
← mbroeker left15:11
→ masterkorp joined15:11
masterkorp guys can i reword a merge commit ?15:11
oh rebase -p15:12
→ maroloccio2 joined15:12
← masterkorp left15:12
← maroloccio left15:12
← khmarbaise left15:14
← jaseemabid left15:16
← marhaban left15:16
→ RoryHughes joined15:17
← dhilipsiva left15:17
← RoryHughes left15:17
→ mbroeker joined15:17
→ mizu_no_oto joined15:19
→ RoryHughes joined15:19
→ Norm_ joined15:19
← RoryHughes left15:19
→ RoryHughes joined15:20
→ k4rtik_ joined15:20
_ikke_ Note the caveats with rebase -p and -i15:21
← RoryHughes left15:21
_ikke_ oh, he's gone again15:21
→ RoryHughes joined15:22
← nerdfiles left15:22
← arietis left15:25
→ wwalker joined15:28
← DolphinDream left15:28
← mbroeker left15:29
→ pengunix joined15:29
→ Timmy joined15:30
→ starkhalo joined15:31
→ joaoh82 joined15:31
→ jokajak joined15:32
← bambams left15:33
→ bambams joined15:33
← bambams left15:33
→ bambams joined15:33
→ balestrino joined15:34
← pengunix left15:34
→ hellopat joined15:35
→ mbroeker joined15:37
← mbroeker left15:37
← mizu_no_oto left15:37
→ jaseemabid joined15:39
→ daivyk joined15:39
→ pengunix joined15:41
→ mizu_no_oto joined15:42
→ ni__ joined15:42
← jimmyeatworld left15:42
← mizu_no_oto left15:42
→ PaulCapestany joined15:44
→ jimmyeatworld joined15:44
→ Guest92813 joined15:44
→ ambodi joined15:44
→ mizu_no_oto joined15:46
← diegoviola left15:46
← Guest92813 left15:46
→ Guest92813 joined15:46
Guest92813 → diegoviola15:46
→ VictorCL joined15:48
→ kermit joined15:49
← vurma left15:49
← mizu_no_oto left15:51
← hwrd|work left15:53
← jokajak left15:55
→ jokajak joined15:56
← bandroidx left15:56
→ rekeorbm joined15:57
→ bandroidx joined15:57
← Asenar left15:58
rekeorbm → mbroeker15:58
→ hwrd|work joined15:58
← johnflux_ left15:58
← mbroeker left15:58
→ Pullphinger joined15:59
← St_Marx left15:59
→ gfontenot joined15:59
→ M00sL0gB0t joined16:01
→ digiv joined16:01
→ marhaban joined16:02
→ St_Marx joined16:02
← ngladitz left16:05
← Argure left16:06
← marhaban left16:06
→ ngladitz joined16:06
→ beckster joined16:08
← menace left16:09
← john2x left16:09
→ Argure joined16:09
→ Nizumzen joined16:10
axrfnu i have three unpushed commits a, b, and c on master and have not yet pushed to the corresponding upstream. can i squash a and c into one commit via rebase and put b on top of it, and reset that to master, effectively reordering commits?16:10
→ arietis joined16:10
Bombe axrfnu, yes.16:11
← r0bby_ left16:11
→ marhaban joined16:13
← bandroidx left16:13
axrfnu ok, thanks!16:14
← guns left16:14
→ MithrilTuxedo joined16:15
→ bandroidx joined16:16
← bandroidx left16:16
→ bandroidx joined16:16
→ tvw joined16:18
← chimay left16:19
← rendar left16:20
← danicampa901 left16:21
← jaseemabid left16:25
→ Asenar joined16:27
→ MattStratton joined16:27
← sirkha left16:27
← marhaban left16:29
← k4rtik_ left16:29
← Gavrisimo left16:29
→ k4rtik_ joined16:29
← gasbakid_ left16:29
thevishy whats the command for that ? its interactive rebase right ?16:30
← gua_ould left16:30
kalleth git rebase --interactive HEAD~316:30
→ rath joined16:30
kalleth move a and c to below b16:30
then squash them both16:30
or squash one16:30
thevishy right HEAD~3 is required ?16:31
→ marhaban joined16:31
kalleth HEAD~3 tells it to rebase the last 3 commits on the head of the current branch16:31
HEAD~4 is the last 4 commits, etc16:31
→ r0bby_ joined16:31
kalleth not sure what happens if you don't specify the # to rebase16:31
try it and see :)16:32
thevishy suppose I have 10 commits and I need to do some operation on last 3 only , then its HEAD~316:32
kalleth ^^16:32
cbreak you likely have many more than 10...16:32
kalleth ^^16:32
cbreak thevishy: man gitrevisions16:32
gitinfo thevishy: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html16:32
ohcibi kalleth: head~3 is a ref like a sha1-hash or like a tag or like a branch name.. you can pass anyone of them to rebase16:32
thevishy right16:32
i mean 10 thats diverged from the main16:32
kalleth ohcibi: oh, yeah, forgot that16:33
thevishy ah ah16:33
cbreak it explains how the ~ notation works16:33
→ gasbakid_ joined16:33
kalleth so if you pick out the SHA of a commit 15 commits ago it'll pick out every commit since and including that sha?16:33
ohcibi yea16:33
kalleth and HEAD~3 refers to the sha of the commit 3 commits ago?16:33
nice, thanks for the explanation16:33
ohcibi as in "rebase onto that commit"16:33
thevishy i usually go git rebase --interactive master16:33
now this is self rebase ? !16:33
cbreak thevishy: no.16:33
thevishy: it rebases all commits that you have but master does not onto master, effectively16:34
thevishy right16:34
ohcibi if you rebase -i master when you are currently on master there is nothing to do of course16:35
← m0ltar left16:36
→ rhombus joined16:37
→ gasbakid__ joined16:37
← bandroidx left16:37
thevishy i am on my topic branch usually16:37
← gasbakid_ left16:37
→ iamjarvo_ joined16:39
thevishy I am in a topic branch - > suppose i was doing some bug fix and i rectified it couple of time so its , a b c commits which I want as a single commit a' ... I first do a git rebase --interactive HEAD~316:39
→ mizu_no_oto joined16:39
thevishy and make it a single commit and then sync with master .... or directly do a git rebase --interactive master16:39
i would think the later is more precise correct ?16:40
kalleth on your topic branch, doing git rebase master will get commits from master into your current branch16:40
← iamjarvo_ left16:40
kalleth not take your commits in the topic branch into master16:40
thevishy ofcourse master has diverged in this time16:40
→ iamjarvo_ joined16:40
→ m0ltar joined16:40
← asido left16:41
thevishy ofcourse , its for a pull request later on to master ( via github)16:41
which editor is more git friendly or there is nothing like that ? vim or emacs16:42
← marhaban left16:42
kalleth i don't use git in my editor, i do my gitting from the command line outside my editor16:43
but everyone's different :(16:43
← r0bby_ left16:43
→ marhaban joined16:44
← mizu_no_oto left16:44
← Timmy left16:44
→ maestrojed joined16:46
→ juliohm joined16:46
← arietis left16:47
← tma996 left16:49
← maestrojed left16:51
→ kukks joined16:51
← kukks left16:51
→ kukks joined16:51
← daivyk left16:51
→ greggroth joined16:52
→ jimmyeat1orld joined16:53
→ bandroidx joined16:54
→ mizu_no_oto joined16:55
← jimmyeatworld left16:56
→ dreiss joined16:57
→ mastro joined16:57
→ harobed_ joined16:59
← BSaboia left16:59
← dsdeiz left16:59
← gasbakid__ left17:00
→ gasbakid joined17:00
← stodan left17:01
→ bewest joined17:01
← PaulCapestany left17:02
← hobodave_ left17:02
→ hays joined17:02
hays Is it possible to have a git repo of git repos?17:02
I am asking for purely asinine reasons17:02
jrnieder hays: answer depends on those asinine reasons :)17:03
ciaranm you can use submodules to store multiple git repos within a single github private repo17:04
→ PaulCapestany joined17:04
← johnkevinmbasco left17:04
→ MattStra_ joined17:04
→ r0bby_ joined17:04
→ ozymandias joined17:05
← marhaban left17:06
← ozymandias left17:06
→ ozymandias joined17:06
hays what kind of mess would ensue if I had two repos stored in the same parent directory and i tried to git ini the parent directory17:07
← MattStratton left17:07
jrnieder hays: you'd have three repos? :)17:07
GyrosGeier indeed17:08
→ richwestcoast joined17:08
← iamjarvo_ left17:08
jrnieder e.g., in one of my repos I have a subdirectory with a todo list, which is another repo17:08
hays would that third repo interfere with the other two17:08
jrnieder it shows up in "git status" but I never "git add" it, so it doesn't do any harm17:08
if I were to "git add" it, I'd say "oops" and then "git rm --cached" it17:09
if I were to "git add" it and then commit, then I'd start annoying people.17:09
← d8bhatta left17:09
→ petey joined17:10
hays hmm.17:11
I think for the purposes of not melting my brain I will keep them all as separate repos.17:11
→ nicedice joined17:12
→ iamjarvo joined17:13
← ewnd9 left17:14
← VictorCL left17:14
→ m0viefreak joined17:16
← nicedice left17:16
→ arietis joined17:16
→ el3ctron_ joined17:17
← DrNick left17:17
→ nicedice joined17:17
→ dsdeiz joined17:19
← k4rtik_ left17:19
→ maestrojed joined17:21
← greggroth left17:21
← thevishy left17:23
← ambodi left17:23
← tvw left17:23
→ thevishy joined17:23
← iamjarvo left17:23
← thevishy left17:24
→ iamjarvo joined17:24
→ thevishy joined17:24
← thevishy left17:25
← fire left17:25
← DrShoggoth left17:25
← kaiza left17:25
→ thevishy joined17:26
← thevishy left17:26
→ thevishy joined17:28
← iamjarvo left17:28
← jimi_ left17:29
← shinnya left17:29
← PaulCapestany left17:31
← conan left17:31
→ Timmy joined17:31
→ bwreilly joined17:31
→ oriba joined17:32
← oriba left17:32
→ oriba joined17:33
← ewet left17:33
← dreiss left17:33
→ PaulCapestany joined17:33
← Kayra_ left17:36
← matanya left17:36
→ Kayra joined17:37
← RoryHughes left17:38
← glebihan left17:39
→ Kayra_ joined17:40
← michael_lee left17:41
→ hobodave joined17:41
← Silmarilion left17:41
← Kayra left17:41
→ jrabbit joined17:41
jrabbit if I have a topic branch that I want to merge into a new version branch without hitting master is that possible?17:42
slash does that even make sense17:42
→ khmarbaise joined17:42
rue jrabbit: master is just a branch, so yes.17:42
← watermel0n left17:42
jrabbit rue: thanks I'm just trying not to fuck anything up since it's a rather old package I maintain if it was one of my own projects I'd have no problem ruining it17:43
← Kayra_ left17:45
← GoldenAxe left17:46
→ nszceta joined17:47
→ jimi_ joined17:47
→ glebihan joined17:48
jrabbit Oh git understood that i wanted to base it off of the current branch yay it was intuitive :)17:48
← thevishy left17:48
← jrabbit left17:48
← petey left17:50
→ petey joined17:50
→ hobodave_ joined17:51
← hobodave left17:52
← nicedice left17:52
← bandroidx left17:52
→ juls joined17:52
→ hellektor joined17:53
→ petey_ joined17:53
→ nicedice joined17:53
← petey left17:53
→ therealGent joined17:54
← starkhalo left17:54
→ hahuang65 joined17:54
→ bandroidx joined17:55
← bandroidx left17:55
→ bandroidx joined17:55
→ johnflux_ joined17:56
← johnflux_ left17:56
→ johnflux_ joined17:56
joar niax: I solved it by installing the appropriate version of pygit2. I had some trouble with the python package manager's cache though. Thank you for the help.18:03
→ BSaboia joined18:04
→ sq-one joined18:04
→ RoryHughes joined18:05
→ nilg joined18:05
← noecc left18:07
→ Kayra joined18:07
← gasbakid left18:07
→ gasbakid_ joined18:07
← mizu_no_oto left18:08
← w0ng left18:09
→ HicksD_ joined18:09
← HicksD left18:09
→ w0ng joined18:10
← farmanimal left18:10
← Kayra left18:12
→ Kayra joined18:12
← khmarbaise left18:12
← petey_ left18:14
→ petey joined18:14
→ khmarbaise joined18:15
→ farmanimal joined18:15
← farmanimal left18:15
→ greggroth joined18:16
→ aartist joined18:16
→ iamjarvo joined18:16
→ Silmarilion joined18:18
→ daivyk joined18:18
← petey left18:19
← kermit left18:19
← greggroth left18:20
→ Guest27856 joined18:23
→ Shusshu joined18:24
← Guest49989 left18:24
← Stalkr_ left18:25
← diegoviola left18:25
← koda left18:26
← Guest27856 left18:26
→ Guest27856 joined18:26
← Nizumzen left18:26
← redrocket left18:26
Guest27856 → diegoviola18:26
← joaoh82 left18:28
→ dreiss joined18:28
→ Guest80439 joined18:29
← balestrino left18:31
→ facundor joined18:31
→ Plouj- joined18:32
Plouj- hi18:32
when I do git clone host:/path I get "bash: git-upload-pack: command not found" because there is not git installed on the remote machine. How can I clone over ssh without installing git on the host?18:32
moritz Plouj-: you could do a recursive copy of the dir, and then clone from that locally18:33
← daivyk left18:33
Plouj- I can't do that in one go with 'git'?18:33
← nicedice left18:33
moritz Plouj-: git is meant to be installed on the remote, because then fetching will only fetch new objects18:34
→ ambodi joined18:34
→ nicedice joined18:34
moritz no, git over ssh assumes that the remote has git installed18:34
← Shusshu left18:35
EugeneKay changed the topic to: Welcome to #git, the place for leftover eggnog | Current stable version: 1.8.5.2 | Start here: http://jk.gs/git | Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | We're the gits that keep on giving18:36
EugeneKay set mode: -o18:36
→ g0bl1n joined18:36
← Guest80439 left18:37
← ambodi left18:39
hellektor → starkhalo18:39
← pengunix left18:40
→ pengunix joined18:41
← bewest left18:43
← igalic_ left18:43
→ igalic_ joined18:43
→ mizu_no_oto joined18:44
← kukks left18:47
← mizu_no_oto left18:48
← g0bl1n left18:49
→ acharlie_ joined18:50
← juls left18:50
→ whoami joined18:52
→ spaceone joined18:52
→ thalisson_ joined18:53
→ kaiza joined18:54
→ Eduard_Munteanu joined18:54
Eduard_Munteanu How do I get a 'patch'-compatible patch from Git?18:55
GyrosGeier "git diff"18:55
→ nurcan32 joined18:55
← nurcan32 left18:55
Eduard_Munteanu GyrosGeier: hm, does that work? I thought it can only be applied with "git apply"18:56
Anyway, lemme try it.18:56
GyrosGeier no, it contains additional lines that are helpful for git-apply18:56
Eduard_Munteanu Thanks, I guess it just fails to apply to the tree I'm using 'patch' on.18:57
GyrosGeier there are options -M and -C that can shrink the diff, but these only work with git-apply18:57
Eduard_Munteanu (patch -p1 of course)18:57
→ robarelli joined18:59
→ Devastator joined18:59
← breakingthings left18:59
njsg what would be a good way to get paths relative to the root of the git repository in, say, makefiles?19:00
jrnieder njsg: hm, what do you mean?19:01
GyrosGeier ../../19:01
I'd rather avoid any dependency on git19:01
because at some point you might want to do a release tarball19:01
→ armid joined19:02
njsg then how do you get files in diferent places to refer to the same directory19:02
let's say you have a lib/ on top of your git19:02
→ tm512 joined19:03
njsg and then src/package/Makefile others/additional/more/Makefile, would you just use ../ and ../../?19:03
armid Ïðèâåò. Åñòü ðóññêîÿçû÷íûå ïîëüçîâàòåëè?19:03
GyrosGeier njsg, exactly19:04
← mtk left19:05
GyrosGeier (also, I've moved away from plain Makefiles towards automake, which just includes everything in the generated file)19:05
← eletuchy left19:05
→ mtk joined19:06
→ frankjeager joined19:06
→ dev__ joined19:06
→ npax joined19:06
→ axl_ joined19:07
← jizanthapus left19:08
njsg GyrosGeier: I guess I should try to understand makefiles before considering moving to automake19:08
← nicedice left19:08
→ nicedice joined19:08
npax slaps armid around a bit with a large trout19:08
→ breakingthings joined19:08
← sword left19:10
npax armid, do you see this?19:12
armid yes19:12
npax me too19:12
← npax left19:12
← oriba left19:13
→ DrNick joined19:16
← calcifea_ left19:19
← jimi_ left19:20
← GT4066 left19:21
→ petey joined19:23
→ matanya joined19:23
← matanya left19:24
→ Mars` joined19:24
→ VictorCL joined19:24
→ refried_ joined19:25
← arietis left19:25
→ valgrind joined19:26
→ DrShoggoth joined19:26
→ mfulz joined19:26
← keller left19:27
→ Geminizer joined19:28
→ pen joined19:29
Geminizer Hey guys. Does anyone here use the git bash under windows?19:29
← psyl0n left19:29
→ stodan joined19:29
→ joaoh82 joined19:29
← Asenar left19:29
Geminizer For some reason, I can type any character except for "b" into the shell19:30
← refried_ left19:30
JanC_ → JanC19:31
cehteh turn your keyboard upside down and shake it, getting your breakfast cereals out of it19:31
← glebihan left19:31
← juliohm left19:32
→ daivyk joined19:32
Geminizer I can definitely type "b" in other programs just fine...19:32
:)19:32
cehteh no idea then19:32
→ eletuchy joined19:33
← joaoh82 left19:34
→ dvide joined19:37
→ conan_ joined19:38
← daivyk left19:38
→ daivyk joined19:39
→ danecando joined19:39
← iamjarvo left19:40
→ matanya joined19:40
→ iamjarvo joined19:40
→ kermit joined19:40
→ iamjarvo_ joined19:41
← WaReZ left19:42
→ WaReZ joined19:43
← matanya left19:43
← ezekielnoob left19:44
← gasbakid_ left19:44
← Geminizer left19:44
← iamjarvo left19:45
→ matanya joined19:45
→ jimi_ joined19:45
→ kirin` joined19:48
← matanya left19:49
← BSaboia left19:50
← axl_ left19:51
→ Dreamer3 joined19:51
← danecando left19:52
→ matanya joined19:52
← Mars` left19:53
→ Imagineer joined19:53
→ NLZ13 joined19:54
← pen left19:55
← diegoviola left19:55
→ warthog9 joined19:55
→ pen joined19:56
← cesc left19:56
→ bewest joined19:56
← matanya left19:57
← khmarbaise left19:58
← starkhalo left19:59
→ BSaboia joined19:59
← dsantiago left19:59
← bandroidx left19:59
→ gasbakid_ joined19:59
→ bandroidx joined19:59
← bandroidx left19:59
→ bandroidx joined19:59
njsg well, it'd be a matter of turing the keyboard 90° and typing q19:59
no wait, the display19:59
also 180° of course20:00
← joki left20:01
← petey left20:02
→ petey joined20:02
→ Mars` joined20:02
← facundor left20:03
→ dsantiago joined20:03
← PaulCapestany left20:03
→ zsolt joined20:04
→ greggroth joined20:04
← albel727 left20:04
← faBimon left20:05
← petey left20:05
→ giusef joined20:05
← Landshark753 left20:05
→ petey joined20:05
→ albel727 joined20:06
→ joki joined20:07
← nicedice left20:08
→ Landshark753 joined20:08
← ELLIOTTCABLE__ left20:08
← Landshark753 left20:08
→ nicedice joined20:08
← gasbakid_ left20:08
→ Landshark753 joined20:09
← greggroth left20:09
→ matanya joined20:09
→ ELLIOTTCABLE__ joined20:09
← nicedice left20:11
→ nicedice joined20:12
→ gasbakid_ joined20:12
← nszceta left20:13
← el3ctron_ left20:13
→ PaulCapestany joined20:14
← stodan left20:14
← eletuchy left20:14
→ Tjati joined20:15
← St_Marx left20:16
← BSaboia left20:16
→ sayd joined20:16
→ stodan joined20:17
← Mars` left20:19
→ jerius joined20:19
← dsantiago left20:20
← Tjati left20:20
← jerius left20:22
→ el3ctron_ joined20:22
→ Grant484 joined20:25
← bewest left20:25
← bandroidx left20:26
→ bandroidx joined20:26
→ hopkin joined20:28
← el3ctron_ left20:29
→ el3ctron_ joined20:29
→ joaoh82 joined20:30
→ axl_ joined20:31
→ aChatir joined20:31
← angasulino left20:32
← gasbakid_ left20:32
← bwreilly left20:33
← bandroidx left20:34
← angelsl left20:34
← hyperair left20:34
→ eijk joined20:34
→ bwreilly_ joined20:34
← joaoh82 left20:36
← sayd left20:36
→ Nizumzen joined20:37
← mitz left20:37
← abelsiqueira left20:38
→ sayd joined20:38
→ bandroidx joined20:38
← bandroidx left20:39
← NLZ13 left20:40
→ bandroidx joined20:40
← bandroidx left20:41
← Grant484 left20:41
→ eletuchy joined20:42
→ Grant484 joined20:42
← axl_ left20:42
→ jceb joined20:43
→ bandroidx joined20:43
← bandroidx left20:44
→ bandroidx joined20:44
→ Stalkr_ joined20:45
← pengunix left20:46
← jackneill left20:48
← bandroidx left20:48
→ zizzfizzix joined20:48
→ jefferai joined20:48
→ bewest joined20:49
← _Vi left20:49
→ bandroidx joined20:49
→ starkhalo joined20:50
← robarelli left20:50
→ SmashingX joined20:51
← Orginator_ left20:51
← bandroidx left20:51
→ mitz joined20:51
→ Orginator joined20:51
→ axl_ joined20:52
← el3ctron_ left20:53
→ melightk joined20:53
melightk hi guys20:53
gitinfo melightk: 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.20:53
→ watermel0n joined20:54
← watermel0n left20:54
melightk I have a branch X with lots of fancy new features, I pushed it and then merged master with it. But I don't see some of the changes on that branch merged. What might be the reason for that?20:54
← rhombus left20:57
SmashingX can you guys help to get connection with eGit in eclipse? I already asked #eclipse but nobody is helping at this moment :(20:57
→ joaoh82 joined20:58
→ rouf_ joined20:58
→ sandorjanssen joined20:59
← petey left20:59
← Kayra left21:00
← rouf left21:02
→ Mars` joined21:02
→ MattMaker joined21:03
→ Goplat joined21:03
← axl_ left21:04
→ dragon3_ joined21:04
← Argure left21:04
→ gumnos joined21:05
→ Argure joined21:05
gumnos I've got a git overlay on an SVN repo, and want to check my tidied history into svn with something like the psesudo-code: 'for rev, shortdesc in master..HEAD; git checkout $rev; svn commit -m "$shortdesc"; done' What's the easiest way to do this?21:07
← matanya left21:07
gumnos (master is where last I checked into SVN)21:07
← Grant484 left21:07
← PaulCapestany left21:09
→ bsdbeard joined21:09
→ PaulCapestany joined21:10
← PaulCapestany left21:10
→ petey joined21:11
← Mars` left21:11
→ PaulCapestany joined21:12
→ axl_ joined21:13
→ jim joined21:14
← Nizumzen left21:14
← sandorjanssen left21:14
← giusef left21:15
jim Hi... I have a few cvs repos on sourceforge, and I was wondering how I could convert them to git repos on sourceforge (also feel free to s/on sourceforge//g)21:15
← eletuchy left21:15
← mishok13 left21:15
→ pengunix joined21:18
← nicedice left21:18
← rath left21:18
→ nicedice joined21:19
← m0ltar left21:20
rohieb jim: man gitcvs-migrate says, you can use http://www.cobite.com/cvsps/21:21
→ robarelli joined21:21
← stodan left21:21
← melightk left21:21
jim rohieb, bookmarking. thanks21:23
← gfontenot left21:23
← jceb left21:23
rohieb apart from that, never done it ^^21:23
→ gfontenot joined21:24
← robarelli left21:24
→ robarelli joined21:25
jim oh, ok... I was thinking I would make a nonbare blank repo, then use the tool to import the cvs commits, then add a git repo to the sourceforge project, and push21:25
← grilix left21:26
← maroloccio2 left21:26
→ grilix joined21:26
→ Mars` joined21:28
→ Grant484 joined21:29
→ Watabou joined21:30
→ oojacoboo joined21:30
→ bwreilly joined21:30
← grilix left21:30
← Goplat left21:31
← bwreilly_ left21:33
← armid left21:34
← shruggar left21:35
← sq-one left21:35
→ Vivekananda joined21:36
→ giusef joined21:36
→ eijk_ joined21:37
Vivekananda hello everyone21:37
← giusef left21:38
→ abelsiqueira joined21:40
← eijk left21:40
→ tmcmahon joined21:40
→ master_j joined21:41
← aChatir left21:41
jrnieder jim: does sourceforge give you access (e.g. over rsync) to the ,v files?21:43
← tmcmahon left21:43
→ tmcmahon joined21:44
← dougsland_ left21:45
Vivekananda I wanted to know how server side files are maintained and developed in git especially the config files21:46
→ dougsland_ joined21:46
← Vivekananda left21:46
← kermit left21:47
← abelsiqueira left21:47
→ _Vi joined21:48
cbreak not?21:48
git cares about client side files, which it tracks at the user's directions.21:48
then you can push history somewhere else21:48
but remotes typically don't have any files, they are bare21:49
← bewest left21:49
SamB he/she left21:49
→ bewest joined21:49
cbreak ...21:49
now that really wasn't that a slow answer...21:49
SamB I'm going to assume it was an accident21:49
SamB has accidentally exitted programs before lots of times ...21:50
cbreak my IRC client has a confirmation dialog :)21:50
SamB yes, well, he/she usually doesn't do that21:51
→ JesseC joined21:51
← Pullphinger left21:51
← hobodave_ left21:52
→ BSaboia joined21:52
→ hobodave joined21:52
← pen left21:53
→ glebihan joined21:53
← Entomo left21:54
→ pencilcheck joined21:55
rohieb huh21:55
→ Entomo joined21:55
rohieb why do I voice?21:55
Fall To keep from bots spamming the channel, +m is currently set21:56
→ nszceta joined21:57
rohieb i c21:57
← dragon3_ left21:58
← dougsland_ left21:58
→ dougsland_ joined21:59
→ johnmilton joined22:02
← Timmy left22:03
→ kcj joined22:04
← Grant484 left22:04
→ Kayra joined22:04
→ simesy joined22:04
→ Grant484 joined22:04
← smashwilson left22:07
← oojacoboo left22:07
→ Vivekananda joined22:09
→ paulo_ joined22:09
paulo_ hello22:09
does push upload my entire commit history up until the revious push?22:09
← conan_ left22:09
paulo_ *previous22:09
← m8 left22:10
paulo_ or does it upload just the last commit22:10
← jnavila left22:10
→ eletuchy joined22:10
→ oojacoboo joined22:11
← dev__ left22:11
cbreak paulo_: it pushes all history22:11
← iamtakingiteasy left22:11
cbreak (that you push)22:11
depending on your git version and settings and command line arguments, that's only your current branch, or all matching branches22:12
or what ever else you chose22:12
paulo_: git will never push disconnected history, so if a commit is pushed, then all its ancestors are also pushed22:12
← nszceta left22:13
→ PAAWNKG joined22:13
Vivekananda I wanted to know how server side files are maintained and developed in git especially the config files22:13
→ dragon3_ joined22:14
cbreak Vivekananda: I answered.22:14
Vivekananda: not at all22:14
← alezost left22:15
cbreak Vivekananda: [22:48:48] <+cbreak> git cares about client side files, which it tracks at the user's directions.22:15
→ sabgenton joined22:15
cbreak Vivekananda: [22:48:57] <+cbreak> then you can push history somewhere else, [22:49:05] <+cbreak> but remotes typically don't have any files, they are bare22:15
sabgenton !push22:15
gitinfo [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.22:15
cbreak Vivekananda: see !deploy for details on how writing your own scripts to get files on remote servers22:16
gitinfo Vivekananda: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html22:16
Vivekananda I know but then my question is that I am writing files and .html pages and php code on the server www/ folder. If I dont have any version control then how do I have smooth development there ?22:16
→ MacGyver joined22:17
← MacGyver left22:17
→ MacGyver joined22:17
Vivekananda for example if I just clone my remote repo then each time I would have to write the config files from scratch. If I also store config files then I would have to alter them on each pull . That would be a mess22:17
cbreak Vivekananda: it is not a server22:18
Vivekananda: it's just a local git repository22:18
← pencilcheck left22:18
cbreak that it is local on the server is irrelevant22:18
Vivekananda: if you have a non-bare git repository there, then it's not a git server, it's just a normal local repository :)22:19
Vivekananda a little confused. Are you saying that the files inside www/ are local files ?22:19
cbreak Vivekananda: yes.22:19
Vivekananda: all files are local to the system they are on22:19
← SHyx0rmZ left22:19
cbreak and if you develop on that system, then they are local22:19
Vivekananda ooo ok yes it is it not a GIT server. I meant apache server when I said server.22:19
cbreak Vivekananda: also, don't commit config files22:19
they are configuration22:19
commit a template, and copy that template (or reference it), in your local configuration. do NOT commit that local configuration22:20
Vivekananda: !config22:20
gitinfo Vivekananda: [!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 ideas22:20
→ conan_ joined22:20
Vivekananda that is the thing. I dont wish to commit them but then the problem is I am testing the web app locally and then when it works I deploy them on the server. But if I I dont store configs then suppose someone wants to use the same repo and use it on another server. Then they would have to write all config files by themselves wouldnt they ?22:21
cbreak yes22:21
Vivekananda: they have to do that anyway22:21
because they use their own configuration.22:21
← pengunix left22:21
cbreak that's why good applications create configuratiion themselves, from an internal template22:22
and shitty web page program thingies would at least have a template you can copy from22:22
Vivekananda yes but if I have a config file then the task becomes easy coz they can just change few lines and it is done. If they dont know how to write a config file from scratch then it would be a mess for them22:22
→ Nizumzen joined22:22
cbreak Vivekananda: which part of template do you not comprehend?22:22
Vivekananda: if your program is not smart enough to create its own default config file, then commit an example for users to copy22:23
Vivekananda I got that after I put my question. so yeah I got the line --- that's why good applications create configuratiion themselves, from an internal template .22:23
so now I will look for how my web app can create a config file from a template.22:23
cbreak by copying it...22:23
see the link above22:24
Vivekananda sure yep but I would love to learn how the config templating thing works. I will look at the link for that22:24
← tmcmahon left22:25
→ rurufufuss joined22:26
sabgenton !pull422:26
gitinfo [!fetchfour] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).22:26
sabgenton what about git pull foo:origin/foo isn't that exactly the same as the automatic way on simple?22:27
mehwork_ → mehwork22:27
cbreak sabgenton: nope.22:28
sabgenton cbreak: whats different?22:28
cbreak you don't specify a remote22:28
so it's not valid22:28
sabgenton opps22:29
git pull origin foo:origin/foo22:29
cbreak sabgenton: typically, normal pull fetches with the fetch ref spec22:29
sabgenton: so it updates all branches22:29
← bsdbeard left22:29
cbreak sabgenton: man git-config22:30
gitinfo sabgenton: the git-config manpage is available at http://jk.gs/git-config.html22:30
cbreak sabgenton: look for remote.<name>.fetch22:30
← frankjeager left22:31
sabgenton cbreak: so it is the same? minus the obvious that it doen't pull everything like normal22:31
← MithrilTuxedo left22:31
cbreak I am also not sure what that'd actually merge.22:31
sabgenton cbreak: what I mean is that seems safe22:31
!fetchfour implys it's not22:32
gitinfo We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).22:32
sabgenton cbreak: it doesn't mention that you can add the exact remote/branch to the other side of the refspec fixing the problem22:33
→ maroloccio joined22:33
sabgenton of course i could be wrong, hence the question :)22:34
→ royho joined22:35
cbreak sabgenton: oh, it is safe22:36
but it might not do what you want, but what you say22:36
it's not that fetch 4 is dangerous, it's just not what most people expect22:36
→ Iszak joined22:37
sabgenton yeah I totaly agree with don't pull origin foo:22:37
→ boaz- joined22:37
Iszak How can I do a "dry run" of git reset --hard origin/branch to see if there's any conflicts?22:37
cbreak Iszak: there is no conflict22:37
the --hard will make sure of that :)22:37
Iszak cbreak what if it's a permission conflict?22:38
cbreak Iszak: it'll nuke away everything else.22:38
permissions? git doesn't care about that.22:38
Iszak It can't modify a file it does not own.22:38
cbreak it'll try and might fail.22:38
Iszak it does fail22:38
this is my problem22:38
cbreak then you had your dry run.22:38
Iszak I know how to resolve it, but this is an automatic deployment, so I'd rather check.22:39
I know I could do something like find . -not -user x22:39
← harobed_ left22:39
Iszak but the problem is, it usually leaves it in a half merge state.22:39
cbreak x? more like w?22:39
it should not do any merging22:39
it is reset22:39
Iszak okay, maybe it occured when I was merging rather than reseting.22:40
← thalisson_ left22:40
sabgenton cbreak: but it would be nice if it it said to it's target audience "what you probably wanted to do is foo:origin/foo" and then explain it's easy to typo though or something22:40
→ thalisson_ joined22:40
← dragon3_ left22:40
cbreak you might get files that can not be changed, so it might abort, but it should only leave files in either their old or their new state22:40
sabgenton (unless there's something I'm missing)22:40
cbreak sabgenton: nope22:40
sabgenton: what you probably want to do is leave away the ref spec22:40
sabgenton cbreak: but then it will merge all simple branhes22:41
branches22:41
← Kicer86 left22:41
sabgenton cbreak: nope as in I get it? :)22:41
Iszak cbreak this doesn't help me, I need to know if it failed or whether it will fail.22:42
cbreak sabgenton: it will not merge anything22:43
fetch never merges22:43
pull will merge the current branch only.22:43
← kerrick left22:43
cbreak no exceptions.22:43
merge will merge the current branch only. no exceptions.22:43
Iszak: you can check git status and/or git diff, they have exit code versions afaik22:43
Iszak: it should also tell you if it failed by return value22:44
← robarelli left22:44
sabgenton oh22:44
cbreak: what if foo is checked out?22:44
Iszak cbreak that might work, what is the easiest path, this is an automated script, that's all.22:44
← mastro left22:44
cbreak sabgenton: only the current branch will be merged because merging requires a working dir, and there is only one, which is used by the current branch22:44
Iszak: I've not scripted that. In bash, I think you could use $? or so for the exit code?22:45
I'd expect reset to give non-zero on error22:45
if it doesn't, you can still check git diff --exit-code or so22:45
→ shruggar joined22:46
Iszak okay I'll look into, thanks cbreak22:46
→ Bosox20051 joined22:47
Iszak cbreak it would be best if I could do a dry run though, because I don't know what git reset --hard will do if it comes up against this case.22:47
I know what merge/pull will do22:47
→ GoldenAx1 joined22:47
cbreak Iszak: ideally, you'd just not have fucked up permissions.22:48
← petey left22:49
→ petey joined22:49
← moondoggy left22:50
sabgenton cbreak: yes all I mean is git checkout foo; git pull origin foo:origin/foo seems to do what people would expect and merge fine etc (just most people would not do all of those steps hence pull4)22:50
→ moondoggy joined22:50
sabgenton my bad I should have typed everthing out carefully before I started my question22:50
Iszak cbreak ideally, I'm inheriting a mess..22:51
→ bvi joined22:51
sabgenton (replace ; with && too)22:51
Iszak i prefer git pull --rebase22:51
sabgenton cbreak: well you seem to have agreed with me here22:52
cbreak sabgenton: it does not do the same22:53
as I said above, the default fetch spec updates all branches22:53
← GoldenAx1 left22:53
cbreak sabgenton: git pull remotename currentbranch would also merge correctly22:53
the reason it is not recommended is because it doesn't update remote tracking branches22:54
your "solution" only updates one of them. That's not much better than none.22:54
→ tswett joined22:54
sabgenton cbreak: yeah but doesn't that fail to update origin/foo?22:54
Bucciarati_ → Bucciarati22:54
← Landshark753 left22:54
cbreak that's what I said.22:54
tswett Hey guys. I've edited a file, and then staged only some of the changes for committing. So, as a result, the head, the index, and the working tree are all different.22:55
I'd like to save the current contents of the working tree, replacing them with the contents of the index (so that I can make sure what's in the index makes sense). Then, after I commit, I'd like to restore the contents of the working tree so I can commit again.22:56
→ boombatower joined22:56
tswett I tried "git stash", but that seems to have discarded the index, saved the working tree, and reset the working tree to the head. Not what I was after.22:56
sabgenton cbreak: say someone put sensitive data or a large binary in some other branch git checkout foo && git pull origin foo:origin/foo would seem to be a good solution to avoid it while it's being fixed22:56
cbreak tswett: man git-stash, look for --keep-index22:56
gitinfo tswett: the git-stash manpage is available at http://jk.gs/git-stash.html22:56
cbreak sabgenton: if someone puts sensitive data there, then it'd git fetch just because.22:57
← hwrd|work left22:57
tswett cbreak: great, thanks.22:57
sabgenton oh foo:origin/foo still fetches everything?22:58
cbreak no22:58
I don't think so22:58
← gumnos left22:58
sabgenton yeah thats my point22:58
← longbeach left22:58
cbreak it should only fetch remote foo into local origin/foo22:58
→ greggroth joined22:58
→ kermit joined22:59
sabgenton yeah, again then 'git checkout foo && git pull origin foo:origin/foo' seems like a good idea if you don't want all branches22:59
cbreak sabgenton: no23:00
sabgenton: if you don't want all branches, then change the fetch ref spec23:00
← breakingthings left23:00
← boaz- left23:01
→ hobodave_ joined23:01
sabgenton cbreak: why? (I'm only going to change the refspec back later)23:01
cbreak because you don't want all23:01
sabgenton all what?23:02
← gfontenot left23:02
cbreak "if you don't want all branches"23:02
that's what you said23:02
→ hwrd|work joined23:02
← hobodave left23:02
sabgenton oh sorry I thought 'git checkout foo && git pull origin foo:origin/foo ' would only fetch foo23:03
ok well in that case fair enough23:03
← jcvfen left23:03
← Ragnor left23:04
→ jcvfen joined23:04
sabgenton I will have to check that out23:04
→ pen joined23:04
sabgenton did relize that still applied sorry23:04
didn't23:04
cbreak: actually I guess there's always git -c <fetchsetting> :D!23:04
→ mar77i joined23:04
← Evanlec left23:04
← felher left23:05
→ ndngvr` joined23:05
→ rvsjoen joined23:05
← marthinal left23:05
→ Evanlec joined23:05
← JosephFerano left23:05
← ShooterMG left23:05
← adam- left23:05
← hellopat left23:05
→ xrq joined23:05
→ adam- joined23:06
→ DonVitoC- joined23:06
→ hellopat joined23:06
→ ShooterM_ joined23:06
sabgenton still i stills seems ok if you only wanted to look at one branch being updated :P23:06
→ stkrzysiak joined23:06
→ akiress_ joined23:06
← valgrind left23:06
← iamjarvo_ left23:06
sabgenton (even if it's there dangling)23:06
→ surfdue joined23:06
→ leprechau joined23:07
→ iamjarvo joined23:07
→ marthinal joined23:07
cbreak sabgenton: it will only fetch what you tell it to... how often do I have to repeat that?23:07
→ valgrind joined23:08
jim jrnieder, (re: ,v files) checking.23:09
→ h0rrorvacui joined23:10
sabgenton cbreak: sorry define 'it'23:10
→ Ragnor joined23:10
sabgenton sabgenton yeah, again then 'git checkout foo && git pull origin foo:origin/foo' seems like a good idea if you don't want all branches23:10
cbreak sabgenton: no23:10
cbreak sabgenton: man git-fetch23:10
gitinfo sabgenton: the git-fetch manpage is available at http://jk.gs/git-fetch.html23:10
← petey left23:10
cbreak sabgenton: read the fetch ref specs if you still don't get it23:10
sabgenton: I told you five times how it works...23:10
→ abelsiqueira joined23:11
← aspiers left23:11
← iamjarvo left23:12
jim Vivekananda, php? you're not worried about how unstably the maints handle the language? (for example, introducing incompatible changes almost every time, etc)23:13
→ petey_ joined23:14
sabgenton cbreak: thanks for the help anyways I will go over how it looks at your fetch setting sorry about that23:14
cbreak sabgenton: you can also just set up a one-branch-only repository when cloning23:15
sabgenton: man git-clone, look for --single-branch23:16
gitinfo sabgenton: the git-clone manpage is available at http://jk.gs/git-clone.html23:16
→ dropdrive joined23:17
→ teran joined23:17
← shruggar left23:17
← akiva left23:21
sabgenton cbreak: to be clear the whole time you where taking of remote.origin.fetch ?23:21
cbreak the whole time?23:21
← nicedice left23:22
cbreak when I told you to change the default fetch ref spec if you only want one branch, then I told you about that, yes23:22
that's why I gave you a link to a description of it...23:22
← Imagineer left23:22
→ akiva joined23:22
→ nicedice joined23:22
cbreak hmm, or was that someone else before?23:22
← freestyl3r left23:23
sabgenton does 'git checkout foo && git pull origin foo:origin/foo' overide remote.origin.fetch ?23:23
← Noldorin left23:24
jim let me understand some of what was said while I was out... you were talking about fetch versus pull... does fetch get everything that's later than what was fetched before? or just on a particular branch?23:24
← MattStra_ left23:24
→ kukks joined23:24
← albel727 left23:24
sabgenton I think that was my confusion23:24
← Iszak left23:24
→ freestyl3r joined23:25
← Silmarilion left23:25
jim (note that fetch does not merge, that would have to be done after a fetch)23:25
← nicedice left23:25
→ aspiers joined23:25
← greggroth left23:25
← bewest left23:26
← zhost left23:26
→ nicedice joined23:26
← VictorCL left23:26
→ Imagineer joined23:26
cbreak sabgenton: of course it does, that's what I told you all the time23:28
sabgenton: and that's why it's not recommended23:28
sabgenton ok I understood that the whole time23:28
→ Iszak joined23:28
sabgenton I mean that it overid23:29
← maestrojed left23:29
sabgenton and that was my whole point if I just want to do a oneshot it seems appropriate23:30
← ZujkisNx left23:30
sabgenton I don't care about remote.origin.fetch in that oneshot23:30
→ gesparza11 joined23:30
← petey_ left23:31
gesparza11 Hi All. How do you create a git namespace?23:31
← boombatower left23:31
→ DolphinDream joined23:32
← hs366 left23:32
cbreak gesparza11: namespace?23:32
gesparza11 correct. https://www.kernel.org/pub/software/scm/git/docs/gitnamespaces.html23:33
← axl_ left23:33
→ Noldorin joined23:33
→ maestrojed joined23:33
→ robarelli joined23:33
← ngladitz left23:34
cbreak never used that, sorry.23:35
jrnieder gesparza11: if you have the server set up with the namespace you want, you can just push to it23:36
gesparza11 cbreak: thanks anyways, you've helped me in the past i really appreciate you even taking a look.23:37
jrnieder: i guess im just confused on what namespace is. Is it just nested repositories?23:38
jrnieder gesparza11: it's just a way of telling the server to expose some subset of refs23:38
so if you have five repos that are all basically just like linux.git, serverside you can use one repository23:39
but clients just see their namespace23:39
gesparza11 yikes. I'm still a little lost.23:40
jrnieder it's a way of solving the same problem that some other people try to solve with alternates (object sharing)23:40
i.e., if you haven't felt the need for it, no need to start now :)23:40
a way to save disk space23:40
gesparza11 i have a dev asking me about how he should structure his repository and whether or not he should namespaces or not. I kinda need to grasp the subject.23:41
jrnieder ok, it's pretty easy to answer23:41
Q: are you starved for disk space?23:42
gesparza11 yes23:42
jrnieder then yes, look into using namespaces23:42
as long as the security caveats mentioned on that manpage are ok with you23:42
→ GoldenAxe joined23:42
gesparza11 yep not a problem in regard to those.23:43
→ coolcusty|2 joined23:43
→ ultimamax joined23:44
← DolphinDream left23:44
ultimamax I've just started using git on Windows. Do I need to get a difftool or is there a default one packaged with Git/Windows23:44
→ petey joined23:44
canton7 ultimamax, windows doesn't have anything installed by default23:45
→ ham1 joined23:45
← ciampix left23:45
ultimamax canton7: okay. do you have any difftool recommendations?23:45
← ham1 left23:45
canton7 having said that, msysgit will have vimdiff, as it has vim23:45
cbreak ultimamax: I think git for windows comes with vim23:45
so vimdiff should work23:45
canton7 ultimamax, personally I really like p4merge23:45
ultimamax cbreak: ok23:46
cbreak try source tree, it's a git gui with integrated diff functionality23:46
canton7 ultimamax, but have a look at git difftool --tool-help, google em, and see what you like23:46
← tswett left23:46
→ DolphinDream joined23:47
← harish left23:47
← petey left23:47
← dreiss left23:48
ultimamax so apparently i just set up git23:49
my friend shared a repo with me, how can i get started on it23:49
← Davey left23:49
bremner ultimamax: man gittutorial23:49
gitinfo ultimamax: the gittutorial manpage is available at http://jk.gs/gittutorial.html23:49
bremner or see !book23:49
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable23:49
jim jrnieder, (re: ,v files) #sourceforge says (a) yes, and (b) everyone has read-only access23:50
jrnieder jim: ok, then look into cvs2git23:50
jim: or parsecvs, which has been picked up by esr and rebranded as cvs-fast-export23:51
→ Imagineer2 joined23:51
jrnieder jim: I slightly prefer cvs2git among those two23:51
jim ok, cool, so the implication is that converts from local files23:51
what has you have that preference?23:51
jrnieder I find cvs2git pleasant to use23:52
when it didn't do exactly what I wanted I was able to find what I needed in the source23:52
jim oh ok, thanks for that as well23:53
← master_j left23:53
← GoldenAxe left23:53
jrnieder and when I followed up with upstream they were quick and helpful23:53
← featheredtoast left23:53
→ GoldenAxe joined23:53
→ Davey joined23:54
← mfulz left23:54
→ kemitchell joined23:55
← GoldenAxe left23:55
← Imagineer left23:55
jim so maybe they found some of your preferences and use cases where they involved source alteration, to be useful23:55
and seemed excited and helpful23:56
→ bewest joined23:56
jim did you find a lack of excitement for the other alternative? (I guess that's parsecvs?)23:57
jrnieder parsecvs was used for the X.org conversion23:57
and then abandoned until very recently23:57
→ GoldenAxe joined23:57
jrnieder now that it's been picked up again, its developers would probably be excited to answer questions too :)23:58
← GoldenAxe left23:58
→ shruggar joined23:58
← kemitchell left23:58
jim ahh, ok... do you know what it was that caused the resurgance?23:59

Logs Search ←Prev date Next date→ Channels Documentation